From 08aa9d9230c2151669775be8ecc1511510761d51 Mon Sep 17 00:00:00 2001 From: wrobell Date: Tue, 5 Jul 2011 20:39:19 +0000 Subject: [PATCH] - resurrected small fixes patch - removed already applied chunks - removed ppc chunks from the spec (pld does not support ppc anymore) Changed files: kernel-small_fixes.patch -> 1.28 kernel.spec -> 1.930 --- kernel-small_fixes.patch | 131 +++++++++++++++++++++++++++++++++++++++ kernel.spec | 2 + 2 files changed, 133 insertions(+) create mode 100644 kernel-small_fixes.patch diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch new file mode 100644 index 00000000..cdcf5970 --- /dev/null +++ b/kernel-small_fixes.patch @@ -0,0 +1,131 @@ +--- linux-2.6.32/drivers/infiniband/Kconfig~ 2009-12-05 00:26:03.663774916 +0100 ++++ linux-2.6.32/drivers/infiniband/Kconfig 2009-12-05 00:26:05.914179759 +0100 +@@ -37,7 +37,6 @@ + config INFINIBAND_ADDR_TRANS + bool + depends on INET +- depends on !(INFINIBAND = y && IPV6 = m) + default y + + source "drivers/infiniband/hw/mthca/Kconfig" +--- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 +@@ -15,7 +15,8 @@ + #include + #include + #include "modpost.h" +-#include "../../include/generated/autoconf.h" ++// PLD architectures don't use CONFIG_SYMBOL_PREFIX ++//#include "../../include/generated/autoconf.h" + #include "../../include/linux/license.h" + + /* Some toolchains use a `_' prefix for all user symbols. */ + +commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511 +Author: stephen hemminger +Date: Fri Feb 12 06:58:00 2010 +0000 + + sky2: dont enable PME legacy mode + + This bit is not changed by vendor driver, and should be left alone. + The documentation implies this a debug bit. + 0 = WAKE# only asserted when VMAIN not available + 1 = WAKE# is depend on wake events and independent of VMAIN. + + Signed-off-by: Stephen Hemminger + Signed-off-by: David S. Miller + +diff --git b/drivers/net/sky2.c a/drivers/net/sky2.c +index 2494842..edf37aa 100644 +--- b/drivers/net/sky2.c ++++ a/drivers/net/sky2.c +@@ -733,6 +733,7 @@ static void sky2_wol_init(struct sky2_port *sky2) + unsigned port = sky2->port; + enum flow_control save_mode; + u16 ctrl; ++ u32 reg1; + + /* Bring hardware out of reset */ + sky2_write16(hw, B0_CTST, CS_RST_CLR); +@@ -786,6 +787,11 @@ static void sky2_wol_init(struct sky2_port *sky2) + /* Disable PiG firmware */ + sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF); + ++ /* Turn on legacy PCI-Express PME mode */ ++ reg1 = sky2_pci_read32(hw, PCI_DEV_REG1); ++ reg1 |= PCI_Y2_PME_LEGACY; ++ sky2_pci_write32(hw, PCI_DEV_REG1, reg1); ++ + /* block receiver */ + sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); + } + + + +blk_cleanup_queue() calls elevator_exit() and after this, we can't +touch the elevator without oopsing. __elv_next_request() must check +for this state because in the refcounted queue model, we can still +call it after blk_cleanup_queue() has been called. + +This was reported as causing an oops attributable to scsi. + +Signed-off-by: James Bottomley +--- + block/blk.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/block/blk.h b/block/blk.h +index 6126346..4df474d 100644 +--- a/block/blk.h ++++ b/block/blk.h +@@ -62,7 +62,8 @@ static inline struct request *__elv_next_request(struct request_queue *q) + return rq; + } + +- if (!q->elevator->ops->elevator_dispatch_fn(q, 0)) ++ if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) || ++ !q->elevator->ops->elevator_dispatch_fn(q, 0)) + return NULL; + } + } +-- +1.7.4.1 + + + +-- +To unsubscribe from this list: send the line "unsubscribe linux-scsi" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.htmlcommit a5b2c5b2ad5853591a6cac6134cd0f599a720865 +Author: Kees Cook +Date: Tue May 31 11:31:41 2011 -0700 + + AppArmor: fix oops in apparmor_setprocattr + + When invalid parameters are passed to apparmor_setprocattr a NULL deref + oops occurs when it tries to record an audit message. This is because + it is passing NULL for the profile parameter for aa_audit. But aa_audit + now requires that the profile passed is not NULL. + + Fix this by passing the current profile on the task that is trying to + setprocattr. + + Signed-off-by: Kees Cook + Signed-off-by: John Johansen + Cc: stable@kernel.org + Signed-off-by: James Morris + +diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c +index ae3a698..ec1bcec 100644 +--- a/security/apparmor/lsm.c ++++ b/security/apparmor/lsm.c +@@ -593,7 +593,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, + sa.aad.op = OP_SETPROCATTR; + sa.aad.info = name; + sa.aad.error = -EINVAL; +- return aa_audit(AUDIT_APPARMOR_DENIED, NULL, GFP_KERNEL, ++ return aa_audit(AUDIT_APPARMOR_DENIED, ++ __aa_current_profile(), GFP_KERNEL, + &sa, NULL); + } + } else if (strcmp(name, "exec") == 0) { diff --git a/kernel.spec b/kernel.spec index 232176ed..3a7fc945 100644 --- a/kernel.spec +++ b/kernel.spec @@ -279,6 +279,7 @@ Patch300: kernel-routes.patch # https://patchwork.kernel.org/patch/236261/ Patch400: kernel-virtio-gl-accel.patch +Patch2000: kernel-small_fixes.patch Patch2001: kernel-pwc-uncompress.patch Patch2003: kernel-regressions.patch @@ -804,6 +805,7 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile %endif # vanilla # Small fixes: +%patch2000 -p1 %patch2001 -p1 #%patch2003 -p1 -- 2.44.0