diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-01 19:49:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-01 19:49:34 -0400 |
| commit | c0b458a9463bd6be165374a8e9e3235800ee132e (patch) | |
| tree | a96c6393749ab231c6dda8c62683493bd1c66070 /net/netlink | |
| parent | 859a59352e926315b6384c5fd895b00a30659a12 (diff) | |
| parent | b5dbc28762fd3fd40ba76303be0c7f707826f982 (diff) | |
| download | linux-stable-c0b458a9463bd6be165374a8e9e3235800ee132e.tar.gz linux-stable-c0b458a9463bd6be165374a8e9e3235800ee132e.tar.bz2 linux-stable-c0b458a9463bd6be165374a8e9e3235800ee132e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:
1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE
2) In 'net-next' params->log_rq_size is renamed to be
params->log_rq_mtu_frames.
3) In 'net-next' params->hard_mtu is added.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index f1b02d87e336..fa556fdef57d 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1085,6 +1085,9 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr, if (addr->sa_family != AF_NETLINK) return -EINVAL; + if (alen < sizeof(struct sockaddr_nl)) + return -EINVAL; + if ((nladdr->nl_groups || nladdr->nl_pid) && !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND)) return -EPERM; |