projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
971a351
)
cipso: cleanup cipso_v4_translate() when !CONFIG_NETLABEL
author
Paul Moore
<pmoore@redhat.com>
Tue, 10 Dec 2013 20:00:50 +0000
(15:00 -0500)
committer
David S. Miller
<davem@davemloft.net>
Tue, 10 Dec 2013 22:56:54 +0000
(17:56 -0500)
Don't needlessly recompute 'opt[opt_iter + 1]' as we already have it
stored in 'tag_len'.
Signed-off-by: Paul Moore <pmoore@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/cipso_ipv4.h
patch
|
blob
|
history
diff --git
a/include/net/cipso_ipv4.h
b/include/net/cipso_ipv4.h
index 2179d071f68f88590c2e25ad187dc74df7931a83..a6fd939f202d39b0745e0a48ac350cbe9e795648 100644
(file)
--- a/
include/net/cipso_ipv4.h
+++ b/
include/net/cipso_ipv4.h
@@
-303,7
+303,7
@@
static inline int cipso_v4_validate(const struct sk_buff *skb,
for (opt_iter = 6; opt_iter < opt_len;) {
tag_len = opt[opt_iter + 1];
- if ((tag_len == 0) || (
opt[opt_iter + 1]
> (opt_len - opt_iter))) {
+ if ((tag_len == 0) || (
tag_len
> (opt_len - opt_iter))) {
err_offset = opt_iter + 1;
goto out;
}