From 3814adabfed5bfa458b488a3a4eda05d68a3aceb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Dec 2005 22:55:31 -0800 Subject: [PATCH] updated queue --- queue/dpt_i2o-fix-a-null-pointer-deref.patch | 10 ++++------ .../fix-crash-when-ptrace-poking-hugepage-areas.patch | 10 ++++------ queue/infiniband-fix-a-null-pointer-deref.patch | 10 ++++------ queue/message-i2o-pci-fix-null-pointer-deref.patch | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/queue/dpt_i2o-fix-a-null-pointer-deref.patch b/queue/dpt_i2o-fix-a-null-pointer-deref.patch index 92f1d55b803..1129bd2cc11 100644 --- a/queue/dpt_i2o-fix-a-null-pointer-deref.patch +++ b/queue/dpt_i2o-fix-a-null-pointer-deref.patch @@ -10,15 +10,13 @@ The Coverity checker spotted this obvious use-after-free Signed-off-by: Adrian Bunk Acked-by: Mark Salyzyn Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - drivers/scsi/dpt_i2o.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 file changed, 5 insertions(+), 4 deletions(-) -Index: linux-2.6.14.y/drivers/scsi/dpt_i2o.c -=================================================================== ---- linux-2.6.14.y.orig/drivers/scsi/dpt_i2o.c -+++ linux-2.6.14.y/drivers/scsi/dpt_i2o.c +--- linux-2.6.14.3.orig/drivers/scsi/dpt_i2o.c ++++ linux-2.6.14.3/drivers/scsi/dpt_i2o.c @@ -816,7 +816,7 @@ static int adpt_hba_reset(adpt_hba* pHba static void adpt_i2o_sys_shutdown(void) { diff --git a/queue/fix-crash-when-ptrace-poking-hugepage-areas.patch b/queue/fix-crash-when-ptrace-poking-hugepage-areas.patch index 7ba5b6eb84f..1e419464f8a 100644 --- a/queue/fix-crash-when-ptrace-poking-hugepage-areas.patch +++ b/queue/fix-crash-when-ptrace-poking-hugepage-areas.patch @@ -21,15 +21,13 @@ Signed-off-by: David Gibson Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - kernel/ptrace.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletion(-) + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-2.6.14.y/kernel/ptrace.c -=================================================================== ---- linux-2.6.14.y.orig/kernel/ptrace.c -+++ linux-2.6.14.y/kernel/ptrace.c +--- linux-2.6.14.3.orig/kernel/ptrace.c ++++ linux-2.6.14.3/kernel/ptrace.c @@ -238,7 +238,8 @@ int access_process_vm(struct task_struct if (write) { copy_to_user_page(vma, page, addr, diff --git a/queue/infiniband-fix-a-null-pointer-deref.patch b/queue/infiniband-fix-a-null-pointer-deref.patch index a7d1381afd6..0c9eb51ecc1 100644 --- a/queue/infiniband-fix-a-null-pointer-deref.patch +++ b/queue/infiniband-fix-a-null-pointer-deref.patch @@ -11,15 +11,13 @@ caused by a wrong order of the cleanups. Signed-off-by: Adrian Bunk Acked-by: Roland Dreier Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - drivers/infiniband/core/mad.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-2.6.14.y/drivers/infiniband/core/mad.c -=================================================================== ---- linux-2.6.14.y.orig/drivers/infiniband/core/mad.c -+++ linux-2.6.14.y/drivers/infiniband/core/mad.c +--- linux-2.6.14.3.orig/drivers/infiniband/core/mad.c ++++ linux-2.6.14.3/drivers/infiniband/core/mad.c @@ -356,9 +356,9 @@ error4: spin_unlock_irqrestore(&port_priv->reg_lock, flags); kfree(reg_req); diff --git a/queue/message-i2o-pci-fix-null-pointer-deref.patch b/queue/message-i2o-pci-fix-null-pointer-deref.patch index 16294433636..33b582b7fdc 100644 --- a/queue/message-i2o-pci-fix-null-pointer-deref.patch +++ b/queue/message-i2o-pci-fix-null-pointer-deref.patch @@ -10,15 +10,13 @@ The Coverity checker spotted this obvious use-after-free Signed-off-by: Adrian Bunk Signed-off-by: Markus Lidel Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- - drivers/message/i2o/pci.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.14.y/drivers/message/i2o/pci.c -=================================================================== ---- linux-2.6.14.y.orig/drivers/message/i2o/pci.c -+++ linux-2.6.14.y/drivers/message/i2o/pci.c +--- linux-2.6.14.3.orig/drivers/message/i2o/pci.c ++++ linux-2.6.14.3/drivers/message/i2o/pci.c @@ -421,8 +421,8 @@ static int __devinit i2o_pci_probe(struc i2o_pci_free(c); -- 2.47.3