linux-kernel - linux-next: build failure after merge of the net-next tree

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-next>] [day] [month] [year] [list]

Date:   Mon, 20 Jun 2022 09:34:24 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>
Cc:     Networking <netdev@...r.kernel.org>,
        Eric Dumazet <edumazet@...gle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the net-next tree

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/ipv4/raw.c: In function 'raw_icmp_error':
net/ipv4/raw.c:266:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
  266 |         struct hlist_nulls_head *hlist;
      |         ^~~~~~
cc1: all warnings being treated as errors

Introduced by commit

  ba44f8182ec2 ("raw: use more conventional iterators")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 20 Jun 2022 09:21:01 +1000
Subject: [PATCH] raw: fix build error

The linux-next x86_64 allmodconfig build produced this error:

net/ipv4/raw.c: In function 'raw_icmp_error':
net/ipv4/raw.c:266:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
  266 |         struct hlist_nulls_head *hlist;
      |         ^~~~~~
cc1: all warnings being treated as errors

Fixes: ba44f8182ec2 ("raw: use more conventional iterators")
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 net/ipv4/raw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index d28bf0b901a2..b3b255db9021 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -262,7 +262,7 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)
 
 void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info)
 {
-	struct net *net = dev_net(skb->dev);;
+	struct net *net = dev_net(skb->dev);
 	struct hlist_nulls_head *hlist;
 	struct hlist_nulls_node *hnode;
 	int dif = skb->dev->ifindex;
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped