From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751633Ab3FZNER (ORCPT ); Wed, 26 Jun 2013 09:04:17 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:43735 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269Ab3FZNEP (ORCPT ); Wed, 26 Jun 2013 09:04:15 -0400 Message-ID: <51CAE6CA.8000909@ti.com> Date: Wed, 26 Jun 2013 16:04:10 +0300 From: Tomi Valkeinen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Dan Carpenter CC: Jean-Christophe Plagniol-Villard , , , Subject: Re: [patch] fbmem: return -EFAULT on copy_to_user() failure References: <20130618070529.GA12329@elgon.mountain> In-Reply-To: <20130618070529.GA12329@elgon.mountain> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2DXRAHWOQQAMUBFXKLBLL" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ------enig2DXRAHWOQQAMUBFXKLBLL Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 18/06/13 10:05, Dan Carpenter wrote: > copy_to_user() returns the number of bytes remaining to be copied. > put_user() returns -EFAULT on error. >=20 > This function ORs a bunch of stuff together and returns jumbled non-zer= o > values on error. It should return -EFAULT. >=20 > Signed-off-by: Dan Carpenter >=20 > diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c > index 098bfc6..9217be3 100644 > --- a/drivers/video/fbmem.c > +++ b/drivers/video/fbmem.c > @@ -1305,7 +1305,9 @@ static int do_fscreeninfo_to_user(struct fb_fix_s= creeninfo *fix, > err |=3D copy_to_user(fix32->reserved, fix->reserved, > sizeof(fix->reserved)); > =20 > - return err; > + if (err) > + return -EFAULT; > + return 0; > } > =20 > static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd, I've added this to fbdev-3.11 branch. Tomi ------enig2DXRAHWOQQAMUBFXKLBLL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRyubKAAoJEPo9qoy8lh71DQkP/jo/YqxPdBn1fKjZxVunqf+q /KLfQsF5UTCDyO9O66+imJMjpuyN9T2bnFjZGZ6Xp6lfC/Cyqg1L+BckRY5x/yuS IDyBJKEB1AewA51Cb1FxNYzwOpGouCAyTF9BVTGkI3d0wllurq8ettV32Z36lNUi RP3z1Pqcp9ajXakoTMV2QMfqajr31tYv4oVqGV9jqMG9DE+InlbpjpVhCTJVy6/4 d/pGxXHI7zA6fObThcYE54/IuHLqucgkZOO/MruIfN68n3BXehTf2MWUU4i0Swr/ r2nhbudKjIBi8JLikJuEBTuZ2biS3U4z+KKb+0AtJ+c9VtEtPRbw4DNs5svnwAGF FZw1/gOr6om/ApMeGixAQOX1ChvjnkmHGwzKpvYiYdQhMHJnQ9sNIURQPxdeHYsb l3r3LFNmvTbaerru7GKxpNyTty4USHdaS3AVFZN4lmoIyuv3NKZ0A2cJ4MOaEWrK uNUI4PSU+P1JHwWtnwtHWzEw1aZS1fmhvO1qgkErI1HwkOdnr6UA++Xm63HpziYI 3UTxpvtIYB2YVAdy4N0DNDk8Sk5tyUOC3JuixkqVkv7n9fWh1LwO4oeDJlZ8RQUX rZToCWb1WXrJ727+xbB28eVsjbJpxL7D3gjZJQzhtCO3UzoyZXL2XitLzZrO18Qq 9l99DUvSuuBmIOQ+2pB9 =PxFp -----END PGP SIGNATURE----- ------enig2DXRAHWOQQAMUBFXKLBLL--