Commit de9e88d5 authored by Dann Frazier's avatar Dann Frazier Committed by Adrian Bunk

fix buffer overflow in the moxa driver (CVE-2005-0504)

Signed-off-by: default avatarDann Frazier <dannf@hp.com>
Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
parent cc6b1c0e
...@@ -1656,7 +1656,7 @@ int MoxaDriverIoctl(unsigned int cmd, unsigned long arg, int port) ...@@ -1656,7 +1656,7 @@ int MoxaDriverIoctl(unsigned int cmd, unsigned long arg, int port)
if(copy_from_user(&dltmp, argp, sizeof(struct dl_str))) if(copy_from_user(&dltmp, argp, sizeof(struct dl_str)))
return -EFAULT; return -EFAULT;
if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS) if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS || dltmp.len < 0)
return -EINVAL; return -EINVAL;
switch(cmd) switch(cmd)
...@@ -2764,6 +2764,8 @@ static int moxaloadbios(int cardno, unsigned char __user *tmp, int len) ...@@ -2764,6 +2764,8 @@ static int moxaloadbios(int cardno, unsigned char __user *tmp, int len)
void __iomem *baseAddr; void __iomem *baseAddr;
int i; int i;
if(len < 0 || len > sizeof(moxaBuff))
return -EINVAL;
if(copy_from_user(moxaBuff, tmp, len)) if(copy_from_user(moxaBuff, tmp, len))
return -EFAULT; return -EFAULT;
baseAddr = moxaBaseAddr[cardno]; baseAddr = moxaBaseAddr[cardno];
...@@ -2811,7 +2813,7 @@ static int moxaload320b(int cardno, unsigned char __user *tmp, int len) ...@@ -2811,7 +2813,7 @@ static int moxaload320b(int cardno, unsigned char __user *tmp, int len)
void __iomem *baseAddr; void __iomem *baseAddr;
int i; int i;
if(len > sizeof(moxaBuff)) if(len < 0 || len > sizeof(moxaBuff))
return -EINVAL; return -EINVAL;
if(copy_from_user(moxaBuff, tmp, len)) if(copy_from_user(moxaBuff, tmp, len))
return -EFAULT; return -EFAULT;
...@@ -2831,6 +2833,8 @@ static int moxaloadcode(int cardno, unsigned char __user *tmp, int len) ...@@ -2831,6 +2833,8 @@ static int moxaloadcode(int cardno, unsigned char __user *tmp, int len)
void __iomem *baseAddr, *ofsAddr; void __iomem *baseAddr, *ofsAddr;
int retval, port, i; int retval, port, i;
if(len < 0 || len > sizeof(moxaBuff))
return -EINVAL;
if(copy_from_user(moxaBuff, tmp, len)) if(copy_from_user(moxaBuff, tmp, len))
return -EFAULT; return -EFAULT;
baseAddr = moxaBaseAddr[cardno]; baseAddr = moxaBaseAddr[cardno];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment