Messages in this thread Patch in this message | | | Date | Sat, 14 Jan 2006 23:49:26 +0100 | From | Benoit Boissinot <> | Subject | [patch 2.6.15-mm4] drivers/cdrom/cdrom.c fix incorrect test |
| |
In cleanup-cdrom_ioctl.patch,
the test in CDROMREADTOCENTRY ioctl was changed from
if (!((requested_format == CDROM_MSF) || (requested_format == CDROM_LBA))) return -EINVAL;
to
if (requested_format != CDROM_MSF || requested_format != CDROM_LBA) return -EINVAL;
which is not equivalent with morgan's law.
Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
diff -Naurp -X Documentation/dontdiff ../linux/drivers/cdrom/cdrom.c drivers/cdrom/cdrom.c --- a/linux/drivers/cdrom/cdrom.c 2006-01-14 16:11:43.000000000 +0100 +++ b/drivers/cdrom/cdrom.c 2006-01-14 23:44:51.000000000 +0100 @@ -2585,7 +2585,7 @@ static int cdrom_ioctl_read_tocentry(str return -EFAULT; requested_format = entry.cdte_format; - if (requested_format != CDROM_MSF || requested_format != CDROM_LBA) + if (requested_format != CDROM_MSF && requested_format != CDROM_LBA) return -EINVAL; /* make interface to low-level uniform */ entry.cdte_format = CDROM_MSF; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |