diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2008-08-27 22:41:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-09-08 04:44:24 -0700 |
| commit | e2ab3da38b46f4f1389f18c7cd4a9a71ceac0bc6 (patch) | |
| tree | 86e09571e279f17fa6bb5ef0e3a645e69e8487fa | |
| parent | be9467bd75b522a3db0369c12db739f797cfec6a (diff) | |
sctp: add verification checks to SCTP_AUTH_KEY option
[ Upstream commit 30c2235cbc477d4629983d440cdc4f496fec9246 ]
The structure used for SCTP_AUTH_KEY option contains a
length that needs to be verfied to prevent buffer overflow
conditions. Spoted by Eugene Teo <eteo@redhat.com>.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Eugene Teo <eugeneteo@kernel.sg>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/sctp/auth.c | 4 | ||||
| -rw-r--r-- | net/sctp/socket.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 675a5c3e68a6..1fcb4cf2f4c9 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -80,6 +80,10 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp) { struct sctp_auth_bytes *key; + /* Verify that we are not going to overflow INT_MAX */ + if ((INT_MAX - key_len) < sizeof(struct sctp_auth_bytes)) + return NULL; + /* Allocate the shared key */ key = kmalloc(sizeof(struct sctp_auth_bytes) + key_len, gfp); if (!key) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 100950d5d37d..e62aafc320c2 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3054,6 +3054,11 @@ static int sctp_setsockopt_auth_key(struct sock *sk, goto out; } + if (authkey->sca_keylength > optlen) { + ret = -EINVAL; + goto out; + } + asoc = sctp_id2assoc(sk, authkey->sca_assoc_id); if (!asoc && authkey->sca_assoc_id && sctp_style(sk, UDP)) { ret = -EINVAL; |