* [PATCH][SELINUX] 2/2 sock_create_lite() [not found] <Xine.LNX.4.44.0405071043540.21372@thoron.boston.redhat.com> @ 2004-05-07 15:06 ` James Morris 2004-05-07 15:14 ` Christoph Hellwig 0 siblings, 1 reply; 5+ messages in thread From: James Morris @ 2004-05-07 15:06 UTC (permalink / raw) To: David S. Miller Cc: Stephen Smalley, Chris Wright, linux-kernel, netdev, selinux This patch adds a function sock_create_lite(), deprecating kernel-wide use of sock_alloc(), which has been made static to net/socket.c. The purpose of this is to allow sockets created by the kernel in this way to be passed through the LSM socket creation hooks and be labeled and mediated in the same manner as other sockets. This patches addresses a class of potential issues with LSMs, where such sockets will not be labeled correctly (if at all), or mediated during creation. Under SELinux, it fixes a specific bug where RPC sockets created by the kernel during TCP NFS serving are unlabeled. Again, an equivalent to this patch has been tested in Fedora for several weeks without any issues. Please apply. include/linux/net.h | 4 +++- net/bluetooth/rfcomm/core.c | 6 ++---- net/netlink/af_netlink.c | 4 +--- net/socket.c | 25 +++++++++++++++++++++++-- net/sunrpc/svcsock.c | 10 ++++++---- 5 files changed, 35 insertions(+), 14 deletions(-) diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/include/linux/net.h linux-2.6.6-rc3-mm2.w/include/linux/net.h --- linux-2.6.6-rc3-mm2.p/include/linux/net.h 2004-05-06 16:59:28.297706040 -0400 +++ linux-2.6.6-rc3-mm2.w/include/linux/net.h 2004-05-06 17:00:31.953028960 -0400 @@ -146,11 +146,13 @@ extern int sock_wake_async(struct socket *sk, int how, int band); extern int sock_register(struct net_proto_family *fam); extern int sock_unregister(int family); -extern struct socket *sock_alloc(void); + extern int sock_create(int family, int type, int proto, struct socket **res); extern int sock_create_kern(int family, int type, int proto, struct socket **res); +extern int sock_create_lite(int family, int type, int proto, + struct socket **res); extern void sock_release(struct socket *sock); extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/bluetooth/rfcomm/core.c linux-2.6.6-rc3-mm2.w/net/bluetooth/rfcomm/core.c --- linux-2.6.6-rc3-mm2.p/net/bluetooth/rfcomm/core.c 2004-05-06 16:59:28.308704368 -0400 +++ linux-2.6.6-rc3-mm2.w/net/bluetooth/rfcomm/core.c 2004-05-06 17:01:47.483546576 -0400 @@ -1642,11 +1642,9 @@ BT_DBG("session %p", s); - nsock = sock_alloc(); - if (!nsock) + if (sock_create_lite(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP, &nsock)) return; - - nsock->type = sock->type; + nsock->ops = sock->ops; __module_get(nsock->ops->owner); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/netlink/af_netlink.c linux-2.6.6-rc3-mm2.w/net/netlink/af_netlink.c --- linux-2.6.6-rc3-mm2.p/net/netlink/af_netlink.c 2004-05-05 11:16:20.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/net/netlink/af_netlink.c 2004-05-06 17:02:10.679020328 -0400 @@ -833,11 +833,9 @@ if (unit<0 || unit>=MAX_LINKS) return NULL; - if (!(sock = sock_alloc())) + if (sock_create_lite(PF_NETLINK, SOCK_DGRAM, unit, &sock)) return NULL; - sock->type = SOCK_RAW; - if (netlink_create(sock, unit) < 0) { sock_release(sock); return NULL; diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/socket.c linux-2.6.6-rc3-mm2.w/net/socket.c --- linux-2.6.6-rc3-mm2.p/net/socket.c 2004-05-06 16:59:28.380693424 -0400 +++ linux-2.6.6-rc3-mm2.w/net/socket.c 2004-05-06 17:03:28.224231664 -0400 @@ -457,7 +457,7 @@ * NULL is returned. */ -struct socket *sock_alloc(void) +static struct socket *sock_alloc(void) { struct inode * inode; struct socket * sock; @@ -840,6 +840,27 @@ return err; } +int sock_create_lite(int family, int type, int protocol, struct socket **res) +{ + int err; + struct socket *sock = NULL; + + err = security_socket_create(family, type, protocol, 1); + if (err) + goto out; + + sock = sock_alloc(); + if (!sock) { + err = -ENOMEM; + goto out; + } + + security_socket_post_create(sock, family, type, protocol, 1); + sock->type = type; +out: + *res = sock; + return err; +} /* No kernel lock held - perfect */ static unsigned int sock_poll(struct file *file, poll_table * wait) @@ -1997,10 +2018,10 @@ /* ABI emulation layers need these two */ EXPORT_SYMBOL(move_addr_to_kernel); EXPORT_SYMBOL(move_addr_to_user); -EXPORT_SYMBOL(sock_alloc); EXPORT_SYMBOL(sock_alloc_inode); EXPORT_SYMBOL(sock_create); EXPORT_SYMBOL(sock_create_kern); +EXPORT_SYMBOL(sock_create_lite); EXPORT_SYMBOL(sock_map_fd); EXPORT_SYMBOL(sock_recvmsg); EXPORT_SYMBOL(sock_register); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/sunrpc/svcsock.c linux-2.6.6-rc3-mm2.w/net/sunrpc/svcsock.c --- linux-2.6.6-rc3-mm2.p/net/sunrpc/svcsock.c 2004-05-06 16:59:28.386692512 -0400 +++ linux-2.6.6-rc3-mm2.w/net/sunrpc/svcsock.c 2004-05-06 17:13:31.919456040 -0400 @@ -781,13 +781,15 @@ if (!sock) return; - if (!(newsock = sock_alloc())) { - printk(KERN_WARNING "%s: no more sockets!\n", serv->sv_name); + err = sock_create_lite(PF_INET, SOCK_STREAM, IPPROTO_TCP, &newsock); + if (err) { + if (err == -ENOMEM) + printk(KERN_WARNING "%s: no more sockets!\n", + serv->sv_name); return; } - dprintk("svc: tcp_accept %p allocated\n", newsock); - newsock->type = sock->type; + dprintk("svc: tcp_accept %p allocated\n", newsock); newsock->ops = ops = sock->ops; clear_bit(SK_CONN, &svsk->sk_flags); ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][SELINUX] 2/2 sock_create_lite() 2004-05-07 15:06 ` [PATCH][SELINUX] 2/2 sock_create_lite() James Morris @ 2004-05-07 15:14 ` Christoph Hellwig 2004-05-07 15:21 ` James Morris 0 siblings, 1 reply; 5+ messages in thread From: Christoph Hellwig @ 2004-05-07 15:14 UTC (permalink / raw) To: James Morris Cc: David S. Miller, Stephen Smalley, Chris Wright, linux-kernel, netdev, selinux On Fri, May 07, 2004 at 11:06:04AM -0400, James Morris wrote: > This patch adds a function sock_create_lite(), deprecating kernel-wide use > of sock_alloc(), which has been made static to net/socket.c. We're in the stable series and removing exported APIs there shoudn't happen. Given that sock_alloc() is actually okay for every normal use I don't think there's enough reason to remove it from the API. > +int sock_create_lite(int family, int type, int protocol, struct socket **res) Should probably be called __sock_create according to linux naming rules. Also I guess you should actually call it from sock_create instead of duplicating the code. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][SELINUX] 2/2 sock_create_lite() 2004-05-07 15:14 ` Christoph Hellwig @ 2004-05-07 15:21 ` James Morris 2004-05-07 19:53 ` James Morris 0 siblings, 1 reply; 5+ messages in thread From: James Morris @ 2004-05-07 15:21 UTC (permalink / raw) To: Christoph Hellwig Cc: David S. Miller, Stephen Smalley, Chris Wright, linux-kernel, netdev, selinux On Fri, 7 May 2004, Christoph Hellwig wrote: > On Fri, May 07, 2004 at 11:06:04AM -0400, James Morris wrote: > > This patch adds a function sock_create_lite(), deprecating kernel-wide use > > of sock_alloc(), which has been made static to net/socket.c. > > We're in the stable series and removing exported APIs there shoudn't happen. > Given that sock_alloc() is actually okay for every normal use I don't think > there's enough reason to remove it from the API. Fair enough. > > +int sock_create_lite(int family, int type, int protocol, struct socket **res) > > Should probably be called __sock_create according to linux naming rules. > Also I guess you should actually call it from sock_create instead of > duplicating the code. sock_create() is really very different to sock_alloc(), and the only real duplication is calling the LSM hooks. The version I sent seems to be the simplest approach. (note that __sock_create() is already created in the previous patch). - James -- James Morris <jmorris@redhat.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][SELINUX] 2/2 sock_create_lite() 2004-05-07 15:21 ` James Morris @ 2004-05-07 19:53 ` James Morris 2004-05-08 22:04 ` David S. Miller 0 siblings, 1 reply; 5+ messages in thread From: James Morris @ 2004-05-07 19:53 UTC (permalink / raw) To: Christoph Hellwig, David S. Miller Cc: Stephen Smalley, Chris Wright, linux-kernel, netdev, selinux On Fri, 7 May 2004, James Morris wrote: > On Fri, 7 May 2004, Christoph Hellwig wrote: > > > On Fri, May 07, 2004 at 11:06:04AM -0400, James Morris wrote: > > > This patch adds a function sock_create_lite(), deprecating kernel-wide use > > > of sock_alloc(), which has been made static to net/socket.c. > > > > We're in the stable series and removing exported APIs there shoudn't happen. > > Given that sock_alloc() is actually okay for every normal use I don't think > > there's enough reason to remove it from the API. > Ok, here's a version of this patch which doesn't do anything with sock_alloc(). diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/include/linux/net.h linux-2.6.6-rc3-mm2.w/include/linux/net.h --- linux-2.6.6-rc3-mm2.p/include/linux/net.h 2004-05-06 16:59:28.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/include/linux/net.h 2004-05-07 13:57:47.669957104 -0400 @@ -151,6 +151,8 @@ struct socket **res); extern int sock_create_kern(int family, int type, int proto, struct socket **res); +extern int sock_create_lite(int family, int type, int proto, + struct socket **res); extern void sock_release(struct socket *sock); extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/bluetooth/rfcomm/core.c linux-2.6.6-rc3-mm2.w/net/bluetooth/rfcomm/core.c --- linux-2.6.6-rc3-mm2.p/net/bluetooth/rfcomm/core.c 2004-05-06 16:59:28.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/net/bluetooth/rfcomm/core.c 2004-05-07 13:56:02.770904184 -0400 @@ -1642,11 +1642,9 @@ BT_DBG("session %p", s); - nsock = sock_alloc(); - if (!nsock) + if (sock_create_lite(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP, &nsock)) return; - - nsock->type = sock->type; + nsock->ops = sock->ops; __module_get(nsock->ops->owner); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/netlink/af_netlink.c linux-2.6.6-rc3-mm2.w/net/netlink/af_netlink.c --- linux-2.6.6-rc3-mm2.p/net/netlink/af_netlink.c 2004-05-05 11:16:20.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/net/netlink/af_netlink.c 2004-05-07 13:56:02.771904032 -0400 @@ -833,11 +833,9 @@ if (unit<0 || unit>=MAX_LINKS) return NULL; - if (!(sock = sock_alloc())) + if (sock_create_lite(PF_NETLINK, SOCK_DGRAM, unit, &sock)) return NULL; - sock->type = SOCK_RAW; - if (netlink_create(sock, unit) < 0) { sock_release(sock); return NULL; diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/sctp/protocol.c linux-2.6.6-rc3-mm2.w/net/sctp/protocol.c --- linux-2.6.6-rc3-mm2.p/net/sctp/protocol.c 2004-04-29 10:03:53.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/net/sctp/protocol.c 2004-05-06 17:26:12.000000000 -0400 @@ -653,8 +653,8 @@ else family = PF_INET; - err = sock_create(family, SOCK_SEQPACKET, IPPROTO_SCTP, - &sctp_ctl_socket); + err = sock_create_kern(family, SOCK_SEQPACKET, IPPROTO_SCTP, + &sctp_ctl_socket); if (err < 0) { printk(KERN_ERR "SCTP: Failed to create the SCTP control socket.\n"); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/socket.c linux-2.6.6-rc3-mm2.w/net/socket.c --- linux-2.6.6-rc3-mm2.p/net/socket.c 2004-05-06 16:59:28.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/net/socket.c 2004-05-07 13:57:40.429057888 -0400 @@ -457,7 +457,7 @@ * NULL is returned. */ -struct socket *sock_alloc(void) +static struct socket *sock_alloc(void) { struct inode * inode; struct socket * sock; @@ -840,6 +840,27 @@ return err; } +int sock_create_lite(int family, int type, int protocol, struct socket **res) +{ + int err; + struct socket *sock = NULL; + + err = security_socket_create(family, type, protocol, 1); + if (err) + goto out; + + sock = sock_alloc(); + if (!sock) { + err = -ENOMEM; + goto out; + } + + security_socket_post_create(sock, family, type, protocol, 1); + sock->type = type; +out: + *res = sock; + return err; +} /* No kernel lock held - perfect */ static unsigned int sock_poll(struct file *file, poll_table * wait) @@ -2001,6 +2022,7 @@ EXPORT_SYMBOL(sock_alloc_inode); EXPORT_SYMBOL(sock_create); EXPORT_SYMBOL(sock_create_kern); +EXPORT_SYMBOL(sock_create_lite); EXPORT_SYMBOL(sock_map_fd); EXPORT_SYMBOL(sock_recvmsg); EXPORT_SYMBOL(sock_register); diff -urN -X dontdiff linux-2.6.6-rc3-mm2.p/net/sunrpc/svcsock.c linux-2.6.6-rc3-mm2.w/net/sunrpc/svcsock.c --- linux-2.6.6-rc3-mm2.p/net/sunrpc/svcsock.c 2004-05-06 16:59:28.000000000 -0400 +++ linux-2.6.6-rc3-mm2.w/net/sunrpc/svcsock.c 2004-05-07 13:56:02.775903424 -0400 @@ -781,13 +781,15 @@ if (!sock) return; - if (!(newsock = sock_alloc())) { - printk(KERN_WARNING "%s: no more sockets!\n", serv->sv_name); + err = sock_create_lite(PF_INET, SOCK_STREAM, IPPROTO_TCP, &newsock); + if (err) { + if (err == -ENOMEM) + printk(KERN_WARNING "%s: no more sockets!\n", + serv->sv_name); return; } - dprintk("svc: tcp_accept %p allocated\n", newsock); - newsock->type = sock->type; + dprintk("svc: tcp_accept %p allocated\n", newsock); newsock->ops = ops = sock->ops; clear_bit(SK_CONN, &svsk->sk_flags); ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][SELINUX] 2/2 sock_create_lite() 2004-05-07 19:53 ` James Morris @ 2004-05-08 22:04 ` David S. Miller 0 siblings, 0 replies; 5+ messages in thread From: David S. Miller @ 2004-05-08 22:04 UTC (permalink / raw) To: James Morris; +Cc: hch, sds, chrisw, linux-kernel, netdev, selinux On Fri, 7 May 2004 15:53:30 -0400 (EDT) James Morris <jmorris@redhat.com> wrote: > Ok, here's a version of this patch which doesn't do anything with > sock_alloc(). Applied, although I had to hand-edit the patch since you accidently included the following bit from the first SELINUX patch of this series :-) > - err = sock_create(family, SOCK_SEQPACKET, IPPROTO_SCTP, > - &sctp_ctl_socket); > + err = sock_create_kern(family, SOCK_SEQPACKET, IPPROTO_SCTP, > + &sctp_ctl_socket); ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-05-08 22:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <Xine.LNX.4.44.0405071043540.21372@thoron.boston.redhat.com>
2004-05-07 15:06 ` [PATCH][SELINUX] 2/2 sock_create_lite() James Morris
2004-05-07 15:14 ` Christoph Hellwig
2004-05-07 15:21 ` James Morris
2004-05-07 19:53 ` James Morris
2004-05-08 22:04 ` David S. Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®