diff options
| author | Jesse Gross <jesse@nicira.com> | 2012-07-27 10:19:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-27 13:45:51 -0700 |
| commit | 6081030769f23c83c0564e993be146db568bf68b (patch) | |
| tree | d69db9413e18f4b702fdc6078b483207b4835d6b /net/openvswitch | |
| parent | 505fbcf035c245a1a42cd80184feecf61ee868dc (diff) | |
| download | linux-6081030769f23c83c0564e993be146db568bf68b.tar.gz linux-6081030769f23c83c0564e993be146db568bf68b.tar.bz2 linux-6081030769f23c83c0564e993be146db568bf68b.zip | |
Revert "openvswitch: potential NULL deref in sample()"
This reverts commit 5b3e7e6cb5771bedda51cdb6f715d1da8cd9e644.
The problem that the original commit was attempting to fix can
never happen in practice because validation is done one a per-flow
basis rather than a per-packet basis. Adding additional checks at
runtime is unnecessary and inconsistent with the rest of the code.
CC: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/actions.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 320fa0e6951a..f3f96badf5aa 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -325,9 +325,6 @@ static int sample(struct datapath *dp, struct sk_buff *skb, } } - if (!acts_list) - return 0; - return do_execute_actions(dp, skb, nla_data(acts_list), nla_len(acts_list), true); } |