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  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:   Thu, 10 Dec 2020 13:11:13 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Pablo Neira Ayuso <pablo@...filter.org>,
        NetFilter <netfilter-devel@...r.kernel.org>
Cc:     Francis Laniel <laniel_francis@...vacyrequired.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the netfilter
 tree

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;

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists