From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: dccp@vger.kernel.org
Subject: Re: [MPTCP] [PATCH 24/24] net: pass a sockptr_t into ->setsockopt
Date: Wed, 22 Jul 2020 08:26:42 +0000 [thread overview]
Message-ID: <b3665200-2476-9d35-8dea-d5da141c6b70@tessares.net> (raw)
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 <hch@lst.de>
> ---
...
> 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
reply other threads:[~2020-07-22 8:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b3665200-2476-9d35-8dea-d5da141c6b70@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=dccp@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).