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: Tue, 2 Apr 2013 16:42:27 +0000 From: "Luck, Tony" <tony.luck@...el.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Al Viro <viro@...IV.linux.org.uk> CC: "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, Richard Weinberger <richard@....at> Subject: RE: linux-next: manual merge of the vfs tree with the ia64 tree > Today's linux-next merge of the vfs tree got a conflict in > arch/ia64/kernel/palinfo.c between commit 40c275bd92b8 ("[IA64] Fix stack > overflow in create_palinfo_proc_entries") from the ia64 tree and commit > d8e904861a28 ("palinfo fixes") from the vfs tree. > > I fixed it up (arbitrarily choosing the vfs tree version) and can carry > the fix as necessary (no action is required). It looks like you picked the version from the ia64 tree - but it would have been better to pick Al's version. He wastes less space on the stack by only declaring cpustr[3+4+1] instead of cpustr[32], but more importantly he checks the return value from proc_mkdir(). I'll drop 40c275bd92b8 out of my tree so Al's can go in without a conflict. -Tony -- 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