diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-02-08 04:04:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-08 20:54:24 +0100 |
| commit | b5c37fe6e24eec194bb29d22fdd55d73bcc709bf (patch) | |
| tree | 1a4ba4d878e6d2ff60b874a8f465ada2ac54bff7 | |
| parent | net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree (diff) | |
| download | linux-b5c37fe6e24eec194bb29d22fdd55d73bcc709bf.tar.xz linux-b5c37fe6e24eec194bb29d22fdd55d73bcc709bf.zip | |
net: sctp: sctp_endpoint_free: zero out secret key data
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>
| -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 17a001bac2cc..1a9c5fb77310 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); |