* [gentoo-commits] linux-patches r1846 - genpatches-2.6/trunk/2.6.32
@ 2010-12-12 0:50 Mike Pagano (mpagano)
0 siblings, 0 replies; only message in thread
From: Mike Pagano (mpagano) @ 2010-12-12 0:50 UTC (permalink / raw
To: gentoo-commits
Author: mpagano
Date: 2010-12-12 00:49:57 +0000 (Sun, 12 Dec 2010)
New Revision: 1846
Removed:
genpatches-2.6/trunk/2.6.32/1500_econet-capable-SIOCSIFADDR-check.patch
genpatches-2.6/trunk/2.6.32/1505_econet-null-ptr-dereference.patch
genpatches-2.6/trunk/2.6.32/1510_do-exit-kernel-mem-write.patch
genpatches-2.6/trunk/2.6.32/2500_libata-fix-truncated-LBA48-ret-vals.patch
Modified:
genpatches-2.6/trunk/2.6.32/0000_README
Log:
Linux patch 2.6.32.27. Removal of redundant patches
Modified: genpatches-2.6/trunk/2.6.32/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.32/0000_README 2010-12-11 23:55:54 UTC (rev 1845)
+++ genpatches-2.6/trunk/2.6.32/0000_README 2010-12-12 00:49:57 UTC (rev 1846)
@@ -143,22 +143,10 @@
From: http://www.kernel.org
Desc: Linux 2.6.32.26
-Patch: 1500_econet-capable-SIOCSIFADDR-check.patch
-From: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3850
-Desc: Adds missing capable() check to SIOCSIFADDR operation (CVE-2010-3850)
+Patch: 1026_linux-2.6.32.27.patch
+From: http://www.kernel.org
+Desc: Linux 2.6.32.27
-Patch: 1505_econet-null-ptr-dereference.patch
-From: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3849
-Desc: Fixes NULL pointer dereference in econet sockets (CVE-2010-3849)
-
-Patch: 1510_do-exit-kernel-mem-write.patch
-From: https://patchwork.kernel.org/patch/386992/
-Desc: Fixes kernel memory write in do_exit() (CVE-2010-4258)
-
-Patch: 2500_libata-fix-truncated-LBA48-ret-vals.patch
-From: http://bugs.gentoo.org/show_bug.cgi?id=303313
-Desc: Fix bug which truncated LBA48 return values
-
Patch: 4200_fbcondecor-0.9.6.patch
From: http://dev.gentoo.org/~spock
Desc: Bootsplash successor by Michal Januszewski
Deleted: genpatches-2.6/trunk/2.6.32/1500_econet-capable-SIOCSIFADDR-check.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/1500_econet-capable-SIOCSIFADDR-check.patch 2010-12-11 23:55:54 UTC (rev 1845)
+++ genpatches-2.6/trunk/2.6.32/1500_econet-capable-SIOCSIFADDR-check.patch 2010-12-12 00:49:57 UTC (rev 1846)
@@ -1,27 +0,0 @@
-From 16c41745c7b92a243d0874f534c1655196c64b74 Mon Sep 17 00:00:00 2001
-From: Phil Blundell <philb@gnu.org>
-Date: Wed, 24 Nov 2010 11:49:53 -0800
-Subject: [PATCH] econet: fix CVE-2010-3850
-
-Add missing check for capable(CAP_NET_ADMIN) in SIOCSIFADDR operation.
-
-Signed-off-by: Phil Blundell <philb@gnu.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/econet/af_econet.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-Index: linux-2.6.36-gentoo-r3/net/econet/af_econet.c
-===================================================================
---- linux-2.6.36-gentoo-r3.orig/net/econet/af_econet.c
-+++ linux-2.6.36-gentoo-r3/net/econet/af_econet.c
-@@ -671,6 +671,9 @@ static int ec_dev_ioctl(struct socket *s
- err = 0;
- switch (cmd) {
- case SIOCSIFADDR:
-+ if (!capable(CAP_NET_ADMIN))
-+ return -EPERM;
-+
- edev = dev->ec_ptr;
- if (edev == NULL) {
- /* Magic up a new one. */
Deleted: genpatches-2.6/trunk/2.6.32/1505_econet-null-ptr-dereference.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/1505_econet-null-ptr-dereference.patch 2010-12-11 23:55:54 UTC (rev 1845)
+++ genpatches-2.6/trunk/2.6.32/1505_econet-null-ptr-dereference.patch 2010-12-12 00:49:57 UTC (rev 1846)
@@ -1,58 +0,0 @@
-From fa0e846494792e722d817b9d3d625a4ef4896c96 Mon Sep 17 00:00:00 2001
-From: Phil Blundell <philb@gnu.org>
-Date: Wed, 24 Nov 2010 11:49:19 -0800
-Subject: [PATCH] econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
-
-Later parts of econet_sendmsg() rely on saddr != NULL, so return early
-with EINVAL if NULL was passed otherwise an oops may occur.
-
-Signed-off-by: Phil Blundell <philb@gnu.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/econet/af_econet.c | 26 ++++++++------------------
- 1 files changed, 8 insertions(+), 18 deletions(-)
-
-Index: linux-2.6.36-gentoo-r3/net/econet/af_econet.c
-===================================================================
---- linux-2.6.36-gentoo-r3.orig/net/econet/af_econet.c
-+++ linux-2.6.36-gentoo-r3/net/econet/af_econet.c
-@@ -297,23 +297,14 @@ static int econet_sendmsg(struct kiocb *
-
- mutex_lock(&econet_mutex);
-
-- if (saddr == NULL) {
-- struct econet_sock *eo = ec_sk(sk);
--
-- addr.station = eo->station;
-- addr.net = eo->net;
-- port = eo->port;
-- cb = eo->cb;
-- } else {
-- if (msg->msg_namelen < sizeof(struct sockaddr_ec)) {
-- mutex_unlock(&econet_mutex);
-- return -EINVAL;
-- }
-- addr.station = saddr->addr.station;
-- addr.net = saddr->addr.net;
-- port = saddr->port;
-- cb = saddr->cb;
-- }
-+ if (saddr == NULL || msg->msg_namelen < sizeof(struct sockaddr_ec)) {
-+ mutex_unlock(&econet_mutex);
-+ return -EINVAL;
-+ }
-+ addr.station = saddr->addr.station;
-+ addr.net = saddr->addr.net;
-+ port = saddr->port;
-+ cb = saddr->cb;
-
- /* Look for a device with the right network number. */
- dev = net2dev_map[addr.net];
-@@ -351,7 +342,6 @@ static int econet_sendmsg(struct kiocb *
-
- eb = (struct ec_cb *)&skb->cb;
-
-- /* BUG: saddr may be NULL */
- eb->cookie = saddr->cookie;
- eb->sec = *saddr;
- eb->sent = ec_tx_done;
Deleted: genpatches-2.6/trunk/2.6.32/1510_do-exit-kernel-mem-write.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/1510_do-exit-kernel-mem-write.patch 2010-12-11 23:55:54 UTC (rev 1845)
+++ genpatches-2.6/trunk/2.6.32/1510_do-exit-kernel-mem-write.patch 2010-12-12 00:49:57 UTC (rev 1846)
@@ -1,18 +0,0 @@
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -903,6 +903,15 @@ NORET_TYPE void do_exit(long code)
- if (unlikely(!tsk->pid))
- panic("Attempted to kill the idle task!");
-
-+ /*
-+ * If do_exit is called because this processes oopsed, it's possible
-+ * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
-+ * continuing. Amongst other possible reasons, this is to prevent
-+ * mm_release()->clear_child_tid() from writing to a user-controlled
-+ * kernel address.
-+ */
-+ set_fs(USER_DS);
-+
- tracehook_report_exit(&code);
-
- validate_creds_for_do_exit(tsk);
Deleted: genpatches-2.6/trunk/2.6.32/2500_libata-fix-truncated-LBA48-ret-vals.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/2500_libata-fix-truncated-LBA48-ret-vals.patch 2010-12-11 23:55:54 UTC (rev 1845)
+++ genpatches-2.6/trunk/2.6.32/2500_libata-fix-truncated-LBA48-ret-vals.patch 2010-12-12 00:49:57 UTC (rev 1846)
@@ -1,29 +0,0 @@
-From: Douglas Gilbert <dgilbert@interlog.com>
-Date: Mon, 1 Feb 2010 18:11:38 +0000 (-0500)
-Subject: libata-scsi passthru: fix bug which truncated LBA48 return values
-X-Git-Tag: v2.6.33-rc7~5^2~3
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bc496ed00ab1411d3efaf295b72e0c9eb343e1a3
-
-libata-scsi passthru: fix bug which truncated LBA48 return values
-
-Fix assignment which overwrote SAT ATA PASS-THROUGH command EXTEND
-bit setting (ATA_TFLAG_LBA48)
-
-Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
-Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
----
-
-diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index f4ea5a8..d096fbc 100644
---- a/drivers/ata/libata-scsi.c
-+++ b/drivers/ata/libata-scsi.c
-@@ -2875,7 +2875,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
- * write indication (used for PIO/DMA setup), result TF is
- * copied back and we don't whine too much about its failure.
- */
-- tf->flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
-+ tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
- if (scmd->sc_data_direction == DMA_TO_DEVICE)
- tf->flags |= ATA_TFLAG_WRITE;
-
-
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-12 0:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-12 0:50 [gentoo-commits] linux-patches r1846 - genpatches-2.6/trunk/2.6.32 Mike Pagano (mpagano)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox