Thank you! The new patch ------------------------------------------------------------- [PATCH] scsi: integer overflow in megadev_ioctl()
There is a potential integer overflow in megadev_ioctl() if userspace passes in a large u32 variable uioc.adapno. Theint variable adapno would < 0, leading to a error array access for hdb_soft_state[adapno], or a error copy_to_user(uioc.uioc_uaddr, mcontroller+adapno,..) Reported-by: Wenliang Fan <[email protected]> Suggested-by: Qixue Xiao <[email protected]> Signed-off-by: Yu Chen <[email protected]> --- drivers/scsi/megaraid.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 41bbc21..0b90c54 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -3099,7 +3099,10 @@ megadev_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) /* * Which adapter */ - if( (adapno = GETADAP(uioc.adapno)) >= hba_count ) + adapno = GETADAP(uioc.adapno); + if( adapno < 0 ) + return (-EINVAL); + if( adapno >= hba_count ) return (-ENODEV); if( copy_to_user(uioc.uioc_uaddr, mcontroller+adapno, @@ -3113,8 +3116,10 @@ megadev_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) /* * Which adapter */ - adapno = GETADAP(uioc.adapno); - if( adapno >= hba_count || adapno < 0 ) + adapno = GETADAP(uioc.adapno); + if( adapno < 0 ) + return (-EINVAL); + if( adapno >= hba_count ) return (-ENODEV); adapter = hba_soft_state[adapno]; @@ -3161,7 +3166,10 @@ megadev_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) /* * Which adapter */ - if( (adapno = GETADAP(uioc.adapno)) >= hba_count ) + adapno = GETADAP(uioc.adapno); + if( adapno < 0 ) + return (-EINVAL); + if( adapno >= hba_count ) return (-ENODEV); adapter = hba_soft_state[adapno]; -- 1.8.3.2 2013/12/14 Levente Kurusa <[email protected]>: > Hi, > > On 12/13/2013 05:55 PM, Yu Chen wrote: >> drivers/scsi/megaraid.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c >> index 816db12..41bbc21 100644 >> --- a/drivers/scsi/megaraid.c >> +++ b/drivers/scsi/megaraid.c >> @@ -3113,7 +3113,8 @@ megadev_ioctl(struct file *filep, unsigned int >> cmd, unsigned long arg) >> /* >> * Which adapter >> */ >> - if( (adapno = GETADAP(uioc.adapno)) >= hba_count ) >> + adapno = GETADAP(uioc.adapno); >> + if( adapno >= hba_count || adapno < 0 ) >> return (-ENODEV); > > Wouldn't returning -EINVAL be better? For hba_count I understand that > -ENODEV is returned but for adapno being a passed variable, I would > suggest returning -EINVAL. > > -- > Regards, > Levente Kurusa -- Best Regards ============================================== Yu Chen Ph.D. Associate Professor System Software&Software Engineering Group, Dept. of Computer Science and Technology Tsinghua University, Beijing 100084, P.R. China E-Mail: mailto:[email protected] [email protected] ============================================== -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
