netdev - Re: [PATCH/RFC rocker-net-next 2/6] net: flow: Handle error when putting a field while putting a flow

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150106010437.GB14077@vergenet.net>
Date:	Tue, 6 Jan 2015 10:04:39 +0900
From:	Simon Horman <simon.horman@...ronome.com>
To:	John Fastabend <john.fastabend@...il.com>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH/RFC rocker-net-next 2/6] net: flow: Handle error when
 putting a field while putting a flow

On Mon, Jan 05, 2015 at 09:28:14AM -0800, John Fastabend wrote:
> On 01/04/2015 10:50 PM, Simon Horman wrote:
> >Signed-off-by: Simon Horman <simon.horman@...ronome.com>
> >---
> >  net/core/flow_table.c | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> >diff --git a/net/core/flow_table.c b/net/core/flow_table.c
> >index 2af831e..753ebe0 100644
> >--- a/net/core/flow_table.c
> >+++ b/net/core/flow_table.c
> >@@ -981,8 +981,9 @@ done:
> >
> >  int net_flow_put_flow(struct sk_buff *skb, struct net_flow_flow *flow)
> >  {
> >-	struct nlattr *flows, *matches;
> >+	struct nlattr *flows;
> >  	struct nlattr *actions = NULL; /* must be null to unwind */
> >+	struct nlattr *matches = NULL; /* must be null to unwind */
> 
> Actually we don't need to initialize to NULL now. That was some crazy
> unwind scheme I had in place initially.
> 
> Now we only ever do a nla_nest_cancel on nested attributes that have
> been initialized with nla_nest_start(). So I can simplify this to
> 
> 	struct nlattr *flows, *matches, *actions;

Thanks, that does seem much nicer :)

> 
> >  	int err, j, i = 0;
> >
> >  	flows = nla_nest_start(skb, NET_FLOW_FLOW);
> >@@ -1005,7 +1006,11 @@ int net_flow_put_flow(struct sk_buff *skb, struct net_flow_flow *flow)
> >  			if (!f->header)
> >  				continue;
> >
> >-			nla_put(skb, NET_FLOW_FIELD_REF, sizeof(*f), f);
> >+			err = nla_put(skb, NET_FLOW_FIELD_REF, sizeof(*f), f);
> 
> Great thanks. I missed this one.
> 
> >+			if (err) {
> >+				nla_nest_cancel(skb, matches);
> >+				goto flows_put_failure;
> >+			}
> >  		}
> >  		nla_nest_end(skb, matches);
> >  	}
> >
> 
> I'll fold this into the series and resubmit thanks.
> 
> .John
> 
> -- 
> John Fastabend         Intel Corporation
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html