Hi, It looks like we're getting down to the last -rc; can this patch please make it into main-line before 2.6.26 goes final? Thanks! On Tue, 24 Jun 2008, Alan Stern wrote: > This patch (as1108) fixes a problem that can occur with certain USB > mass-storage devices: They return invalid data together with a residue > indicating that the data should be ignored. Rather than leave the > invalid data in a transfer buffer, where it can get misinterpreted, > the patch clears the invalid portion of the buffer. > > This solves a problem (wrong write-protect setting detected) reported > by Maciej Rutecki and Peter Teoh. > > Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > Tested-by: Peter Teoh <htmldeveloper@xxxxxxxxx> > > --- > > Index: usb-2.6/drivers/scsi/scsi_lib.c > =================================================================== > --- usb-2.6.orig/drivers/scsi/scsi_lib.c > +++ usb-2.6/drivers/scsi/scsi_lib.c > @@ -207,6 +207,15 @@ int scsi_execute(struct scsi_device *sde > */ > blk_execute_rq(req->q, NULL, req, 1); > > + /* > + * Some devices (USB mass-storage in particular) may transfer > + * garbage data together with a residue indicating that the data > + * is invalid. Prevent the garbage from being misinterpreted > + * and prevent security leaks by zeroing out the excess data. > + */ > + if (unlikely(req->data_len > 0 && req->data_len <= bufflen)) > + memset(buffer + (bufflen - req->data_len), 0, req->data_len); > + > ret = req->errors; > out: > blk_put_request(req); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Cal Peake -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
