projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sock: struct proto hash function may error
[cascardo/linux.git]
/
net
/
sctp
/
socket.c
diff --git
a/net/sctp/socket.c
b/net/sctp/socket.c
index
9bb80ec
..
6427b9d
100644
(file)
--- a/
net/sctp/socket.c
+++ b/
net/sctp/socket.c
@@
-6101,9
+6101,10
@@
static int sctp_getsockopt(struct sock *sk, int level, int optname,
return retval;
}
return retval;
}
-static
void
sctp_hash(struct sock *sk)
+static
int
sctp_hash(struct sock *sk)
{
/* STUB */
{
/* STUB */
+ return 0;
}
static void sctp_unhash(struct sock *sk)
}
static void sctp_unhash(struct sock *sk)
@@
-6636,6
+6637,7
@@
static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
if (cmsgs->srinfo->sinfo_flags &
~(SCTP_UNORDERED | SCTP_ADDR_OVER |
if (cmsgs->srinfo->sinfo_flags &
~(SCTP_UNORDERED | SCTP_ADDR_OVER |
+ SCTP_SACK_IMMEDIATELY |
SCTP_ABORT | SCTP_EOF))
return -EINVAL;
break;
SCTP_ABORT | SCTP_EOF))
return -EINVAL;
break;
@@
-6659,6
+6661,7
@@
static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
if (cmsgs->sinfo->snd_flags &
~(SCTP_UNORDERED | SCTP_ADDR_OVER |
if (cmsgs->sinfo->snd_flags &
~(SCTP_UNORDERED | SCTP_ADDR_OVER |
+ SCTP_SACK_IMMEDIATELY |
SCTP_ABORT | SCTP_EOF))
return -EINVAL;
break;
SCTP_ABORT | SCTP_EOF))
return -EINVAL;
break;