Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1342534

Re: [PATCH 3.2 08/67] af_unix: fix struct pid memory leak

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Tue, 2016-02-23 at 22:07 +0000, Rainer Weikusat wrote:
> Ben Hutchings <ben@decadent.org.uk> writes:
> > 3.2.78-rc1 review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Eric Dumazet <edumazet@google.com>
> > 
> > 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 Brandwein

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH 3.2 08/67] af_unix: fix struct pid memory leak Rainer Weikusat <rweikusat@mobileactivedefense.com> - 2016-02-23 23:10 +0100
  Re: [PATCH 3.2 08/67] af_unix: fix struct pid memory leak Ben Hutchings <ben@decadent.org.uk> - 2016-02-25 01:20 +0100
    Re: [PATCH 3.2 08/67] af_unix: fix struct pid memory leak Willy Tarreau <w@1wt.eu> - 2016-02-25 08:30 +0100

csiph-web