The motivation for this is to remove the SOL_SOCKET limitation from io_uring_cmd_getsockopt().
As a first step this adds get_optlen() and put_optlen() helper macros make it relatively easy to review and check the behaviour is most likely unchanged, before the 'int __user *optlen' of the low level .getsockopt() hooks will be changed into a kernel pointer. Link: https://lore.kernel.org/io-uring/86b1dce5-4bb4-4a0b-9cff-e72f488bf...@samba.org/T/#t Cc: Jens Axboe <ax...@kernel.dk> Cc: Pavel Begunkov <asml.sile...@gmail.com> Cc: Breno Leitao <lei...@debian.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Jakub Kicinski <k...@kernel.org> Cc: Christoph Hellwig <h...@lst.de> Cc: Karsten Keil <i...@linux-pingi.de> Cc: Ayush Sawal <ayush.sa...@chelsio.com> Cc: Andrew Lunn <andrew+net...@lunn.ch> Cc: "David S. Miller" <da...@davemloft.net> Cc: Eric Dumazet <eduma...@google.com> Cc: Paolo Abeni <pab...@redhat.com> Cc: Simon Horman <ho...@kernel.org> Cc: Kuniyuki Iwashima <kun...@amazon.com> Cc: Willem de Bruijn <will...@google.com> Cc: David Ahern <dsah...@kernel.org> Cc: Marcelo Ricardo Leitner <marcelo.leit...@gmail.com> Cc: Xin Long <lucien....@gmail.com> Cc: Neal Cardwell <ncardw...@google.com> Cc: Joerg Reuter <jreu...@yaina.de> Cc: Marcel Holtmann <mar...@holtmann.org> Cc: Johan Hedberg <johan.hedb...@gmail.com> Cc: Luiz Augusto von Dentz <luiz.de...@gmail.com> Cc: Oliver Hartkopp <socket...@hartkopp.net> Cc: Marc Kleine-Budde <m...@pengutronix.de> Cc: Robin van der Gracht <ro...@protonic.nl> Cc: Oleksij Rempel <o.rem...@pengutronix.de> Cc: ker...@pengutronix.de Cc: Alexander Aring <alex.ar...@gmail.com> Cc: Stefan Schmidt <ste...@datenfreihafen.org> Cc: Miquel Raynal <miquel.ray...@bootlin.com> Cc: Alexandra Winter <wint...@linux.ibm.com> Cc: Thorsten Winkler <twink...@linux.ibm.com> Cc: James Chapman <jchap...@katalix.com> Cc: Jeremy Kerr <j...@codeconstruct.com.au> Cc: Matt Johnston <m...@codeconstruct.com.au> Cc: Matthieu Baerts <matt...@kernel.org> Cc: Mat Martineau <martin...@kernel.org> Cc: Geliang Tang <geli...@kernel.org> Cc: Krzysztof Kozlowski <k...@kernel.org> Cc: Remi Denis-Courmont <courmi...@gmail.com> Cc: Allison Henderson <allison.hender...@oracle.com> Cc: David Howells <dhowe...@redhat.com> Cc: Marc Dionne <marc.dio...@auristor.com> Cc: Wenjia Zhang <wen...@linux.ibm.com> Cc: Jan Karcher <j...@linux.ibm.com> Cc: "D. Wythe" <alib...@linux.alibaba.com> Cc: Tony Lu <ton...@linux.alibaba.com> Cc: Wen Gu <gu...@linux.alibaba.com> Cc: Jon Maloy <jma...@redhat.com> Cc: Boris Pismenny <bor...@nvidia.com> Cc: John Fastabend <john.fastab...@gmail.com> Cc: Stefano Garzarella <sgarz...@redhat.com> Cc: Martin Schiller <m...@dev.tdt.de> Cc: "Björn Töpel" <bj...@kernel.org> Cc: Magnus Karlsson <magnus.karls...@intel.com> Cc: Maciej Fijalkowski <maciej.fijalkow...@intel.com> Cc: Jonathan Lemon <jonathan.le...@gmail.com> Cc: Alexei Starovoitov <a...@kernel.org> Cc: Daniel Borkmann <dan...@iogearbox.net> Cc: Jesper Dangaard Brouer <h...@kernel.org> CC: Stefan Metzmacher <me...@samba.org> Cc: net...@vger.kernel.org Cc: linux-ker...@vger.kernel.org Cc: linux-s...@vger.kernel.org Cc: linux-h...@vger.kernel.org Cc: linux-blueto...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: d...@vger.kernel.org Cc: linux-w...@vger.kernel.org Cc: linux-s...@vger.kernel.org Cc: mp...@lists.linux.dev Cc: linux-r...@vger.kernel.org Cc: rds-de...@oss.oracle.com Cc: linux-...@lists.infradead.org Cc: tipc-discussion@lists.sourceforge.net Cc: virtualizat...@lists.linux.dev Cc: linux-...@vger.kernel.org Cc: b...@vger.kernel.org Cc: isdn4li...@listserv.isdn4linux.de Cc: io-ur...@vger.kernel.org Signed-off-by: Stefan Metzmacher <me...@samba.org> --- drivers/isdn/mISDN/socket.c | 2 +- include/linux/sockptr.h | 22 ++++++++ net/atm/common.c | 2 +- net/atm/svc.c | 2 +- net/ax25/af_ax25.c | 4 +- net/bluetooth/hci_sock.c | 2 +- net/bluetooth/iso.c | 4 +- net/bluetooth/l2cap_sock.c | 4 +- net/bluetooth/rfcomm/sock.c | 4 +- net/bluetooth/sco.c | 6 +- net/can/isotp.c | 4 +- net/can/j1939/socket.c | 4 +- net/can/raw.c | 12 ++-- net/dccp/ccid.c | 2 +- net/dccp/ccids/ccid3.c | 4 +- net/dccp/proto.c | 6 +- net/ieee802154/socket.c | 4 +- net/ipv4/ip_sockglue.c | 4 +- net/ipv4/raw.c | 4 +- net/ipv4/udp.c | 4 +- net/ipv6/ipv6_sockglue.c | 4 +- net/ipv6/raw.c | 8 +-- net/iucv/af_iucv.c | 4 +- net/kcm/kcmsock.c | 4 +- net/l2tp/l2tp_ppp.c | 4 +- net/llc/af_llc.c | 4 +- net/mctp/af_mctp.c | 2 +- net/mptcp/sockopt.c | 18 +++--- net/netlink/af_netlink.c | 6 +- net/netrom/af_netrom.c | 4 +- net/nfc/llcp_sock.c | 4 +- net/packet/af_packet.c | 4 +- net/phonet/pep.c | 4 +- net/rds/af_rds.c | 6 +- net/rds/info.c | 4 +- net/rose/af_rose.c | 4 +- net/rxrpc/af_rxrpc.c | 4 +- net/sctp/socket.c | 108 ++++++++++++++++++------------------ net/smc/af_smc.c | 4 +- net/tipc/socket.c | 6 +- net/tls/tls_main.c | 8 +-- net/vmw_vsock/af_vsock.c | 4 +- net/x25/af_x25.c | 4 +- net/xdp/xsk.c | 8 +-- 44 files changed, 176 insertions(+), 154 deletions(-) diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index b215b28cad7b..b750cc0dfa4a 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -438,7 +438,7 @@ static int data_sock_getsockopt(struct socket *sock, int level, int optname, struct sock *sk = sock->sk; int len, opt; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len != sizeof(char)) diff --git a/include/linux/sockptr.h b/include/linux/sockptr.h index 3e6c8e9d67ae..28dbc3e27374 100644 --- a/include/linux/sockptr.h +++ b/include/linux/sockptr.h @@ -169,4 +169,26 @@ static inline int check_zeroed_sockptr(sockptr_t src, size_t offset, return memchr_inv(src.kernel + offset, 0, size) == NULL; } +#define __check_optlen_t(__optlen) \ +({ \ + int __user *__ptr __maybe_unused = __optlen; \ + BUILD_BUG_ON(sizeof(*(__ptr)) != sizeof(int)); \ +}) + +#define get_optlen(__val, __optlen) \ +({ \ + long __err; \ + __check_optlen_t(__optlen); \ + __err = get_user(__val, __optlen); \ + __err; \ +}) + +#define put_optlen(__val, __optlen) \ +({ \ + long __err; \ + __check_optlen_t(__optlen); \ + __err = put_user(__val, __optlen); \ + __err; \ +}) + #endif /* _LINUX_SOCKPTR_H */ diff --git a/net/atm/common.c b/net/atm/common.c index 9b75699992ff..e95371abd705 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -792,7 +792,7 @@ int vcc_getsockopt(struct socket *sock, int level, int optname, struct atm_vcc *vcc; int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (__SO_LEVEL_MATCH(optname, level) && len != __SO_SIZE(optname)) return -EINVAL; diff --git a/net/atm/svc.c b/net/atm/svc.c index f8137ae693b0..a706c5f77d8e 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -511,7 +511,7 @@ static int svc_getsockopt(struct socket *sock, int level, int optname, error = vcc_getsockopt(sock, level, optname, optval, optlen); goto out; } - if (get_user(len, optlen)) { + if (get_optlen(len, optlen)) { error = -EFAULT; goto out; } diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 3ee7dba34310..b184e2cb4b50 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -728,7 +728,7 @@ static int ax25_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_AX25) return -ENOPROTOOPT; - if (get_user(maxlen, optlen)) + if (get_optlen(maxlen, optlen)) return -EFAULT; if (maxlen < 1) @@ -805,7 +805,7 @@ static int ax25_getsockopt(struct socket *sock, int level, int optname, } release_sock(sk); - if (put_user(length, optlen)) + if (put_optlen(length, optlen)) return -EFAULT; return copy_to_user(optval, valptr, length) ? -EFAULT : 0; diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 022b86797acd..4b4e476e4e7c 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -2061,7 +2061,7 @@ static int hci_sock_getsockopt_old(struct socket *sock, int level, int optname, BT_DBG("sk %p, opt %d", sk, optname); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index 3501a991f1c6..f6624b6e5485 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -1731,7 +1731,7 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname, BT_DBG("sk %p", sk); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); @@ -1777,7 +1777,7 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname, len = min_t(unsigned int, len, base_len); if (copy_to_user(optval, base, len)) err = -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) err = -EFAULT; break; diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 5aa55fa69594..8ae25a918fd3 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -445,7 +445,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, BT_DBG("sk %p", sk); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); @@ -570,7 +570,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_BLUETOOTH) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 913402806fa0..785894b79dd8 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -734,7 +734,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u BT_DBG("sk %p", sk); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); @@ -813,7 +813,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c if (level != SOL_BLUETOOTH) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 2945d27e75dc..25910eca759c 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -1047,7 +1047,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname, BT_DBG("sk %p", sk); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); @@ -1117,7 +1117,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, if (level == SOL_SCO) return sco_sock_getsockopt_old(sock, optname, optval, optlen); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; lock_sock(sk); @@ -1266,7 +1266,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, lock_sock(sk); - if (!err && put_user(buf_len, optlen)) + if (!err && put_optlen(buf_len, optlen)) err = -EFAULT; break; diff --git a/net/can/isotp.c b/net/can/isotp.c index 1efa377f002e..aa9ab87d5e14 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1495,7 +1495,7 @@ static int isotp_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_CAN_ISOTP) return -EINVAL; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) return -EINVAL; @@ -1530,7 +1530,7 @@ static int isotp_getsockopt(struct socket *sock, int level, int optname, return -ENOPROTOOPT; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, val, len)) return -EFAULT; diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index 17226b2341d0..b2b538528c2e 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -766,7 +766,7 @@ static int j1939_sk_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_CAN_J1939) return -EINVAL; - if (get_user(ulen, optlen)) + if (get_optlen(ulen, optlen)) return -EFAULT; if (ulen < 0) return -EINVAL; @@ -793,7 +793,7 @@ static int j1939_sk_getsockopt(struct socket *sock, int level, int optname, */ if (len > ulen) ret = -EFAULT; - else if (put_user(len, optlen)) + else if (put_optlen(len, optlen)) ret = -EFAULT; else if (copy_to_user(optval, val, len)) ret = -EFAULT; diff --git a/net/can/raw.c b/net/can/raw.c index 020f21430b1d..8d1a1626d1a4 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -762,7 +762,7 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_CAN_RAW) return -EINVAL; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) return -EINVAL; @@ -779,7 +779,7 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, if (len < fsize) { /* return -ERANGE and needed space in optlen */ err = -ERANGE; - if (put_user(fsize, optlen)) + if (put_optlen(fsize, optlen)) err = -EFAULT; } else { if (len > fsize) @@ -793,7 +793,7 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, release_sock(sk); if (!err) - err = put_user(len, optlen); + err = put_optlen(len, optlen); return err; } case CAN_RAW_ERR_FILTER: @@ -833,7 +833,7 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, if (len < sizeof(ro->raw_vcid_opts)) { /* return -ERANGE and needed space in optlen */ err = -ERANGE; - if (put_user(sizeof(ro->raw_vcid_opts), optlen)) + if (put_optlen(sizeof(ro->raw_vcid_opts), optlen)) err = -EFAULT; } else { if (len > sizeof(ro->raw_vcid_opts)) @@ -842,7 +842,7 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, err = -EFAULT; } if (!err) - err = put_user(len, optlen); + err = put_optlen(len, optlen); return err; } case CAN_RAW_JOIN_FILTERS: @@ -855,7 +855,7 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, return -ENOPROTOOPT; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, val, len)) return -EFAULT; diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c index 6beac5d348e2..6f495ffb1d60 100644 --- a/net/dccp/ccid.c +++ b/net/dccp/ccid.c @@ -66,7 +66,7 @@ int ccid_getsockopt_builtin_ccids(struct sock *sk, int len, if (ccid_get_builtin_ccids(&ccid_array, &array_len)) return -ENOBUFS; - if (put_user(array_len, optlen)) + if (put_optlen(array_len, optlen)) err = -EFAULT; else if (len > 0 && copy_to_user(optval, ccid_array, len > array_len ? array_len : len)) diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index f349d16dd8f6..648aa5270f37 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c @@ -543,7 +543,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len, return -ENOPROTOOPT; } - if (put_user(len, optlen) || copy_to_user(optval, val, len)) + if (put_optlen(len, optlen) || copy_to_user(optval, val, len)) return -EFAULT; return 0; @@ -833,7 +833,7 @@ static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len, return -ENOPROTOOPT; } - if (put_user(len, optlen) || copy_to_user(optval, val, len)) + if (put_optlen(len, optlen) || copy_to_user(optval, val, len)) return -EFAULT; return 0; diff --git a/net/dccp/proto.c b/net/dccp/proto.c index fcc5c9d64f46..8d6461ef8b50 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -603,7 +603,7 @@ static int dccp_getsockopt_service(struct sock *sk, int len, goto out; err = 0; - if (put_user(total_len, optlen) || + if (put_optlen(total_len, optlen) || put_user(dp->dccps_service, optval) || (sl != NULL && copy_to_user(optval + 1, sl->dccpsl_list, slen))) err = -EFAULT; @@ -618,7 +618,7 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname, struct dccp_sock *dp; int val, len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < (int)sizeof(int)) @@ -674,7 +674,7 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname, } len = sizeof(val); - if (put_user(len, optlen) || copy_to_user(optval, &val, len)) + if (put_optlen(len, optlen) || copy_to_user(optval, &val, len)) return -EFAULT; return 0; diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index 18d267921bb5..cc1788853c08 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c @@ -841,7 +841,7 @@ static int dgram_getsockopt(struct sock *sk, int level, int optname, if (level != SOL_IEEE802154) return -EOPNOTSUPP; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; len = min_t(unsigned int, len, sizeof(int)); @@ -871,7 +871,7 @@ static int dgram_getsockopt(struct sock *sk, int level, int optname, return -ENOPROTOOPT; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 6d9c5c20b1c4..4d372f76b317 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1771,12 +1771,12 @@ int ip_getsockopt(struct sock *sk, int level, !ip_mroute_opt(optname)) { int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; err = nf_getsockopt(sk, PF_INET, optname, optval, &len); if (err >= 0) - err = put_user(len, optlen); + err = put_optlen(len, optlen); return err; } #endif diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 6aace4d55733..89d70acdacdc 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -811,7 +811,7 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o { int len, ret = -EFAULT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) goto out; ret = -EINVAL; if (len < 0) @@ -819,7 +819,7 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o if (len > sizeof(struct icmp_filter)) len = sizeof(struct icmp_filter); ret = -EFAULT; - if (put_user(len, optlen) || + if (put_optlen(len, optlen) || copy_to_user(optval, &raw_sk(sk)->filter, len)) goto out; ret = 0; diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index d0bffcfa56d8..17c3fb1acb30 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -3058,7 +3058,7 @@ int udp_lib_getsockopt(struct sock *sk, int level, int optname, struct udp_sock *up = udp_sk(sk); int val, len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -3105,7 +3105,7 @@ int udp_lib_getsockopt(struct sock *sk, int level, int optname, return -ENOPROTOOPT; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 1e225e6489ea..9b1843288035 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -1487,12 +1487,12 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, if (err == -ENOPROTOOPT && optname != IPV6_2292PKTOPTIONS) { int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; err = nf_getsockopt(sk, PF_INET6, optname, optval, &len); if (err >= 0) - err = put_user(len, optlen); + err = put_optlen(len, optlen); } #endif return err; diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index fda640ebd53f..90216d7e2af6 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -957,13 +957,13 @@ static int rawv6_geticmpfilter(struct sock *sk, int optname, switch (optname) { case ICMPV6_FILTER: - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) return -EINVAL; if (len > sizeof(struct icmp6_filter)) len = sizeof(struct icmp6_filter); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &raw6_sk(sk)->filter, len)) return -EFAULT; @@ -1055,7 +1055,7 @@ static int do_rawv6_getsockopt(struct sock *sk, int level, int optname, struct raw6_sock *rp = raw6_sk(sk); int val, len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; switch (optname) { @@ -1080,7 +1080,7 @@ static int do_rawv6_getsockopt(struct sock *sk, int level, int optname, len = min_t(unsigned int, sizeof(int), len); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index cc2b3c44bc05..ce0c68c9513c 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1543,7 +1543,7 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_IUCV) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -1572,7 +1572,7 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname, return -ENOPROTOOPT; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 24aec295a51c..68b6a8bd0cdb 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1153,7 +1153,7 @@ static int kcm_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_KCM) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -1169,7 +1169,7 @@ static int kcm_getsockopt(struct socket *sock, int level, int optname, return -ENOPROTOOPT; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index fc5c2fd8f34c..aa3e34ef6b5c 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1343,7 +1343,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_PPPOL2TP) return -EINVAL; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -1374,7 +1374,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname, } err = -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto end_put_sess; if (copy_to_user((void __user *)optval, &val, len)) diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 0259cde394ba..a8e5d6eb5ad1 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -1179,7 +1179,7 @@ static int llc_ui_getsockopt(struct socket *sock, int level, int optname, lock_sock(sk); if (unlikely(level != SOL_LLC)) goto out; - rc = get_user(len, optlen); + rc = get_optlen(len, optlen); if (rc) goto out; rc = -EINVAL; @@ -1210,7 +1210,7 @@ static int llc_ui_getsockopt(struct socket *sock, int level, int optname, goto out; } rc = 0; - if (put_user(len, optlen) || copy_to_user(optval, &val, len)) + if (put_optlen(len, optlen) || copy_to_user(optval, &val, len)) rc = -EFAULT; out: release_sock(sk); diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c index f6de136008f6..2cff81d47b76 100644 --- a/net/mctp/af_mctp.c +++ b/net/mctp/af_mctp.c @@ -335,7 +335,7 @@ static int mctp_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_MCTP) return -EINVAL; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (optname == MCTP_OPT_ADDR_EXT) { diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 3caa0a9d3b38..25b780598888 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -996,7 +996,7 @@ static int mptcp_getsockopt_info(struct mptcp_sock *msk, char __user *optval, in struct mptcp_info m_info; int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; /* When used only to check if a fallback to TCP happened. */ @@ -1007,7 +1007,7 @@ static int mptcp_getsockopt_info(struct mptcp_sock *msk, char __user *optval, in mptcp_diag_fill_info(msk, &m_info); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &m_info, len)) @@ -1028,7 +1028,7 @@ static int mptcp_put_subflow_data(struct mptcp_subflow_data *sfd, else copied = copylen; - if (put_user(copied, optlen)) + if (put_optlen(copied, optlen)) return -EFAULT; if (copy_to_user(optval, sfd, copylen)) @@ -1043,7 +1043,7 @@ static int mptcp_get_subflow_data(struct mptcp_subflow_data *sfd, { int len, copylen; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; /* if mptcp_subflow_data size is changed, need to adjust @@ -1229,7 +1229,7 @@ static int mptcp_get_full_info(struct mptcp_full_info *mfi, BUILD_BUG_ON(offsetof(struct mptcp_full_info, mptcp_info) != MIN_FULL_INFO_OPTLEN_SIZE); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < MIN_FULL_INFO_OPTLEN_SIZE) @@ -1257,7 +1257,7 @@ static int mptcp_put_full_info(struct mptcp_full_info *mfi, int __user *optlen) { copylen += MIN_FULL_INFO_OPTLEN_SIZE; - if (put_user(copylen, optlen)) + if (put_optlen(copylen, optlen)) return -EFAULT; if (copy_to_user(optval, mfi, copylen)) @@ -1344,7 +1344,7 @@ static int mptcp_put_int_option(struct mptcp_sock *msk, char __user *optval, { int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) return -EINVAL; @@ -1353,13 +1353,13 @@ static int mptcp_put_int_option(struct mptcp_sock *msk, char __user *optval, unsigned char ucval = (unsigned char)val; len = 1; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &ucval, 1)) return -EFAULT; } else { len = min_t(unsigned int, len, sizeof(int)); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index e8972a857e51..3cde0f15deed 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1715,7 +1715,7 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_NETLINK) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) return -EINVAL; @@ -1746,7 +1746,7 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname, break; } } - if (put_user(ALIGN(BITS_TO_BYTES(nlk->ngroups), sizeof(u32)), optlen)) + if (put_optlen(ALIGN(BITS_TO_BYTES(nlk->ngroups), sizeof(u32)), optlen)) err = -EFAULT; netlink_unlock_table(); return err; @@ -1773,7 +1773,7 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname, len = sizeof(int); val = test_bit(flag, &nlk->flags); - if (put_user(len, optlen) || + if (put_optlen(len, optlen) || copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 6ee148f0e6d0..6039b5219460 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -356,7 +356,7 @@ static int nr_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_NETROM) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -389,7 +389,7 @@ static int nr_getsockopt(struct socket *sock, int level, int optname, len = min_t(unsigned int, len, sizeof(int)); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return copy_to_user(optval, &val, len) ? -EFAULT : 0; diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 57a2f97004e1..5e588640c22f 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -316,7 +316,7 @@ static int nfc_llcp_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_NFC) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; local = llcp_sock->local; @@ -372,7 +372,7 @@ static int nfc_llcp_getsockopt(struct socket *sock, int level, int optname, release_sock(sk); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return err; diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 3e9ddf72cd03..f35ab96fbcad 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4117,7 +4117,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_PACKET) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -4223,7 +4223,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, if (len > lv) len = lv; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, data, len)) return -EFAULT; diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 53a858478e22..78b269ddf28b 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -1070,7 +1070,7 @@ static int pep_getsockopt(struct sock *sk, int level, int optname, if (level != SOL_PNPIPE) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; switch (optname) { @@ -1097,7 +1097,7 @@ static int pep_getsockopt(struct sock *sk, int level, int optname, } len = min_t(unsigned int, sizeof(int), len); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (put_user(val, (int __user *) optval)) return -EFAULT; diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 8435a20968ef..3395062245c5 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c @@ -490,7 +490,7 @@ static int rds_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_RDS) goto out; - if (get_user(len, optlen)) { + if (get_optlen(len, optlen)) { ret = -EFAULT; goto out; } @@ -506,7 +506,7 @@ static int rds_getsockopt(struct socket *sock, int level, int optname, ret = -EINVAL; else if (put_user(rs->rs_recverr, (int __user *) optval) || - put_user(sizeof(int), optlen)) + put_optlen(sizeof(int), optlen)) ret = -EFAULT; else ret = 0; @@ -519,7 +519,7 @@ static int rds_getsockopt(struct socket *sock, int level, int optname, trans = (rs->rs_transport ? rs->rs_transport->t_type : RDS_TRANS_NONE); /* unbound */ if (put_user(trans, (int __user *)optval) || - put_user(sizeof(int), optlen)) + put_optlen(sizeof(int), optlen)) ret = -EFAULT; else ret = 0; diff --git a/net/rds/info.c b/net/rds/info.c index b6b46a8214a0..1990d068f6ee 100644 --- a/net/rds/info.c +++ b/net/rds/info.c @@ -168,7 +168,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, int len; int total; - if (get_user(len, optlen)) { + if (get_optlen(len, optlen)) { ret = -EFAULT; goto out; } @@ -230,7 +230,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, ret = lens.each; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) ret = -EFAULT; out: diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index a4a668b88a8f..a1299e9dd3e6 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -463,7 +463,7 @@ static int rose_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_ROSE) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) @@ -504,7 +504,7 @@ static int rose_getsockopt(struct socket *sock, int level, int optname, len = min_t(unsigned int, len, sizeof(int)); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return copy_to_user(optval, &val, len) ? -EFAULT : 0; diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 86873399f7d5..a88c635888fd 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c @@ -763,7 +763,7 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_RXRPC) return -EOPNOTSUPP; - if (get_user(optlen, _optlen)) + if (get_optlen(optlen, _optlen)) return -EFAULT; switch (optname) { @@ -771,7 +771,7 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname, if (optlen < sizeof(int)) return -ETOOSMALL; if (put_user(RXRPC__SUPPORTED - 1, (int __user *)optval) || - put_user(sizeof(int), _optlen)) + put_optlen(sizeof(int), _optlen)) return -EFAULT; return 0; diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 36ee34f483d7..5120dc7728b7 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1423,7 +1423,7 @@ static int sctp_getsockopt_connectx3(struct sock *sk, int len, if (err == 0 || err == -EINPROGRESS) { if (copy_to_user(optval, &assoc_id, sizeof(assoc_id))) return -EFAULT; - if (put_user(sizeof(assoc_id), optlen)) + if (put_optlen(sizeof(assoc_id), optlen)) return -EFAULT; } @@ -5464,7 +5464,7 @@ static int sctp_getsockopt_sctp_status(struct sock *sk, int len, if (status.sstat_primary.spinfo_state == SCTP_UNKNOWN) status.sstat_primary.spinfo_state = SCTP_ACTIVE; - if (put_user(len, optlen)) { + if (put_optlen(len, optlen)) { retval = -EFAULT; goto out; } @@ -5532,7 +5532,7 @@ static int sctp_getsockopt_peer_addr_info(struct sock *sk, int len, if (pinfo.spinfo_state == SCTP_UNKNOWN) pinfo.spinfo_state = SCTP_ACTIVE; - if (put_user(len, optlen)) { + if (put_optlen(len, optlen)) { retval = -EFAULT; goto out; } @@ -5563,7 +5563,7 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len, len = sizeof(int); val = (sctp_sk(sk)->disable_fragments == 1); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -5586,7 +5586,7 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval, return -EINVAL; if (len > sizeof(struct sctp_event_subscribe)) len = sizeof(struct sctp_event_subscribe); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; for (i = 0; i < len; i++) @@ -5618,7 +5618,7 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv if (len < sizeof(int)) return -EINVAL; len = sizeof(int); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (put_user(sctp_sk(sk)->autoclose, (int __user *)optval)) return -EFAULT; @@ -5729,7 +5729,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval goto out; /* Return the fd mapped to the new socket. */ - if (put_user(len, optlen)) { + if (put_optlen(len, optlen)) { fput(newfile); put_unused_fd(retval); return -EFAULT; @@ -5764,7 +5764,7 @@ static int sctp_getsockopt_peeloff_flags(struct sock *sk, int len, goto out; /* Return the fd mapped to the new socket. */ - if (put_user(len, optlen)) { + if (put_optlen(len, optlen)) { fput(newfile); put_unused_fd(retval); return -EFAULT; @@ -6014,7 +6014,7 @@ static int sctp_getsockopt_peer_addr_params(struct sock *sk, int len, if (copy_to_user(optval, ¶ms, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; @@ -6112,7 +6112,7 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len, if (copy_to_user(optval, ¶ms, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; @@ -6134,7 +6134,7 @@ static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval if (len < sizeof(struct sctp_initmsg)) return -EINVAL; len = sizeof(struct sctp_initmsg); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len)) return -EFAULT; @@ -6187,7 +6187,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num)) return -EFAULT; bytes_copied = ((char __user *)to) - optval; - if (put_user(bytes_copied, optlen)) + if (put_optlen(bytes_copied, optlen)) return -EFAULT; return 0; @@ -6333,7 +6333,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len, /* XXX: We should have accounted for sizeof(struct sctp_getaddrs) too, * but we can't change it anymore. */ - if (put_user(bytes_copied, optlen)) + if (put_optlen(bytes_copied, optlen)) err = -EFAULT; out: kfree(addrs); @@ -6374,7 +6374,7 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len, sctp_get_pf_specific(sk->sk_family)->addr_to_user(sp, (union sctp_addr *)&prim.ssp_addr); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &prim, len)) return -EFAULT; @@ -6400,7 +6400,7 @@ static int sctp_getsockopt_adaptation_layer(struct sock *sk, int len, adaptation.ssb_adaptation_ind = sctp_sk(sk)->adaptation_ind; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &adaptation, len)) return -EFAULT; @@ -6462,7 +6462,7 @@ static int sctp_getsockopt_default_send_param(struct sock *sk, info.sinfo_timetolive = sp->default_timetolive; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &info, len)) return -EFAULT; @@ -6506,7 +6506,7 @@ static int sctp_getsockopt_default_sndinfo(struct sock *sk, int len, info.snd_context = sp->default_context; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &info, len)) return -EFAULT; @@ -6534,7 +6534,7 @@ static int sctp_getsockopt_nodelay(struct sock *sk, int len, len = sizeof(int); val = (sctp_sk(sk)->nodelay == 1); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -6587,7 +6587,7 @@ static int sctp_getsockopt_rtoinfo(struct sock *sk, int len, rtoinfo.srto_min = sp->rtoinfo.srto_min; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &rtoinfo, len)) @@ -6657,7 +6657,7 @@ static int sctp_getsockopt_associnfo(struct sock *sk, int len, sasoc_number_peer_destinations; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &assocparams, len)) @@ -6687,7 +6687,7 @@ static int sctp_getsockopt_mappedv4(struct sock *sk, int len, len = sizeof(int); val = sp->v4mapped; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -6721,7 +6721,7 @@ static int sctp_getsockopt_context(struct sock *sk, int len, params.assoc_value = asoc ? asoc->default_rcv_context : sctp_sk(sk)->default_rcv_context; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, ¶ms, len)) return -EFAULT; @@ -6786,7 +6786,7 @@ static int sctp_getsockopt_maxseg(struct sock *sk, int len, else params.assoc_value = sctp_sk(sk)->user_frag; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (len == sizeof(int)) { if (copy_to_user(optval, ¶ms.assoc_value, len)) @@ -6814,7 +6814,7 @@ static int sctp_getsockopt_fragment_interleave(struct sock *sk, int len, len = sizeof(int); val = sctp_sk(sk)->frag_interleave; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -6838,7 +6838,7 @@ static int sctp_getsockopt_partial_delivery_point(struct sock *sk, int len, len = sizeof(u32); val = sctp_sk(sk)->pd_point; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -6913,7 +6913,7 @@ static int sctp_getsockopt_hmac_ident(struct sock *sk, int len, len = sizeof(struct sctp_hmacalgo) + data_len; num_idents = data_len / sizeof(u16); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (put_user(num_idents, &p->shmac_num_idents)) return -EFAULT; @@ -6954,7 +6954,7 @@ static int sctp_getsockopt_active_key(struct sock *sk, int len, val.scact_keynumber = ep->active_key_id; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -6999,7 +6999,7 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len, return -EFAULT; num: len = sizeof(struct sctp_authchunks) + num_chunks; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (put_user(num_chunks, &p->gauth_number_of_chunks)) return -EFAULT; @@ -7049,7 +7049,7 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len, return -EFAULT; num: len = sizeof(struct sctp_authchunks) + num_chunks; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (put_user(num_chunks, &p->gauth_number_of_chunks)) return -EFAULT; @@ -7081,7 +7081,7 @@ static int sctp_getsockopt_assoc_number(struct sock *sk, int len, val++; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -7104,7 +7104,7 @@ static int sctp_getsockopt_auto_asconf(struct sock *sk, int len, len = sizeof(int); if (sctp_sk(sk)->do_auto_asconf && sctp_is_ep_boundall(sk)) val = 1; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -7152,7 +7152,7 @@ static int sctp_getsockopt_assoc_ids(struct sock *sk, int len, ids->gaids_assoc_id[num++] = asoc->assoc_id; } - if (put_user(len, optlen) || copy_to_user(optval, ids, len)) { + if (put_optlen(len, optlen) || copy_to_user(optval, ids, len)) { kfree(ids); return -EFAULT; } @@ -7215,7 +7215,7 @@ static int sctp_getsockopt_paddr_thresholds(struct sock *sk, } out: - if (put_user(len, optlen) || copy_to_user(optval, &val, len)) + if (put_optlen(len, optlen) || copy_to_user(optval, &val, len)) return -EFAULT; return 0; @@ -7274,7 +7274,7 @@ static int sctp_getsockopt_assoc_stats(struct sock *sk, int len, /* Mark beginning of a new observation period */ asoc->stats.max_obs_rto = asoc->rto_min; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; pr_debug("%s: len:%d, assoc_id:%d\n", __func__, len, sas.sas_assoc_id); @@ -7297,7 +7297,7 @@ static int sctp_getsockopt_recvrcvinfo(struct sock *sk, int len, len = sizeof(int); if (sctp_sk(sk)->recvrcvinfo) val = 1; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -7317,7 +7317,7 @@ static int sctp_getsockopt_recvnxtinfo(struct sock *sk, int len, len = sizeof(int); if (sctp_sk(sk)->recvnxtinfo) val = 1; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; @@ -7352,7 +7352,7 @@ static int sctp_getsockopt_pr_supported(struct sock *sk, int len, params.assoc_value = asoc ? asoc->peer.prsctp_capable : sctp_sk(sk)->ep->prsctp_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7398,7 +7398,7 @@ static int sctp_getsockopt_default_prinfo(struct sock *sk, int len, info.pr_value = sp->default_timetolive; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, &info, len)) @@ -7453,7 +7453,7 @@ static int sctp_getsockopt_pr_assocstatus(struct sock *sk, int len, asoc->abandoned_sent[__SCTP_PR_INDEX(policy)]; } - if (put_user(len, optlen)) { + if (put_optlen(len, optlen)) { retval = -EFAULT; goto out; } @@ -7522,7 +7522,7 @@ static int sctp_getsockopt_pr_streamstatus(struct sock *sk, int len, streamoute->abandoned_sent[__SCTP_PR_INDEX(policy)]; } - if (put_user(len, optlen) || copy_to_user(optval, ¶ms, len)) { + if (put_optlen(len, optlen) || copy_to_user(optval, ¶ms, len)) { retval = -EFAULT; goto out; } @@ -7560,7 +7560,7 @@ static int sctp_getsockopt_reconfig_supported(struct sock *sk, int len, params.assoc_value = asoc ? asoc->peer.reconf_capable : sctp_sk(sk)->ep->reconf_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7599,7 +7599,7 @@ static int sctp_getsockopt_enable_strreset(struct sock *sk, int len, params.assoc_value = asoc ? asoc->strreset_enable : sctp_sk(sk)->ep->strreset_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7638,7 +7638,7 @@ static int sctp_getsockopt_scheduler(struct sock *sk, int len, params.assoc_value = asoc ? sctp_sched_get_sched(asoc) : sctp_sk(sk)->default_ss; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7678,7 +7678,7 @@ static int sctp_getsockopt_scheduler_value(struct sock *sk, int len, if (retval) goto out; - if (put_user(len, optlen)) { + if (put_optlen(len, optlen)) { retval = -EFAULT; goto out; } @@ -7719,7 +7719,7 @@ static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len, params.assoc_value = asoc ? asoc->peer.intl_capable : sctp_sk(sk)->ep->intl_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7742,7 +7742,7 @@ static int sctp_getsockopt_reuse_port(struct sock *sk, int len, len = sizeof(int); val = sctp_sk(sk)->reuse; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) @@ -7777,7 +7777,7 @@ static int sctp_getsockopt_event(struct sock *sk, int len, char __user *optval, subscribe = asoc ? asoc->subscribe : sctp_sk(sk)->subscribe; param.se_on = sctp_ulpevent_type_enabled(subscribe, param.se_type); - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, ¶m, len)) @@ -7813,7 +7813,7 @@ static int sctp_getsockopt_asconf_supported(struct sock *sk, int len, params.assoc_value = asoc ? asoc->peer.asconf_capable : sctp_sk(sk)->ep->asconf_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7852,7 +7852,7 @@ static int sctp_getsockopt_auth_supported(struct sock *sk, int len, params.assoc_value = asoc ? asoc->peer.auth_capable : sctp_sk(sk)->ep->auth_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7891,7 +7891,7 @@ static int sctp_getsockopt_ecn_supported(struct sock *sk, int len, params.assoc_value = asoc ? asoc->peer.ecn_capable : sctp_sk(sk)->ep->ecn_enable; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7930,7 +7930,7 @@ static int sctp_getsockopt_pf_expose(struct sock *sk, int len, params.assoc_value = asoc ? asoc->pf_expose : sctp_sk(sk)->pf_expose; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; if (copy_to_user(optval, ¶ms, len)) @@ -7995,7 +7995,7 @@ static int sctp_getsockopt_encap_port(struct sock *sk, int len, if (copy_to_user(optval, &encap, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; @@ -8055,7 +8055,7 @@ static int sctp_getsockopt_probe_interval(struct sock *sk, int len, if (copy_to_user(optval, ¶ms, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; @@ -8082,7 +8082,7 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname, return retval; } - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 3e6cb35baf25..405c0bff7121 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -2996,7 +2996,7 @@ static int __smc_getsockopt(struct socket *sock, int level, int optname, smc = smc_sk(sock->sk); - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; len = min_t(int, len, sizeof(int)); @@ -3012,7 +3012,7 @@ static int __smc_getsockopt(struct socket *sock, int level, int optname, return -EOPNOTSUPP; } - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; if (copy_to_user(optval, &val, len)) return -EFAULT; diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 65dcbb54f55d..23822d9230e4 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -3239,10 +3239,10 @@ static int tipc_getsockopt(struct socket *sock, int lvl, int opt, int res; if ((lvl == IPPROTO_TCP) && (sock->type == SOCK_STREAM)) - return put_user(0, ol); + return put_optlen(0, ol); if (lvl != SOL_TIPC) return -ENOPROTOOPT; - res = get_user(len, ol); + res = get_optlen(len, ol); if (res) return res; @@ -3292,7 +3292,7 @@ static int tipc_getsockopt(struct socket *sock, int lvl, int opt, if (copy_to_user(ov, &value, sizeof(value))) return -EFAULT; - return put_user(sizeof(value), ol); + return put_optlen(sizeof(value), ol); } static int tipc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index cb86b0bf9a53..f4e87b4295b4 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -445,7 +445,7 @@ static int do_tls_getsockopt_conf(struct sock *sk, char __user *optval, struct cipher_context *cctx; int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (!optval || (len < sizeof(*crypto_info))) { @@ -503,7 +503,7 @@ static int do_tls_getsockopt_tx_zc(struct sock *sk, char __user *optval, unsigned int value; int len; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len != sizeof(value)) @@ -525,7 +525,7 @@ static int do_tls_getsockopt_no_pad(struct sock *sk, char __user *optval, if (ctx->prot_info.version != TLS_1_3_VERSION) return -EINVAL; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < sizeof(value)) return -EINVAL; @@ -536,7 +536,7 @@ static int do_tls_getsockopt_no_pad(struct sock *sk, char __user *optval, if (value < 0) return value; - if (put_user(sizeof(value), optlen)) + if (put_optlen(sizeof(value), optlen)) return -EFAULT; if (copy_to_user(optval, &value, sizeof(value))) return -EFAULT; diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 7e3db87ae433..c21a3bfcdd75 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1884,7 +1884,7 @@ static int vsock_connectible_getsockopt(struct socket *sock, if (level != AF_VSOCK) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; memset(&v, 0, sizeof(v)); @@ -1919,7 +1919,7 @@ static int vsock_connectible_getsockopt(struct socket *sock, if (copy_to_user(optval, &v, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 8dda4178497c..4eb65c05b3b9 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -457,7 +457,7 @@ static int x25_getsockopt(struct socket *sock, int level, int optname, goto out; rc = -EFAULT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) goto out; rc = -EINVAL; @@ -467,7 +467,7 @@ static int x25_getsockopt(struct socket *sock, int level, int optname, len = min_t(unsigned int, len, sizeof(int)); rc = -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) goto out; val = test_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags); diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index e5d104ce7b82..7cae6f4114b5 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -1470,7 +1470,7 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname, if (level != SOL_XDP) return -ENOPROTOOPT; - if (get_user(len, optlen)) + if (get_optlen(len, optlen)) return -EFAULT; if (len < 0) return -EINVAL; @@ -1507,7 +1507,7 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname, if (copy_to_user(optval, &stats, stats_size)) return -EFAULT; - if (put_user(stats_size, optlen)) + if (put_optlen(stats_size, optlen)) return -EFAULT; return 0; @@ -1559,7 +1559,7 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname, if (copy_to_user(optval, to_copy, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; @@ -1579,7 +1579,7 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname, len = sizeof(opts); if (copy_to_user(optval, &opts, len)) return -EFAULT; - if (put_user(len, optlen)) + if (put_optlen(len, optlen)) return -EFAULT; return 0; -- 2.34.1
