openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'sctp_keys' 

Daniel Borkmann says:

====================
Cryptographically used keys should be zeroed out when our session
ends resp. memory is freed, thus do not leave them somewhere in the
memory.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2013-02-08 14:55:08 -05:00
parent ab54ee80aa b5c37fe6e2
commit a1c83b054e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/sctp/endpointola.c
View File

@ -249,6 +249,8 @@ void sctp_endpoint_free(struct sctp_endpoint *ep)
/* Final destructor for endpoint. */ /* Final destructor for endpoint. */
static void sctp_endpoint_destroy(struct sctp_endpoint *ep) static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
{ {
int i;
SCTP_ASSERT(ep->base.dead, "Endpoint is not dead", return); SCTP_ASSERT(ep->base.dead, "Endpoint is not dead", return);
/* Free up the HMAC transform. */ /* 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_inq_free(&ep->base.inqueue);
sctp_bind_addr_free(&ep->base.bind_addr); 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 */ /* Remove and free the port */
if (sctp_sk(ep->base.sk)->bind_hash) if (sctp_sk(ep->base.sk)->bind_hash)
sctp_put_port(ep->base.sk); sctp_put_port(ep->base.sk);

2
net/sctp/socket.c
View File

@ -3390,7 +3390,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
ret = sctp_auth_set_key(sctp_sk(sk)->ep, asoc, authkey); ret = sctp_auth_set_key(sctp_sk(sk)->ep, asoc, authkey);
out: out:
kfree(authkey); kzfree(authkey);
return ret; return ret;
} }