On Sun, Jan 19, 2020 at 01:53:26PM -0500, Sasha Levin wrote:
On Sun, Jan 19, 2020 at 05:01:36PM +0100, Johan Hovold wrote:
On Sun, Jan 19, 2020 at 10:47:33AM -0500, Sasha Levin wrote:
On Sun, Jan 19, 2020 at 02:41:16PM +0100, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3018dd3fa114b13261e9599ddb5656ef97a1fa17 Mon Sep 17 00:00:00 2001 From: Johan Hovold johan@kernel.org Date: Fri, 17 Jan 2020 10:50:25 +0100 Subject: [PATCH] USB: serial: keyspan: handle unbound ports
Check for NULL port data in the control URB completion handlers to avoid dereferencing a NULL pointer in the unlikely case where a port device isn't bound to a driver (e.g. after an allocation failure on port probe()).
Fixes: 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable stable@vger.kernel.org Reviewed-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Johan Hovold johan@kernel.org
Grabbing the prerequisite for the other USB patch also resolved the conflict here, now queued for 4.9 and 4.4.
Just curious; which prerequisite are referring to here? I can't seem to understand why this one failed to apply to 4.9 in the first place as there hasn't really been any changes to that code in the keyspan driver.
I thought that it was either dd1fae527612 ("USB: serial: io_edgeport: use irqsave() in USB's complete callback") or the stable commit that was applied on top, but you're right - it doesn't seem to be either of those.
Thanks for confirming, and for doing the backports.
Johan