* [PATCH net-next v2 10/11] openvswitch: Add skb_clone NULL check in the recirc action.
@ 2014-07-15 17:15 Pravin B Shelar
0 siblings, 0 replies; only message in thread
From: Pravin B Shelar @ 2014-07-15 17:15 UTC (permalink / raw)
To: davem; +Cc: netdev, Andy Zhou, Pravin B Shelar
From: Andy Zhou <azhou@nicira.com>
The main change is to fix a bug where the NULL check after skb clone()
call is missing. The fix is to return 0 whenever skb_clone()
failed to create a clone so that we can continue with rest of actions.
Reported-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
net/openvswitch/actions.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 2b11473..5920512 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -624,10 +624,13 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
break;
}
- if (!last_action(a, rem))
+ if (!last_action(a, rem)) {
recirc_skb = skb_clone(skb, GFP_ATOMIC);
- else
+ if (!recirc_skb)
+ return 0;
+ } else {
recirc_skb = skb;
+ }
__this_cpu_inc(net_xmit_recursion);
err = execute_recirc(dp, recirc_skb, a);
--
1.9.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-07-15 17:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-15 17:15 [PATCH net-next v2 10/11] openvswitch: Add skb_clone NULL check in the recirc action Pravin B Shelar
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).