[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20060726.154917.124068980.davem@davemloft.net>
Date: Wed, 26 Jul 2006 15:49:17 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: sds@...ho.nsa.gov
Cc: cxzhang@...son.ibm.com, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org, jmorris@...ei.org,
catalin.marinas@...il.com, michal.k.k.piotrowski@...il.com,
czhang.us@...il.com
Subject: Re: RFC: kernel memory leak fix for af_unix datagram getpeersec
From: Stephen Smalley <sds@...ho.nsa.gov>
Date: Wed, 26 Jul 2006 16:50:40 -0400
> > diff -puN net/unix/af_unix.c~af_unix-datagram-getpeersec-ml-fix net/unix/af_unix.c
> > --- linux-2.6.18-rc2/net/unix/af_unix.c~af_unix-datagram-getpeersec-ml-fix 2006-07-22 23:01:26.000000000 -0400
> > +++ linux-2.6.18-rc2-cxzhang/net/unix/af_unix.c 2006-07-22 23:14:15.000000000 -0400
> > @@ -1323,8 +1299,9 @@ static int unix_dgram_sendmsg(struct kio
> > memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
> > if (siocb->scm->fp)
> > unix_attach_fds(siocb->scm, skb);
> > -
> > - unix_get_peersec_dgram(skb);
> > +#ifdef CONFIG_SECURITY_NETWORK
> > + memcpy(UNIXSID(skb), &siocb->scm->sid, sizeof(u32));
> > +#endif /* CONFIG_SECURITY_NETWORK */
>
> You want to retain the static inlines, and just update their contents,
> not replace them with embedded #ifdefs. And this could be a direct
> assignment, right?
This is my feeling too.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists