[PATCH] fix missing security_*() check in net/compat.c

[PATCH] fix missing security_*() check in net/compat.c

[Mitchell Blank Jr]

While looking at the SCM passing code in net/core/scm.c I noticed that there's
a 32-bit compat implementation of scm_detach_fds()'s called 
scm_detach_fds_compat() living in net/compat.c.  While these two functions
are mostly the same the latter does not include the call to the
security_file_receive() hook which is almost certainly a bug.

My sparc64 test box isn't set up currently so this is not tested.  Someone
running a 64-bit kernel with CONFIG_COMPAT should verify that this at
least compiles.

Signed-off-by: Mitchell Blank Jr <mitch@sfgoth.com>

-Mitch

--- linux-2.6.10-rc2-bk9-VIRGIN/net/compat.c	2004-10-18 14:54:37.000000000 -0700
+++ linux-2.6.10-rc2-bk9/net/compat.c	2004-11-30 06:40:52.156434868 -0800
@@ -22,6 +22,7 @@
 #include <linux/filter.h>
 #include <linux/compat.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/security.h>
 
 #include <net/scm.h>
 #include <net/sock.h>
@@ -264,6 +265,9 @@
 
 	for (i = 0, cmfptr = (int __user *) CMSG_COMPAT_DATA(cm); i < fdmax; i++, cmfptr++) {
 		int new_fd;
+		err = security_file_receive(fp[i]);
+		if (err)
+			break;
 		err = get_unused_fd();
 		if (err < 0)
 			break;

Re: [PATCH] fix missing security_*() check in net/compat.c

[James Morris]

On Tue, 30 Nov 2004, Mitchell Blank Jr wrote:

> While looking at the SCM passing code in net/core/scm.c I noticed that there's
> a 32-bit compat implementation of scm_detach_fds()'s called 
> scm_detach_fds_compat() living in net/compat.c.  While these two functions
> are mostly the same the latter does not include the call to the
> security_file_receive() hook which is almost certainly a bug.
> 
> My sparc64 test box isn't set up currently so this is not tested.  Someone
> running a 64-bit kernel with CONFIG_COMPAT should verify that this at
> least compiles.
> 
> Signed-off-by: Mitchell Blank Jr <mitch@sfgoth.com>

Looks correct to me.

Signed-off-by: James Morris <jmorris@redhat.com>



-- 
James Morris
<jmorris@redhat.com>

Re: [PATCH] fix missing security_*() check in net/compat.c

[Chris Wright]

* James Morris (jmorris@redhat.com) wrote:
> On Tue, 30 Nov 2004, Mitchell Blank Jr wrote:
> 
> > While looking at the SCM passing code in net/core/scm.c I noticed that there's
> > a 32-bit compat implementation of scm_detach_fds()'s called 
> > scm_detach_fds_compat() living in net/compat.c.  While these two functions
> > are mostly the same the latter does not include the call to the
> > security_file_receive() hook which is almost certainly a bug.
> > 
> > My sparc64 test box isn't set up currently so this is not tested.  Someone
> > running a 64-bit kernel with CONFIG_COMPAT should verify that this at
> > least compiles.
> > 
> > Signed-off-by: Mitchell Blank Jr <mitch@sfgoth.com>
> 
> Looks correct to me.
> 
> Signed-off-by: James Morris <jmorris@redhat.com>

Yup, looks fine.

thanks,
-chris
-- 
Linux Security Modules     http://lsm.immunix.org     http://lsm.bkbits.net

Re: [PATCH] fix missing security_*() check in net/compat.c

[David S. Miller]

On Tue, 30 Nov 2004 09:06:34 -0800
Chris Wright <chrisw@osdl.org> wrote:

> * James Morris (jmorris@redhat.com) wrote:
> > On Tue, 30 Nov 2004, Mitchell Blank Jr wrote:
> > 
> > > While looking at the SCM passing code in net/core/scm.c I noticed that there's
> > > a 32-bit compat implementation of scm_detach_fds()'s called 
> > > scm_detach_fds_compat() living in net/compat.c.  While these two functions
> > > are mostly the same the latter does not include the call to the
> > > security_file_receive() hook which is almost certainly a bug.
> > > 
> > > My sparc64 test box isn't set up currently so this is not tested.  Someone
> > > running a 64-bit kernel with CONFIG_COMPAT should verify that this at
> > > least compiles.
> > > 
> > > Signed-off-by: Mitchell Blank Jr <mitch@sfgoth.com>
> > 
> > Looks correct to me.
> > 
> > Signed-off-by: James Morris <jmorris@redhat.com>
> 
> Yup, looks fine.

Applied, thanks everyone.