From: Samir Bellabes <sam@synack.fr>
To: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org, hadi@cyberus.ca,
kaber@trash.net, zbr@ioremap.net, nhorman@tuxdriver.com,
root@localdomain.pl, linux-security-module@vger.kernel.org
Subject: Re: [RFC v2 00/10] snet: Security for NETwork syscalls
Date: Sat, 06 Mar 2010 19:20:26 +0100 [thread overview]
Message-ID: <m26359qplh.fsf@ssh.synack.fr> (raw)
In-Reply-To: <201003030156.o231udx1023055@www262.sakura.ne.jp> (Tetsuo Handa's message of "Wed, 03 Mar 2010 10:56:39 +0900")
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> writes:
> Regarding [RFC v2 06/10] snet: introduce snet_hooks
> + if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
>
> Please avoid assignment in "if" statement, as scripts/checkpatch.pl suggests.
Right, I should have run script/checkpatch.pl on this set of patches. I
won't miss it next time.
Thanks Tetsuo.
sam
>From ea2234c07ea1bf76579ba127c8a8be6ab276515f Mon Sep 17 00:00:00 2001
From: Samir Bellabes <sam@synack.fr>
Date: Sat, 6 Mar 2010 17:49:22 +0100
Subject: [PATCH 3/3] snet: avoid assigment in if statement
Noticed by Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Samir Bellabes <sam@synack.fr>
---
security/snet/snet_hooks.c | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/security/snet/snet_hooks.c b/security/snet/snet_hooks.c
index 689babe..d9cf0b9 100644
--- a/security/snet/snet_hooks.c
+++ b/security/snet/snet_hooks.c
@@ -160,7 +160,8 @@ static int snet_socket_bind(struct socket *sock,
info.dst.u3.ip = inet->inet_daddr;
info.src.u.port = ntohs(a->sin_port);
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info) ;
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -173,7 +174,8 @@ static int snet_socket_bind(struct socket *sock,
sizeof(info.dst.u3.ip6));
info.src.u.port = ntohs(a6->sin6_port);
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -229,7 +231,8 @@ static int snet_socket_connect(struct socket *sock,
info.dst.u3.ip = a->sin_addr.s_addr;
info.dst.u.port = ntohs(a->sin_port);
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -242,7 +245,8 @@ static int snet_socket_connect(struct socket *sock,
sizeof(info.dst.u3.ip6));
info.dst.u.port = ntohs(a6->sin6_port);
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -295,7 +299,8 @@ static int snet_socket_listen(struct socket *sock, int backlog)
info.src.u3.ip = inet->inet_saddr;
info.dst.u3.ip = inet->inet_daddr;
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -306,7 +311,9 @@ static int snet_socket_listen(struct socket *sock, int backlog)
sizeof(info.src.u3.ip6));
memcpy(&info.dst.u3.ip6, (void *)&inet->pinet6->daddr,
sizeof(info.dst.u3.ip6));
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ /* check tickets */
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -358,7 +365,8 @@ static int snet_socket_accept(struct socket *sock, struct socket *newsock)
info.src.u3.ip = inet->inet_saddr;
info.dst.u3.ip = inet->inet_daddr;
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -370,7 +378,8 @@ static int snet_socket_accept(struct socket *sock, struct socket *newsock)
memcpy(&info.dst.u3.ip6, (void *)&inet->pinet6->daddr,
sizeof(info.dst.u3.ip6));
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -470,7 +479,8 @@ static int snet_socket_sendmsg(struct socket *sock,
info.src.u3.ip = inet->inet_saddr;
info.dst.u3.ip = inet->inet_daddr;
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -482,7 +492,8 @@ static int snet_socket_sendmsg(struct socket *sock,
memcpy(&info.dst.u3.ip6, (void *)&inet->pinet6->daddr,
sizeof(info.dst.u3.ip6));
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -535,7 +546,8 @@ static int snet_socket_recvmsg(struct socket *sock,
info.src.u3.ip = inet->inet_saddr;
info.dst.u3.ip = inet->inet_daddr;
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
@@ -547,7 +559,8 @@ static int snet_socket_recvmsg(struct socket *sock,
memcpy(&info.dst.u3.ip6, (void *)&inet->pinet6->daddr,
sizeof(info.dst.u3.ip6));
/* check tickets */
- if ((verdict = snet_ticket_check(&info)) != SNET_VERDICT_NONE)
+ verdict = snet_ticket_check(&info);
+ if (verdict != SNET_VERDICT_NONE)
goto out;
/* inserting verdict PENDING */
info.verdict_id = snet_verdict_insert();
--
1.6.3.3
next prev parent reply other threads:[~2010-03-06 18:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-02 20:23 [RFC v2 00/10] snet: Security for NETwork syscalls Samir Bellabes
2010-03-02 20:23 ` [RFC v2 01/10] lsm: add security_socket_closed() Samir Bellabes
2010-03-02 20:23 ` [RFC v2 02/10] Revert "lsm: Remove the socket_post_accept() hook" Samir Bellabes
2010-03-02 20:23 ` [RFC v2 03/10] snet: introduce security/snet, Makefile and Kconfig changes Samir Bellabes
2010-03-03 0:03 ` Greg KH
2010-03-03 0:23 ` Samir Bellabes
2010-03-02 20:23 ` [RFC v2 04/10] snet: introduce snet_core Samir Bellabes
2010-03-02 20:23 ` [RFC v2 05/10] snet: introduce snet_event Samir Bellabes
2010-03-02 20:23 ` [RFC v2 06/10] snet: introduce snet_hooks Samir Bellabes
2010-03-02 20:23 ` [RFC v2 07/10] snet: introduce snet_netlink Samir Bellabes
2010-03-02 20:23 ` [RFC v2 08/10] snet: introduce snet_verdict Samir Bellabes
2010-03-02 20:23 ` [RFC v2 09/10] snet: introduce snet_ticket Samir Bellabes
2010-03-02 20:23 ` [RFC v2 10/10] snet: introduce snet_utils Samir Bellabes
2010-03-03 17:55 ` Jan Engelhardt
2010-03-03 1:56 ` [RFC v2 00/10] snet: Security for NETwork syscalls Tetsuo Handa
2010-03-06 18:16 ` Samir Bellabes
2010-03-06 18:17 ` Samir Bellabes
2010-03-06 18:20 ` Samir Bellabes [this message]
2010-03-06 18:40 ` Samir Bellabes
2010-03-07 5:47 ` Tetsuo Handa
2010-03-06 18:47 ` Samir Bellabes
2010-03-07 5:45 ` Tetsuo Handa
2010-03-15 16:43 ` Samir Bellabes
2010-03-06 18:50 ` Samir Bellabes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m26359qplh.fsf@ssh.synack.fr \
--to=sam@synack.fr \
--cc=hadi@cyberus.ca \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=root@localdomain.pl \
--cc=zbr@ioremap.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).