Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764654AbYBZXex (ORCPT ); Tue, 26 Feb 2008 18:34:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752198AbYBZXen (ORCPT ); Tue, 26 Feb 2008 18:34:43 -0500 Received: from ug-out-1314.google.com ([66.249.92.168]:44033 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbYBZXem (ORCPT ); Tue, 26 Feb 2008 18:34:42 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent:from; b=J/ZMVLF1y+RCruZF/q91Z3vxiLmn11WUUv1YauhWxKbMKzaAdw3QoA339gVmNx39MFDbKk17kK5x/tneCEGNwlFUU8eB2E8vRylsDLFNhgJD3TAK1FaEyvDGtkohiIF3lkM++8dWBjXZiZJa6VbruWyn3FCGw6nhZIj3lX+u4a8= Date: Wed, 27 Feb 2008 01:31:48 +0200 To: Chris Wright , Stephen Smalley , James Morris , Eric Paris , Casey Schaufler , David Woodhouse Cc: linux-security-module@vger.kernel.org, LKML , akpm Subject: [PATCH -mm 4/4] Netlink: Use LSM interface instead of SELinux one Message-ID: <20080226233148.GE12059@ubuntu> References: <20080226232229.GA12059@ubuntu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080226232229.GA12059@ubuntu> User-Agent: Mutt/1.5.15+20070412 (2007-04-11) From: "Ahmed S. Darwish" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1422 Lines: 42 Don't use SELinux exported selinux_get_task_sid symbol. Use the generic LSM equivalent instead. Signed-off-by: Casey Schaufler Signed-off-by: Ahmed S. Darwish --- diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 1ab0da2..61fd277 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -1239,7 +1238,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, NETLINK_CB(skb).pid = nlk->pid; NETLINK_CB(skb).dst_group = dst_group; NETLINK_CB(skb).loginuid = audit_get_loginuid(current); - selinux_get_task_sid(current, &(NETLINK_CB(skb).sid)); + security_task_getsecid(current, &(NETLINK_CB(skb).sid)); memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred)); /* What can I do? Netlink is asynchronous, so that -- "Better to light a candle, than curse the darkness" Ahmed S. Darwish Homepage: http://darwish.07.googlepages.com Blog: http://darwish-07.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/