From: Greg Kroah-Hartman Date: Sat, 10 Sep 2016 08:15:18 +0000 (+0200) Subject: remove patch from 4.4 tree for megaraid X-Git-Tag: v3.14.79~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5023d0a999aff08479c656b0e93e863be20008b;p=thirdparty%2Fkernel%2Fstable-queue.git remove patch from 4.4 tree for megaraid --- diff --git a/queue-4.4/0062-megaraid-Fix-possible-NULL-pointer-deference-in-mrai.patch b/queue-4.4/0062-megaraid-Fix-possible-NULL-pointer-deference-in-mrai.patch deleted file mode 100644 index ca1e62174ad..00000000000 --- a/queue-4.4/0062-megaraid-Fix-possible-NULL-pointer-deference-in-mrai.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 301709c17bc50faa7f2c77797e454f3286d8ba39 Mon Sep 17 00:00:00 2001 -From: Nicholas Krause -Date: Tue, 5 Jan 2016 14:32:54 -0500 -Subject: [PATCH 062/135] megaraid: Fix possible NULL pointer deference in - mraid_mm_ioctl - -[ Upstream commit 7296f62f0322d808362b21064deb34f20799c20d ] - -This adds the needed check after the call to the function -mraid_mm_alloc_kioc in order to make sure that this function has not -returned NULL and therefore makes sure we do not deference a NULL -pointer if one is returned by mraid_mm_alloc_kioc. Further more add -needed comments explaining that this function call can return NULL if -the list head is empty for the pointer passed in order to allow furture -users to understand this required pointer check. - -Signed-off-by: Nicholas Krause -Acked-by: Sumit Saxena -Signed-off-by: Martin K. Petersen -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/megaraid/megaraid_mm.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/scsi/megaraid/megaraid_mm.c -+++ b/drivers/scsi/megaraid/megaraid_mm.c -@@ -179,8 +179,12 @@ mraid_mm_ioctl(struct file *filep, unsig - - /* - * The following call will block till a kioc is available -+ * or return NULL if the list head is empty for the pointer -+ * of type mraid_mmapt passed to mraid_mm_alloc_kioc - */ - kioc = mraid_mm_alloc_kioc(adp); -+ if (!kioc) -+ return -ENXIO; - - /* - * User sent the old mimd_t ioctl packet. Convert it to uioc_t. diff --git a/queue-4.4/series b/queue-4.4/series index 758f7808c85..8c0d28d92f5 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -57,7 +57,6 @@ 0059-s390-cio-fix-measurement-characteristics-memleak.patch 0060-s390-cio-ensure-consistent-measurement-state.patch 0061-s390-cio-update-measurement-characteristics.patch -0062-megaraid-Fix-possible-NULL-pointer-deference-in-mrai.patch 0063-megaraid_sas-Do-not-allow-PCI-access-during-OCR.patch 0064-megaraid_sas-Fix-SMAP-issue.patch 0065-megaraid_sas-Add-an-i-o-barrier.patch