diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-02-08 03:04:35 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-14 10:48:34 -0800 |
| commit | 3cea56174bd3d79f8bb9ec500dfc95c4660a6ca9 (patch) | |
| tree | e30951069087d62b746e51cdacb293d5d8f55cd0 | |
| parent | 86e4935c889c0e4aadd3f7cf86a22ea09f959600 (diff) | |
| download | lwn-3cea56174bd3d79f8bb9ec500dfc95c4660a6ca9.tar.gz lwn-3cea56174bd3d79f8bb9ec500dfc95c4660a6ca9.zip | |
net: sctp: sctp_endpoint_free: zero out secret key data
[ Upstream commit b5c37fe6e24eec194bb29d22fdd55d73bcc709bf ]
On sctp_endpoint_destroy, previously used sensitive keying material
should be zeroed out before the memory is returned, as we already do
with e.g. auth keys when released.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/sctp/endpointola.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 1859e2bc83d1..80a726428de2 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -249,6 +249,8 @@ void sctp_endpoint_free(struct sctp_endpoint *ep) /* Final destructor for endpoint. */ static void sctp_endpoint_destroy(struct sctp_endpoint *ep) { + int i; + SCTP_ASSERT(ep->base.dead, "Endpoint is not dead", return); /* Free up the HMAC transform. */ @@ -271,6 +273,9 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep) sctp_inq_free(&ep->base.inqueue); sctp_bind_addr_free(&ep->base.bind_addr); + for (i = 0; i < SCTP_HOW_MANY_SECRETS; ++i) + memset(&ep->secret_key[i], 0, SCTP_SECRET_SIZE); + /* Remove and free the port */ if (sctp_sk(ep->base.sk)->bind_hash) sctp_put_port(ep->base.sk); |