netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] net: fix cipso packet validation when !NETLABEL
@ 2013-10-18  3:33 Seif Mazareeb
  2013-10-18 21:01 ` Paul Moore
  0 siblings, 1 reply; 12+ messages in thread
From: Seif Mazareeb @ 2013-10-18  3:33 UTC (permalink / raw)
  To: paul, davem; +Cc: seif, netdev

From: Seif Mazareeb <seif@marvell.com>

When CONFIG_NETLABEL is disabled, the cipso_v4_validate() function could loop
forever in the main loop if opt[opt_iter +1] == 0, this will causing a kernel
crash in an SMP system, since the CPU executing this function will
stall /not respond to IPIs.

This problem can be reproduced by running the IP Stack Integrity Checker
(http://isic.sourceforge.net) using the following command on a Linux machine
connected to DUT:

"icmpsic -s rand -d <DUT IP address> -r 123456"
wait (1-2 min)

Signed-off-by: Seif Mazareeb <seif@marvell.com>
---
 include/net/cipso_ipv4.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index a7a683e..a8c2ef6 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
 	unsigned char err_offset = 0;
 	u8 opt_len = opt[1];
 	u8 opt_iter;
+	u8 tag_len;
 
 	if (opt_len < 8) {
 		err_offset = 1;
@@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
 	}
 
 	for (opt_iter = 6; opt_iter < opt_len;) {
-		if (opt[opt_iter + 1] > (opt_len - opt_iter)) {
+		tag_len = opt[opt_iter + 1];
+		if ((tag_len == 0) || (opt[opt_iter + 1] > (opt_len - opt_iter))) {
 			err_offset = opt_iter + 1;
 			goto out;
 		}
-		opt_iter += opt[opt_iter + 1];
+		opt_iter += tag_len;
 	}
 
 out:
-- 
1.8.1.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 1/1] net: fix cipso packet validation when !NETLABEL
@ 2013-10-11 17:58 Seif Mazareeb
  2013-10-11 19:02 ` Paul Moore
  0 siblings, 1 reply; 12+ messages in thread
From: Seif Mazareeb @ 2013-10-11 17:58 UTC (permalink / raw)
  To: davem@davemloft.net, paul@paul-moore.com, netdev@vger.kernel.org
  Cc: thomas.petazzoni@free-electrons.com, Dmitri Epshtein

When CONFIG_NETLABEL is disabled, the cipso_v4_validate() function could loop
forever in the main loop if opt[opt_iter +1] == 0, this will causing a kernel
crash in an SMP system, since the CPU executing this function will
stall /not respond to IPIs.

This problem can be reproduced by running the IP Stack Integrity Checker
(http://isic.sourceforge.net) using the following command on a Linux machine
connected to DUT:

"icmpsic -s rand -d <DUT IP address> -r 123456"
wait (1-2 min)

Signed-off-by: Seif Mazareeb <seif@marvell.com>
---
 include/net/cipso_ipv4.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index a7a683e..047f1f6 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -306,6 +306,10 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
                        err_offset = opt_iter + 1;
                        goto out;
                }
+
+               if (opt[opt_iter + 1] == 0)
+                       break;
+
                opt_iter += opt[opt_iter + 1];
        }

--
1.8.1.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread
[parent not found: <0DB595A2CB707F458400BE9663B6A72269C004777F@SC-VEXCH2.marvell.com>]

end of thread, other threads:[~2013-10-19 22:56 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-18  3:33 [PATCH 1/1] net: fix cipso packet validation when !NETLABEL Seif Mazareeb
2013-10-18 21:01 ` Paul Moore
2013-10-19 22:56   ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2013-10-11 17:58 Seif Mazareeb
2013-10-11 19:02 ` Paul Moore
2013-10-11 21:04   ` Seif Mazareeb
2013-10-12 11:57     ` Paul Moore
2013-10-13  5:21       ` Seif Mazareeb
2013-10-14 15:12         ` Paul Moore
2013-10-17 19:47           ` David Miller
2013-10-18  1:20             ` Paul Moore
     [not found] <0DB595A2CB707F458400BE9663B6A72269C004777F@SC-VEXCH2.marvell.com>
2013-10-11 17:53 ` David Miller

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).