netdev - Re: [patch] isdn/kcapi: return -EFAULT on copy_from

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4C078362.1080005@web.de>
Date:	Thu, 03 Jun 2010 12:26:42 +0200
From:	Jan Kiszka <jan.kiszka@....de>
To:	Dan Carpenter <error27@...il.com>
CC:	Karsten Keil <isdn@...ux-pingi.de>,
	"David S. Miller" <davem@...emloft.net>,
	Tilman Schmidt <tilman@...p.cc>, netdev@...r.kernel.org,
	kernel-janitors@...r.kernel.org
Subject: Re: [patch] isdn/kcapi: return -EFAULT on copy_from_user errors

Dan Carpenter wrote:
> 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.
> 

Good point.

> Signed-off-by: Dan Carpenter <error27@...il.com>
> 
> diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
> index bde3c88..b054494 100644
> --- a/drivers/isdn/capi/kcapi.c
> +++ b/drivers/isdn/capi/kcapi.c
> @@ -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;

No need to assign retval anymore, it is overwritten in all non-error cases.

Jan


Download attachment "signature.asc" of type "application/pgp-signature" (258 bytes)