diff --git a/[refs] b/[refs] index a9d111648337..4a34ea335d21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f77ae9390438409b535f3b1854672e54120cd38b +refs/heads/master: eb4965344965530411359891214cd6fcab483649 diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index a3c8e692f493..641cfbc278d8 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -1012,13 +1012,14 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname, { struct sock *sk = sock->sk; struct netlink_sock *nlk = nlk_sk(sk); - int val = 0, err; + unsigned int val = 0; + int err; if (level != SOL_NETLINK) return -ENOPROTOOPT; if (optlen >= sizeof(int) && - get_user(val, (int __user *)optval)) + get_user(val, (unsigned int __user *)optval)) return -EFAULT; switch (optname) {