diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-08-30 14:32:09 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-08-30 14:32:09 -0400 |
| commit | 11447ae7f8369f3a629db91a3d8015b350301913 (patch) | |
| tree | d1dd81981f008145a810bc85971b6b789a1093bf /net/bluetooth/l2cap_sock.c | |
| parent | f6642cfdad460d807fe5dd76ac28b565571289ab (diff) | |
| parent | 99f614a3bb23603a947be2e95b78507112c484e5 (diff) | |
Merge tag 'v4.1.31' into v4.1-rt
Linux 4.1.31
Conflicts:
fs/dcache.c
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index a7278f05eafb..289c96d3e47d 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -927,7 +927,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, break; } - if (get_user(opt, (u32 __user *) optval)) { + if (get_user(opt, (u16 __user *) optval)) { err = -EFAULT; break; } |