Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60a5711d authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

isdn/kcapi: return -EFAULT on copy_from_user errors 



copy_from_user() returns the number of bytes remaining but we should
return -EFAULT here.  The error code gets returned to the user.  Both
old_capi_manufacturer() and capi20_manufacturer() had other places
that already returned -EFAULT so this won't break anything.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b21b508

drivers/isdn/capi/kcapi.c

+3 −3
Original line number Diff line number Diff line
@@ -1020,12 +1020,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) 
		if (cmd == AVMB1_ADDCARD) {

		   if ((retval = copy_from_user(&cdef, data,

					    sizeof(avmb1_carddef))))

			   return retval;

			   return -EFAULT;

		   cdef.cardtype = AVM_CARDTYPE_B1;

		} else {

		   if ((retval = copy_from_user(&cdef, data,

					    sizeof(avmb1_extcarddef))))

			   return retval;

			   return -EFAULT;

		}

		cparams.port = cdef.port;

		cparams.irq = cdef.irq;
@@ -1218,7 +1218,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data) 
		kcapi_carddef cdef;



		if ((retval = copy_from_user(&cdef, data, sizeof(cdef))))

			return retval;

			return -EFAULT;



		cparams.port = cdef.port;

		cparams.irq = cdef.irq;