From 87a26f56478e9a2f6e7d603831c55cfbf9c3515f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 15 Oct 2009 14:12:54 -0700 Subject: [PATCH] start 2.6.27.38 review cycle --- review-2.6.27/mbox | 234 ++++++++++++++++++ ...fix-protection-scsi_data_buffer-leak.patch | 0 {queue-2.6.27 => review-2.6.27}/series | 0 ...igi_acceleport-fix-broken-unthrottle.patch | 0 ...ash-when-sub-driver-updates-firmware.patch | 0 5 files changed, 234 insertions(+) create mode 100644 review-2.6.27/mbox rename {queue-2.6.27 => review-2.6.27}/scsi-fix-protection-scsi_data_buffer-leak.patch (100%) rename {queue-2.6.27 => review-2.6.27}/series (100%) rename {queue-2.6.27 => review-2.6.27}/usb-digi_acceleport-fix-broken-unthrottle.patch (100%) rename {queue-2.6.27 => review-2.6.27}/usb-serial-fix-crash-when-sub-driver-updates-firmware.patch (100%) diff --git a/review-2.6.27/mbox b/review-2.6.27/mbox new file mode 100644 index 00000000000..a9365c8eccb --- /dev/null +++ b/review-2.6.27/mbox @@ -0,0 +1,234 @@ +From gregkh@mini.kroah.org Thu Oct 15 14:10:20 2009 +Message-Id: <20091015211019.922487164@mini.kroah.org> +User-Agent: quilt/0.48-1 +Date: Thu, 15 Oct 2009 11:54:31 -0700 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: stable-review@kernel.org, + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Alan Stern +Subject: [1/3] usb-serial: fix crash when sub-driver updates firmware +References: <20091015185430.128674330@mini.kroah.org> +Content-Disposition: inline; filename=usb-serial-fix-crash-when-sub-driver-updates-firmware.patch +Content-Length: 1326 +Lines: 38 + +2.6.27-stable review patch. If anyone has any objections, please let us know. + +------------------ +From: Alan Stern + +commit 0a3c8549ea7e94d74a41096d42bc6cdf43d183bf upstream. + +This patch (as1244) fixes a crash in usb-serial that occurs when a +sub-driver returns a positive value from its attach method, indicating +that new firmware was loaded and the device will disconnect and +reconnect. The usb-serial core then skips the step of registering the +port devices; when the disconnect occurs, the attempt to unregister +the ports fails dramatically. + +This problem shows up with Keyspan devices and it might affect others +as well. + +When the attach method returns a positive value, the patch sets +num_ports to 0. This tells usb_serial_disconnect() not to try +unregistering any of the ports; instead they are cleaned up by +destroy_serial(). + +Signed-off-by: Alan Stern +Tested-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/usb-serial.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/usb-serial.c ++++ b/drivers/usb/serial/usb-serial.c +@@ -973,6 +973,7 @@ int usb_serial_probe(struct usb_interfac + if (retval > 0) { + /* quietly accept this device, but don't bind to a + serial port as it's about to disappear */ ++ serial->num_ports = 0; + goto exit; + } + } + + +From gregkh@mini.kroah.org Thu Oct 15 14:10:20 2009 +Message-Id: <20091015211020.055924387@mini.kroah.org> +User-Agent: quilt/0.48-1 +Date: Thu, 15 Oct 2009 11:54:32 -0700 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: stable-review@kernel.org, + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + "Martin K. Petersen" , + James Bottomley +Subject: [2/3] SCSI: Fix protection scsi_data_buffer leak +References: <20091015185430.128674330@mini.kroah.org> +Content-Disposition: inline; filename=scsi-fix-protection-scsi_data_buffer-leak.patch +Content-Length: 1256 +Lines: 47 + +2.6.27-stable review patch. If anyone has any objections, please let us know. + +------------------ +From: Martin K. Petersen + +commit b4c2554d40ceac130a8d062eaa8838ed22158c45 upstream. + +We would leak a scsi_data_buffer if the free_list command was of the +protected variety. + +Reported-by: Boaz Harrosh +Signed-off-by: Martin K. Petersen +Signed-off-by: James Bottomley +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/scsi.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +--- a/drivers/scsi/scsi.c ++++ b/drivers/scsi/scsi.c +@@ -243,10 +243,7 @@ scsi_host_alloc_command(struct Scsi_Host + */ + struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask) + { +- struct scsi_cmnd *cmd; +- unsigned char *buf; +- +- cmd = scsi_host_alloc_command(shost, gfp_mask); ++ struct scsi_cmnd *cmd = scsi_host_alloc_command(shost, gfp_mask); + + if (unlikely(!cmd)) { + unsigned long flags; +@@ -260,9 +257,15 @@ struct scsi_cmnd *__scsi_get_command(str + spin_unlock_irqrestore(&shost->free_list_lock, flags); + + if (cmd) { ++ void *buf, *prot; ++ + buf = cmd->sense_buffer; ++ prot = cmd->prot_sdb; ++ + memset(cmd, 0, sizeof(*cmd)); ++ + cmd->sense_buffer = buf; ++ cmd->prot_sdb = prot; + } + } + + + +From gregkh@mini.kroah.org Thu Oct 15 14:10:20 2009 +Message-Id: <20091015211020.207764920@mini.kroah.org> +User-Agent: quilt/0.48-1 +Date: Thu, 15 Oct 2009 11:54:33 -0700 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: stable-review@kernel.org, + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Johan Hovold , + Oliver Neukum +Subject: [3/3] USB: digi_acceleport: Fix broken unthrottle. +References: <20091015185430.128674330@mini.kroah.org> +Content-Disposition: inline; filename=usb-digi_acceleport-fix-broken-unthrottle.patch +Content-Length: 1047 +Lines: 39 + +2.6.27-stable review patch. If anyone has any objections, please let us know. + +------------------ +From: Johan Hovold + +commit ba6b702f85a61561d329c4c11d3ed95604924f9a upstream. + +This patch fixes a regression introduced in +39892da44b21b5362eb848ca424d73a25ccc488f. + +Signed-off-by: Johan Hovold +Acked-by: Oliver Neukum +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/digi_acceleport.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/usb/serial/digi_acceleport.c ++++ b/drivers/usb/serial/digi_acceleport.c +@@ -892,16 +892,16 @@ static void digi_rx_unthrottle(struct tt + + spin_lock_irqsave(&priv->dp_port_lock, flags); + +- /* turn throttle off */ +- priv->dp_throttled = 0; +- priv->dp_throttle_restart = 0; +- + /* restart read chain */ + if (priv->dp_throttle_restart) { + port->read_urb->dev = port->serial->dev; + ret = usb_submit_urb(port->read_urb, GFP_ATOMIC); + } + ++ /* turn throttle off */ ++ priv->dp_throttled = 0; ++ priv->dp_throttle_restart = 0; ++ + spin_unlock_irqrestore(&priv->dp_port_lock, flags); + + if (ret) + + +From gregkh@mini.kroah.org Thu Oct 15 14:10:19 2009 +Message-Id: <20091015185430.128674330@mini.kroah.org> +User-Agent: quilt/0.48-1 +Date: Thu, 15 Oct 2009 11:54:30 -0700 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: stable-review@kernel.org, + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk +Subject: [0/3] 2.6.27.38-stable review +Content-Length: 930 +Lines: 26 + + +This is the start of the stable review cycle for the 2.6.27.38 release. +There are 3 patches in this series, all will be posted as a response to +this one. If anyone has any issues with these being applied, please let +us know. If anyone is a maintainer of the proper subsystem, and wants +to add a Signed-off-by: line to the patch, please respond with it. + +Responses should be made by Sunday, October 18, 2009 19:00:00 UTC. +Anything received after that time might be too late. + +The whole patch series can be found in one patch at: + kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.27.38-rc1.gz +and the diffstat can be found below. + + +thanks, + +greg k-h + +----------- + + Makefile | 2 +- + drivers/scsi/scsi.c | 11 +++++++---- + drivers/usb/serial/digi_acceleport.c | 8 ++++---- + drivers/usb/serial/usb-serial.c | 1 + + 4 files changed, 13 insertions(+), 9 deletions(-) + diff --git a/queue-2.6.27/scsi-fix-protection-scsi_data_buffer-leak.patch b/review-2.6.27/scsi-fix-protection-scsi_data_buffer-leak.patch similarity index 100% rename from queue-2.6.27/scsi-fix-protection-scsi_data_buffer-leak.patch rename to review-2.6.27/scsi-fix-protection-scsi_data_buffer-leak.patch diff --git a/queue-2.6.27/series b/review-2.6.27/series similarity index 100% rename from queue-2.6.27/series rename to review-2.6.27/series diff --git a/queue-2.6.27/usb-digi_acceleport-fix-broken-unthrottle.patch b/review-2.6.27/usb-digi_acceleport-fix-broken-unthrottle.patch similarity index 100% rename from queue-2.6.27/usb-digi_acceleport-fix-broken-unthrottle.patch rename to review-2.6.27/usb-digi_acceleport-fix-broken-unthrottle.patch diff --git a/queue-2.6.27/usb-serial-fix-crash-when-sub-driver-updates-firmware.patch b/review-2.6.27/usb-serial-fix-crash-when-sub-driver-updates-firmware.patch similarity index 100% rename from queue-2.6.27/usb-serial-fix-crash-when-sub-driver-updates-firmware.patch rename to review-2.6.27/usb-serial-fix-crash-when-sub-driver-updates-firmware.patch -- 2.47.3