Commit f2e5ddcc authored by Seif Mazareeb's avatar Seif Mazareeb Committed by David S. Miller

net: fix cipso packet validation when !NETLABEL

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: default avatarSeif Mazareeb <seif@marvell.com>
Acked-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90c6bd34
...@@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, ...@@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
unsigned char err_offset = 0; unsigned char err_offset = 0;
u8 opt_len = opt[1]; u8 opt_len = opt[1];
u8 opt_iter; u8 opt_iter;
u8 tag_len;
if (opt_len < 8) { if (opt_len < 8) {
err_offset = 1; err_offset = 1;
...@@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, ...@@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
} }
for (opt_iter = 6; opt_iter < opt_len;) { 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; err_offset = opt_iter + 1;
goto out; goto out;
} }
opt_iter += opt[opt_iter + 1]; opt_iter += tag_len;
} }
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment