diff options
| author | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /net/sctp/auth.c | |
| parent | Update selinux info in MAINTAINERS and Kconfig help text (diff) | |
| parent | Linux 2.6.27-rc7 (diff) | |
| download | linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz linux-ab2b49518e743962f71b94246855c44ee9cf52cc.zip | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'net/sctp/auth.c')
| -rw-r--r-- | net/sctp/auth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 1fcb4cf2f4c9..52db5f60daa0 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -786,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep, for (i = 0; i < hmacs->shmac_num_idents; i++) { id = hmacs->shmac_idents[i]; + if (id > SCTP_AUTH_HMAC_ID_MAX) + return -EOPNOTSUPP; + if (SCTP_AUTH_HMAC_ID_SHA1 == id) has_sha1 = 1; |