From: Chris Wright Date: Wed, 26 Apr 2006 18:40:49 +0000 (-0700) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable... X-Git-Tag: v2.6.16.12~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=479ad698ef551f4e133e968b0c2ccd338da3f8e6;p=thirdparty%2Fkernel%2Fstable-queue.git Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue Conflicts: queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch --- 479ad698ef551f4e133e968b0c2ccd338da3f8e6 diff --cc queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch index 95c1c0693e6,00d0da26359..cebf71b4695 --- a/queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch +++ b/queue-2.6.16/lsm-add-missing-hook-to-do_compat_readv_writev.patch @@@ -1,28 -1,29 +1,30 @@@ - From jmorris@namei.org Wed Apr 26 10:51:36 2006 - Date: Wed, 26 Apr 2006 02:45:03 -0400 (EDT) + From git-commits-head-owner@vger.kernel.org Wed Apr 26 08:11:31 2006 + Date: Wed, 26 Apr 2006 15:11:00 GMT + Message-Id: <200604261511.k3QFB0R8000610@hera.kernel.org> + From: Linux Kernel Mailing List + To: git-commits-head@vger.kernel.org + Subject: LSM: add missing hook to do_compat_readv_writev() + From: James Morris - To: Linus Torvalds - cc: Al Viro , Chris Wright , - Stephen Smalley , linux-kernel@vger.kernel.org - Subject: [PATCH] LSM: add missing hook to do_compat_readv_writev() - This patch addresses a flaw in LSM, where there is no mediation of readv() + This patch addresses a flaw in LSM, where there is no mediation of readv() and writev() in for 32-bit compatible apps using a 64-bit kernel. - This bug was discovered and fixed initially in the native readv/writev - code [1], but was not fixed in the compat code. Thanks to Al for spotting + This bug was discovered and fixed initially in the native readv/writev + code [1], but was not fixed in the compat code. Thanks to Al for spotting this one. - Signed-off-by: James Morris + [1] http://lwn.net/Articles/154282/ + + Signed-off-by: James Morris Signed-off-by: Al Viro + Signed-off-by: Linus Torvalds + Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Chris Wright - [1] http://lwn.net/Articles/154282/ - --- - fs/compat.c | 4 ++++ - 1 files changed, 4 insertions(+) + 1 file changed, 4 insertions(+) --- linux-2.6.16.11.orig/fs/compat.c +++ linux-2.6.16.11/fs/compat.c