diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-06 21:44:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-06 21:44:57 -0400 |
| commit | 13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch) | |
| tree | 1bf30874f57c6c6b21160a10282191fcd0868055 /net/sctp/socket.c | |
| parent | 05bb520376af2c5146d3c44832c22ec3bb54d778 (diff) | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 2f7e88c46dd2..12503e16fa96 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -985,7 +985,7 @@ static int sctp_setsockopt_bindx(struct sock *sk, | |||
| 985 | return -EINVAL; | 985 | return -EINVAL; |
| 986 | 986 | ||
| 987 | kaddrs = memdup_user(addrs, addrs_size); | 987 | kaddrs = memdup_user(addrs, addrs_size); |
| 988 | if (unlikely(IS_ERR(kaddrs))) | 988 | if (IS_ERR(kaddrs)) |
| 989 | return PTR_ERR(kaddrs); | 989 | return PTR_ERR(kaddrs); |
| 990 | 990 | ||
| 991 | /* Walk through the addrs buffer and count the number of addresses. */ | 991 | /* Walk through the addrs buffer and count the number of addresses. */ |
| @@ -1304,7 +1304,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk, | |||
| 1304 | return -EINVAL; | 1304 | return -EINVAL; |
| 1305 | 1305 | ||
| 1306 | kaddrs = memdup_user(addrs, addrs_size); | 1306 | kaddrs = memdup_user(addrs, addrs_size); |
| 1307 | if (unlikely(IS_ERR(kaddrs))) | 1307 | if (IS_ERR(kaddrs)) |
| 1308 | return PTR_ERR(kaddrs); | 1308 | return PTR_ERR(kaddrs); |
| 1309 | 1309 | ||
| 1310 | /* Allow security module to validate connectx addresses. */ | 1310 | /* Allow security module to validate connectx addresses. */ |