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:47:35 -0800 |
| commit | 0535d24446251c444a03d912a0022319a2de16f8 (patch) | |
| tree | 6bdbdd2c0b09dd0585d214bd542a5e604b52eb65 /net/sctp | |
| parent | 7340fda068b62790d612ebbd3a331a2847895f19 (diff) | |
| download | kernel_samsung_smdk4412-0535d24446251c444a03d912a0022319a2de16f8.zip kernel_samsung_smdk4412-0535d24446251c444a03d912a0022319a2de16f8.tar.gz kernel_samsung_smdk4412-0535d24446251c444a03d912a0022319a2de16f8.tar.bz2 | |
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>
Diffstat (limited to 'net/sctp')
| -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 c8cc24e..dbe5870a 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -248,6 +248,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. */ @@ -270,6 +272,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); |