From 37dfe5264b7a832f9e447217585df68158881578 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Thu, 10 Jul 2014 00:30:27 -0700 Subject: [PATCH] datapath: add skb_clone NULL check in the recirc action. Refactoring recirc action implementation. The main change is to fix a bug where the NULL check after skb clone() call is missing. The fix is to return -ENOMEM whenever skb_clone() failed to create a clone. Also rearranged adjacent code to improve readability. Reported-by: Pravin B Shelar Signed-off-by: Andy Zhou Acked-by: Pravin B Shelar --- datapath/actions.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/datapath/actions.c b/datapath/actions.c index 1f12f55ba9c..caf432ee2e9 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -729,15 +729,17 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb, case OVS_ACTION_ATTR_RECIRC: { struct sk_buff *recirc_skb; - if (!last_action(a, rem)) - recirc_skb = skb_clone(skb, GFP_ATOMIC); - else - recirc_skb = skb; + if (last_action(a, rem)) + return execute_recirc(dp, skb, a); - err = execute_recirc(dp, recirc_skb, a); + /* Recirc action is the not the last action + * of the action list. */ + recirc_skb = skb_clone(skb, GFP_ATOMIC); - if (recirc_skb == skb) - return err; + /* Skip the recirc action when out of memory, but + * continue on with the rest of the action list. */ + if (recirc_skb) + err = execute_recirc(dp, recirc_skb, a); break; }