[PATCH 2/2] security/smack: Use AF_INET for sin_family field

[PATCH 2/2] security/smack: Use AF_INET for sin_family field

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

Elsewhere the sin_family field holds a value with a name of the form
AF_..., so it seems reasonable to do so here as well.  Also the values of
PF_INET and AF_INET are the same.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
struct sockaddr_in sip;
@@

(
sip.sin_family ==
- PF_INET
+ AF_INET
|
sip.sin_family !=
- PF_INET
+ AF_INET
|
sip.sin_family =
- PF_INET
+ AF_INET
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 security/smack/smack_lsm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -u -p a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2464,7 +2464,7 @@ static int smack_socket_sendmsg(struct s
 	/*
 	 * Perfectly reasonable for this to be NULL
 	 */
-	if (sip == NULL || sip->sin_family != PF_INET)
+	if (sip == NULL || sip->sin_family != AF_INET)
 		return 0;
 
 	return smack_netlabel_send(sock->sk, sip);

Re: [PATCH 2/2] security/smack: Use AF_INET for sin_family field

[Casey Schaufler]

Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Elsewhere the sin_family field holds a value with a name of the form
> AF_..., so it seems reasonable to do so here as well.  Also the values of
> PF_INET and AF_INET are the same.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> struct sockaddr_in sip;
> @@
>
> (
> sip.sin_family ==
> - PF_INET
> + AF_INET
> |
> sip.sin_family !=
> - PF_INET
> + AF_INET
> |
> sip.sin_family =
> - PF_INET
> + AF_INET
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>   

Acked-by: Casey Schaufler <casey@schaufler-ca.com>

Yes, this is a correction. Thank you.


> ---
>  security/smack/smack_lsm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff -u -p a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
> --- a/security/smack/smack_lsm.c
> +++ b/security/smack/smack_lsm.c
> @@ -2464,7 +2464,7 @@ static int smack_socket_sendmsg(struct s
>  	/*
>  	 * Perfectly reasonable for this to be NULL
>  	 */
> -	if (sip == NULL || sip->sin_family != PF_INET)
> +	if (sip == NULL || sip->sin_family != AF_INET)
>  		return 0;
>  
>  	return smack_netlabel_send(sock->sk, sip);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>
>   

Re: [PATCH 2/2] security/smack: Use AF_INET for sin_family field

[James Morris]

On Wed, 5 Aug 2009, Julia Lawall wrote:

> From: Julia Lawall <julia@diku.dk>
> 
> Elsewhere the sin_family field holds a value with a name of the form
> AF_..., so it seems reasonable to do so here as well.  Also the values of
> PF_INET and AF_INET are the same.
> 
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
> 


Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next


-- 
James Morris
<jmorris@namei.org>