From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Baerts Date: Wed, 22 Jul 2020 08:26:42 +0000 Subject: Re: [MPTCP] [PATCH 24/24] net: pass a sockptr_t into ->setsockopt Message-Id: List-Id: References: <20200720124737.118617-1-hch@lst.de> <20200720124737.118617-25-hch@lst.de> In-Reply-To: <20200720124737.118617-25-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christoph Hellwig Cc: "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Alexey Kuznetsov , Hideaki YOSHIFUJI , Eric Dumazet , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-sctp@vger.kernel.org, linux-hams@vger.kernel.org, linux-bluetooth@vger.kernel.org, bridge@lists.linux-foundation.org, linux-can@vger.kernel.org, dccp@vger.kernel.org, linux-decnet-user@lists.sourceforge.net, linux-wpan@vger.kernel.org, linux-s390@vger.kernel.org, mptcp@lists.01.org, lvs-devel@vger.kernel.org, rds-devel@oss.oracle.com, linux-afs@lists.infradead.org, tipc-discussion@lists.sourceforge.net, linux-x25@vger.kernel.org Hi Christoph, On 20/07/2020 14:47, Christoph Hellwig wrote: > Rework the remaining setsockopt code to pass a sockptr_t instead of a > plain user pointer. This removes the last remaining set_fs(KERNEL_DS) > outside of architecture specific code. > > Signed-off-by: Christoph Hellwig > --- ... > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index 27b6f250b87dfd..30a8e697b9db9c 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -1627,7 +1627,7 @@ static void mptcp_destroy(struct sock *sk) > } > > static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname, > - char __user *optval, unsigned int optlen) > + sockptr_t optval, unsigned int optlen) > { > struct sock *sk = (struct sock *)msk; > struct socket *ssock; > @@ -1643,8 +1643,8 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname, > return -EINVAL; > } > > - ret = sock_setsockopt(ssock, SOL_SOCKET, optname, > - USER_SOCKPTR(optval), optlen); > + ret = sock_setsockopt(ssock, SOL_SOCKET, optname, optval, > + optlen); A very small detail related to the modifications in MPTCP code, only if you have to send a v2 and if you don't mind: may you move "optlen" to the previous line like it was before your patch 7/24. Same below at the end of the function. That would reduce the global diff in MPTCP files to function signatures only. Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net