]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Revert "openvswitch: potential NULL deref in sample()"
authorJesse Gross <jesse@nicira.com>
Fri, 27 Jul 2012 10:19:40 +0000 (10:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Jul 2012 20:45:51 +0000 (13:45 -0700)
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>
net/openvswitch/actions.c

index 320fa0e6951aaf43b92050041e61f0748d134f37..f3f96badf5aac0202a2bd54155d595b0373a18df 100644 (file)
@@ -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);
 }