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;
Date:   Fri, 07 Aug 2020 13:51:12 -0400
From:   "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Subject: Re: wine fails to start with seccomp updates for v5.9-rc1
To:     Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
        Linus Torvalds <torvalds@linux-foundation.org>
Cc:     Christian Brauner <christian.brauner@ubuntu.com>,
        Aleksa Sarai <cyphar@cyphar.com>,
        Christoph Hellwig <hch@lst.de>,
        Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Matt Denton <mpdenton@google.com>,
        Chris Palmer <palmer@google.com>,
        Robert Sesek <rsesek@google.com>,
        Sargun Dhillon <sargun@sargun.me>,
        Shuah Khan <shuah@kernel.org>, Tycho Andersen <tycho@tycho.ws>,
        Will Drewry <wad@chromium.org>, Will Deacon <will@kernel.org>,
        Yonghong Song <yhs@fb.com>
References: <1596812929.lz7fuo8r2w.none.ref@localhost>
        <1596812929.lz7fuo8r2w.none@localhost>
        <CAHk-=wi41L-OXCPQJi4dtc_7SmYTzXGz0XM=39rjiTNAi2gn3g@mail.gmail.com>
        <20200807173609.GJ4402@mussarela>
In-Reply-To: <20200807173609.GJ4402@mussarela>
MIME-Version: 1.0
Message-Id: <1596822616.zldk40bolg.none@localhost>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Length: 2032
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Excerpts from Thadeu Lima de Souza Cascardo's message of August 7, 2020 1:3=
6 pm:
> On Fri, Aug 07, 2020 at 08:48:46AM -0700, Linus Torvalds wrote:
>> On Fri, Aug 7, 2020 at 8:19 AM Alex Xu (Hello71) <alex_y_xu@yahoo.ca> wr=
ote:
>> >
>> > On Linus' master, wine fails to start with the following error:
>> >
>> > wine client error:0: write: Bad file descriptor
>> >
>> > This issue is not present on 5.8. It appears to be caused by failure t=
o
>> > write to a pipe FD received via SCM_RIGHTS. Therefore, I tried reverti=
ng
>> > 9ecc6ea491f0, which resolved the issue.
>>=20
>> Would you mind trying to bisect exactly where it happens?
>>=20
>=20
> This report [1] seemed related and pointed out at c0029de50982 ("net/scm:
> Regularize compat handling of scm_detach_fds()"). The use of CMSG_USER_DA=
TA
> instead of CMSG_COMPAT_DATA seems fishy.
>=20
> Alex, can you try applying the patch below?
>=20
> Cascardo.
>=20
> [1] https://lists.ozlabs.org/pipermail/linuxppc-dev/2020-August/216156.ht=
ml
>=20
>> I don't think any of the commits in that pull are supposed to change
>> semantics, and while reverting the whole merge shows that yes, that's
>> what brought in the problems, it would be good to pinpoint just which
>> change breaks so that we can fix just that thing.
>>=20
>> Kees, ideas?
>>=20
>>                  Linus
>=20
> ---
> diff --git a/net/compat.c b/net/compat.c
> index 703acb51c698..95ce707a30a3 100644
> --- a/net/compat.c
> +++ b/net/compat.c
> @@ -294,7 +294,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct=
 scm_cookie *scm)
>  		(struct compat_cmsghdr __user *)msg->msg_control;
>  	unsigned int o_flags =3D (msg->msg_flags & MSG_CMSG_CLOEXEC) ? O_CLOEXE=
C : 0;
>  	int fdmax =3D min_t(int, scm_max_fds_compat(msg), scm->fp->count);
> -	int __user *cmsg_data =3D CMSG_USER_DATA(cm);
> +	int __user *cmsg_data =3D CMSG_COMPAT_DATA(cm);
>  	int err =3D 0, i;
> =20
>  	for (i =3D 0; i < fdmax; i++) {
>=20

Yes, this seems to work.

Tested-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>

Thanks!