From: Jakub Kicinski <kuba@kernel.org>
To: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Changbin Du <changbin.du@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
"David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, stable@vger.kernel.org,
Cong Wang <xiyou.wangcong@gmail.com>,
David Laight <David.Laight@ACULAB.COM>
Subject: Re: [PATCH] nsfs: fix oops when ns->ops is not provided
Date: Tue, 1 Jun 2021 13:26:02 -0700 [thread overview]
Message-ID: <20210601132602.02e92678@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net> (raw)
In-Reply-To: <20210601080654.cl7caplm7rsagl6u@wittgenstein>
On Tue, 1 Jun 2021 10:06:54 +0200 Christian Brauner wrote:
> > I'm not sure why we'd pick runtime checks for something that can be
> > perfectly easily solved at compilation time. Networking should not
> > be asking for FDs for objects which don't exist.
>
> Agreed!
> This should be fixable by sm like:
>
> diff --git a/net/socket.c b/net/socket.c
> index 27e3e7d53f8e..2484466d96ad 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -1150,10 +1150,12 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
> break;
> case SIOCGSKNS:
> err = -EPERM;
> +#ifdef CONFIG_NET_NS
> if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
> break;
>
> err = open_related_ns(&net->ns, get_net_ns);
> +#endif
> break;
> case SIOCGSTAMP_OLD:
> case SIOCGSTAMPNS_OLD:
Thanks! You weren't CCed on v1, so FWIW I was suggesting
checking in get_net_ns(), to catch other callers:
diff --git a/net/socket.c b/net/socket.c
index 27e3e7d53f8e..3b44f2700e0c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1081,6 +1081,8 @@ static long sock_do_ioctl(struct net *net, struct socket *sock,
struct ns_common *get_net_ns(struct ns_common *ns)
{
+ if (!IS_ENABLED(CONFIG_NET_NS))
+ return ERR_PTR(-EOPNOTSUPP);
return &get_net(container_of(ns, struct net, ns))->ns;
}
EXPORT_SYMBOL_GPL(get_net_ns);
next prev parent reply other threads:[~2021-06-01 20:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 15:34 [PATCH] nsfs: fix oops when ns->ops is not provided Changbin Du
2021-06-01 5:01 ` Jakub Kicinski
2021-06-01 8:06 ` Christian Brauner
2021-06-01 20:26 ` Jakub Kicinski [this message]
2021-06-02 9:16 ` Christian Brauner
2021-06-02 16:36 ` Jakub Kicinski
2021-06-01 19:51 ` Cong Wang
2021-06-02 9:14 ` Christian Brauner
2021-06-02 10:41 ` David Laight
2021-06-03 22:52 ` Cong Wang
2021-06-04 9:54 ` Christian Brauner
2021-06-06 22:43 ` Changbin Du
2021-06-07 9:16 ` Christian Brauner
2021-06-07 23:29 ` Changbin Du
2021-06-07 0:37 ` Cong Wang
2021-06-07 9:08 ` Christian Brauner
2021-06-11 0:14 ` Cong Wang
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=20210601132602.02e92678@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net \
--to=kuba@kernel.org \
--cc=David.Laight@ACULAB.COM \
--cc=changbin.du@gmail.com \
--cc=christian.brauner@ubuntu.com \
--cc=davem@davemloft.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=xiyou.wangcong@gmail.com \
/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 NNTP newsgroup(s).