2014-11-04 19:28:37

by Fabian Frédérick

Subject: [PATCH 1/1 net-next] esp4: remove assignment in if condition

Signed-off-by: Fabian Frederick <[email protected]>
---
net/ipv4/esp4.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 360b565..9dd66ee 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -392,8 +392,11 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
if (elen <= 0)
goto out;

- if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
+ err = skb_cow_data(skb, 0, &trailer);
+
+ if (err < 0)
goto out;
+
nfrags = err;

assoclen = sizeof(*esph);
--
1.9.3

2014-11-04 19:33:57

by Joe Perches

Subject: Re: [PATCH 1/1 net-next] esp4: remove assignment in if condition

On Tue, 2014-11-04 at 20:28 +0100, Fabian Frederick wrote:

trivia:

> diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
[]
> @@ -392,8 +392,11 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
> if (elen <= 0)
> goto out;
>
> - if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
> + err = skb_cow_data(skb, 0, &trailer);
> +
> + if (err < 0)
> goto out;

Generally it's better/more common to use

foo = bar();
if (!foo)
[error_handler...]

without the blank line between the set
and the test.

2014-11-04 19:43:47

by Daniel Borkmann

Subject: Re: [PATCH 1/1 net-next] esp4: remove assignment in if condition

On 11/04/2014 08:28 PM, Fabian Frederick wrote:
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> net/ipv4/esp4.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
> index 360b565..9dd66ee 100644
> --- a/net/ipv4/esp4.c
> +++ b/net/ipv4/esp4.c
> @@ -392,8 +392,11 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
> if (elen <= 0)
> goto out;
>
> - if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
> + err = skb_cow_data(skb, 0, &trailer);
> +

If you already feel the need to change this (?), then please don't
add an extra newline here ...

> + if (err < 0)
> goto out;
> +
> nfrags = err;
>
> assoclen = sizeof(*esph);
>

2014-11-04 20:07:07

by David Miller

Subject: Re: [PATCH 1/1 net-next] esp4: remove assignment in if condition

From: Joe Perches <[email protected]>
Date: Tue, 04 Nov 2014 11:33:51 -0800

> On Tue, 2014-11-04 at 20:28 +0100, Fabian Frederick wrote:
>
> trivia:
>
>> diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
> []
>> @@ -392,8 +392,11 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
>> if (elen <= 0)
>> goto out;
>>
>> - if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
>> + err = skb_cow_data(skb, 0, &trailer);
>> +
>> + if (err < 0)
>> goto out;
>
> Generally it's better/more common to use
>
> foo = bar();
> if (!foo)
> [error_handler...]
>
> without the blank line between the set
> and the test.

+1