On Sat, Sep 10, 2016 at 11:33:41AM -0400, nick wrote: > > > On 2016-09-10 11:15 AM, Greg KH wrote: > > On Sat, Sep 10, 2016 at 10:53:01AM -0400, Nicholas Krause wrote: > >> > >> > >> On September 10, 2016 4:15:05 AM EDT, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > >>> On Fri, Sep 09, 2016 at 01:08:36PM -0400, Nicholas Krause wrote: > >>>> > >>>> > >>>> On September 9, 2016 9:38:13 AM EDT, gregkh@xxxxxxxxxxxxxxxxxxx > >>> wrote: > >>>>> > >>>>> This is a note to let you know that I've just added the patch titled > >>>>> > >>>>> [PATCH 062/135] megaraid: Fix possible NULL pointer deference in > >>>>> > >>>>> to the 4.4-stable tree which can be found at: > >>>> > >>>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > >>>>> > >>>>> The filename of the patch is: > >>>>> 0062-megaraid-Fix-possible-NULL-pointer-deference-in-mrai.patch > >>>>> and it can be found in the queue-4.4 subdirectory. > >>>>> > >>>>> If you, or anyone else, feels it should not be added to the stable > >>>>> tree, > >>>>> please let <stable@xxxxxxxxxxxxxxx> know about it. > >>>>> > >>>>> > >>>> >From 301709c17bc50faa7f2c77797e454f3286d8ba39 Mon Sep 17 00:00:00 > >>> 2001 > >>>>> From: Nicholas Krause <xerofoify@xxxxxxxxx> > >>>>> 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 <xerofoify@xxxxxxxxx> > >>>>> Acked-by: Sumit Saxena <sumit.saxena@xxxxxxxxxxxxx> > >>>>> Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx> > >>>>> Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx> > >>>>> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > >>>>> --- > >>>>> 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. > >>>>> > >>>>> > >>>>> Patches currently in stable-queue which might be from > >>>>> xerofoify@xxxxxxxxx are > >>>>> > >>>> > >>>> queue-4.4/0062-megaraid-Fix-possible-NULL-pointer-deference-in-mrai.patch > >>>> I do not wish any of my work to > >>>> touch the stable kernel tree. > >>> > >>> Hahaha, sure, gladly deleted, too funny... > >>> > >>> greg k-h > >> On top of that please revert the regression fix. That is also my > >> work and therefore shouldn't be touching the stable tree either. > > > > What exactly are you referring to? > > > https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=fbedcaf43fba35677c01a4ae51e6f79edf4049ba > This commit I want removed from stable as I refuse to have any of my work in the stable tree for now. Please learn a bit more about git, and how this specific commit isn't in a "stable tree" before saying stuff like this, there is nothing to do, unless you want us to revert your changes entirely (and even then, you can't rewrite history...) sorry, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html