netdev - Re: [PATCH 3.18.y] Fix compilation error backporting upstream commit 9fc12023d6f5

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: <20180804124034.GA4920@kroah.com>
Date:   Sat, 4 Aug 2018 14:40:34 +0200
From:   Greg KH <gregkh@...uxfoundation.org>
To:     Lorenzo Bianconi <lorenzo.bianconi@...hat.com>
Cc:     stable@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 3.18.y] Fix compilation error backporting upstream commit
 9fc12023d6f5

On Sat, Aug 04, 2018 at 02:27:41PM +0200, Lorenzo Bianconi wrote:
> Fix following compilation error backporting upstream commit
> 9fc12023d6f5 ("ipv4: remove BUG_ON() from fib_compute_spec_dst)
> 
> net/ipv4/fib_frontend.c: In function 'fib_compute_spec_dst':
> net/ipv4/fib_frontend.c:225:3: error: expected expression before 'if'
>    if (!fib_lookup(net, &fl4, &res))
> 
> net/ipv4/fib_frontend.c:200:20: warning: unused variable 'res'
>   struct fib_result res;
> 
> Fixes: 0e46da6c6fac ("ipv4: remove BUG_ON() from fib_compute_spec_dst")
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@...hat.com>
> ---
>  net/ipv4/fib_frontend.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
> index 924db4bedd88..0b29649627a7 100644
> --- a/net/ipv4/fib_frontend.c
> +++ b/net/ipv4/fib_frontend.c
> @@ -221,7 +221,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
>  		fl4.saddr = 0;
>  		fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
>  		fl4.flowi4_scope = scope;
> -		fl4.flowi4_mark = vmark ? skb->mark : 0,
> +		fl4.flowi4_mark = vmark ? skb->mark : 0;
>  		if (!fib_lookup(net, &fl4, &res))
>  			return FIB_RES_PREFSRC(net, res);
>  	} else {

Thanks, but I fixed this about 6 hours ago, right?

greg k-h