Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210529060526.422987-1-changbin.du@gmail.com>
In-Reply-To: <20210529060526.422987-1-changbin.du@gmail.com>
From:   Cong Wang <xiyou.wangcong@gmail.com>
Date:   Sat, 29 May 2021 12:14:57 -0700
Message-ID: <CAM_iQpWwApLVg39rUkyXxnhsiP0SZf=0ft6vsq=VxFtJ2SumAQ@mail.gmail.com>
Subject: Re: [PATCH] net: fix oops in socket ioctl cmd SIOCGSKNS when NET_NS
 is disabled
To:     Changbin Du <changbin.du@gmail.com>
Cc:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kici nski <kuba@kernel.org>,
        Linux Kernel Network Developers <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        stable <stable@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, May 28, 2021 at 11:08 PM Changbin Du <changbin.du@gmail.com> wrote:
> diff --git a/net/socket.c b/net/socket.c
> index 27e3e7d53f8e..644b46112d35 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -1149,11 +1149,15 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
>                         mutex_unlock(&vlan_ioctl_mutex);
>                         break;
>                 case SIOCGSKNS:
> +#ifdef CONFIG_NET_NS
>                         err = -EPERM;
>                         if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
>                                 break;
>
>                         err = open_related_ns(&net->ns, get_net_ns);
> +#else
> +                       err = -ENOTSUPP;
> +#endif

I wonder if it is easier if we just reject ns->ops==NULL case
in open_related_ns(). For 1) we can save an ugly #ifdef here;
2) drivers/net/tun.c has the same bugs.

Something like this:

diff --git a/fs/nsfs.c b/fs/nsfs.c
index 800c1d0eb0d0..d63414604e99 100644
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -152,6 +152,9 @@ int open_related_ns(struct ns_common *ns,
        int err;
        int fd;

+       if (!ns->ops)
+               return -EOPNOTSUPP;
+
        fd = get_unused_fd_flags(O_CLOEXEC);
        if (fd < 0)
                return fd;