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
| ||
|
Date: Wed, 19 Jun 2013 20:37:12 -0700 (PDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, johannes.berg@...el.com Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Thu, 20 Jun 2013 12:58:23 +1000 > Today's linux-next merge of the net-next tree got a conflict in > net/wireless/nl80211.c between commit 3a5a423bb958 ("nl80211: fix attrbuf > access race by allocating a separate one") from the net tree and commit > 5fe231e87372 ("cfg80211: vastly simplify locking") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). I did this merge a few hours ago and hit the same conflict. Although I fixed the bug in that rtnl_unlock() is not performed in all the return code paths. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists