tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bsg: fix incorrect device_status value
[SCSI] Fix VPD inquiry page wrapper

Linus Torvalds 30c27819 ef2533da

+3 -3
+1 -1
block/bsg.c
··· 426 426 /* 427 427 * fill in all the output members 428 428 */ 429 - hdr->device_status = status_byte(rq->errors); 429 + hdr->device_status = rq->errors & 0xff; 430 430 hdr->transport_status = host_byte(rq->errors); 431 431 hdr->driver_status = driver_byte(rq->errors); 432 432 hdr->info = 0;
+2 -2
drivers/scsi/scsi.c
··· 1046 1046 1047 1047 /* If the user actually wanted this page, we can skip the rest */ 1048 1048 if (page == 0) 1049 - return -EINVAL; 1049 + return 0; 1050 1050 1051 1051 for (i = 0; i < min((int)buf[3], buf_len - 4); i++) 1052 1052 if (buf[i + 4] == page) 1053 1053 goto found; 1054 1054 1055 - if (i < buf[3] && i > buf_len) 1055 + if (i < buf[3] && i >= buf_len - 4) 1056 1056 /* ran off the end of the buffer, give us benefit of doubt */ 1057 1057 goto found; 1058 1058 /* The device claims it doesn't support the requested page */