From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>
Cc: Francis Laniel <laniel_francis@privacyrequired•com>,
Jakub Kicinski <kuba@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the net-next tree with the netfilter tree
Date: Thu, 10 Dec 2020 13:11:13 +1100 [thread overview]
Message-ID: <20201210131113.6394fe45@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/netfilter/nf_tables_api.c
between commit:
42f1c2712090 ("netfilter: nftables: comment indirect serialization of commit_mutex with rtnl_mutex")
from the netfilter tree and commit:
872f69034194 ("treewide: rename nla_strlcpy to nla_strscpy.")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/netfilter/nf_tables_api.c
index 9a080767667b,a11bc8dcaa82..000000000000
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@@ -1722,11 -1723,7 +1723,11 @@@ static struct nft_hook *nft_netdev_hook
goto err_hook_alloc;
}
- nla_strlcpy(ifname, attr, IFNAMSIZ);
+ nla_strscpy(ifname, attr, IFNAMSIZ);
+ /* nf_tables_netdev_event() is called under rtnl_mutex, this is
+ * indirectly serializing all the other holders of the commit_mutex with
+ * the rtnl_mutex.
+ */
dev = __dev_get_by_name(net, ifname);
if (!dev) {
err = -ENOENT;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-12-10 2:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 2:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-04-08 14:10 linux-next: manual merge of the net-next tree with the netfilter tree Mark Brown
2026-04-08 15:08 ` Mark Brown
2026-04-08 16:43 ` Matthieu Baerts
2026-04-08 17:00 ` Mark Brown
2026-04-09 1:04 ` Andrea Mayer
2018-08-07 2:49 Stephen Rothwell
2018-08-15 23:47 ` Stephen Rothwell
2018-08-16 0:08 ` Pablo Neira Ayuso
2016-11-09 23:56 Stephen Rothwell
2016-11-10 0:31 ` Pablo Neira Ayuso
2016-11-13 4:43 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201210131113.6394fe45@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=laniel_francis@privacyrequired$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox