On Tue, 2016-02-23 at 22:07 +0000, Rainer Weikusat wrote:
> Ben Hutchings <ben@xxxxxxxxxxxxxxx> writes:
> > 3.2.78-rc1 review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Eric Dumazet <edumazet@xxxxxxxxxx>
> >
> > commit fa0dc04df259ba2df3ce1920e9690c7842f8fa4b upstream.
>
> [...]
>
> > Fixes: b3ca9b02b007 ("net: fix multithreaded signal handling in unix recv routines")
>
> [...]
>
> > net/unix/af_unix.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > --- a/net/unix/af_unix.c
> > +++ b/net/unix/af_unix.c
> > @@ -2100,6 +2100,7 @@ static int unix_stream_recvmsg(struct ki
> >
> > if (signal_pending(current)) {
> > err = sock_intr_errno(timeo);
> > + scm_destroy(siocb->scm);
> > goto out;
> > }
>
> JFTR: The commit mentioned in the fixes is (just the relevant part)
[...]
> This not only didn't add the block triggering the error but this change
> isn't even part of the (version of) the function which was fixed
> anymore.
Yes, it looks like the bug was really introduced way back in 2.5.65 by
"[NET]: Simplify scm handling and sendmsg/recvmsg invocation,
consolidate net compat syscalls."
So I think this is also needed for 2.6.32.
Ben.
--
Ben Hutchings
Beware of programmers who carry screwdrivers. - Leonard BrandweinAttachment:
signature.asc
Description: This is a digitally signed message part