From patchwork Fri Sep 18 10:09:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11784519 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2E91618 for ; Fri, 18 Sep 2020 10:15:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE73621D7B for ; Fri, 18 Sep 2020 10:15:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726310AbgIRKPG (ORCPT ); Fri, 18 Sep 2020 06:15:06 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:36411 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbgIRKPG (ORCPT ); Fri, 18 Sep 2020 06:15:06 -0400 Received: from threadripper.lan ([149.172.98.151]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MfHQp-1kzioY3oj5-00gtZg; Fri, 18 Sep 2020 12:09:33 +0200 From: Arnd Bergmann To: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz Cc: dri-devel@lists.freedesktop.org, hch@lst.de, linux-kernel@vger.kernel.org, "David S . Miller" , Arnd Bergmann , Daniel Vetter , Geert Uytterhoeven Subject: [PATCH 1/3] fbdev: simplify fb_getput_cmap() Date: Fri, 18 Sep 2020 12:09:04 +0200 Message-Id: <20200918100926.1447563-1-arnd@arndb.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200918100812.1447443-1-arnd@arndb.de> References: <20200918100812.1447443-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:qTgjU2sPJm0CtwAKfelk8EKx/cY7OswKlwGh4NJZIDPMM4UJmUa ApsbULj9LW7rbHjUIz1A/i0NUp0GCZEkUeR45RFfhJofLOW7W5UZQXrFwxabzkSPKBUC3O4 4iyxGZQkD/CfW/upMjj+If3hjxf2OaTt5NAhb6N8DJtpZgN492yoUHypNo5oZFBnV+Jkf0L 8qjEN/cBHKUVWweeaMiHg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:6wF6uVnDOQo=:ydcIg5CETGJHzt0PPH4E2E YbUXatWHgJwD0EqPEeTOi3ak8UUTuYozvYbcKahQBMyi7dltkRoLyfO53QW29YOWbsfvqgLj3 7NFX0ungQuu6SxjXrn0NGWOQq6nNQ6Ec4O/O14N8DAYdJpfSxBY30suqlpfTBZ++TfDu4B/ab x3yh4vOtgbx634lgCx4G5FgaWbIuW2ReDfBqPQ1ll/6HflmwzrAAwx84f+trHqOYgarUCaPeI Q9Vg8k9Nnql4xioyGlNawD9L5/7go6FM9h82K1p+korWv83KSDeY3oxPjm7CfZMvwY8Y0B2GF HiIBT0Jj3tpvoJ6dpWaBP7/zAZQM7LDwD5xbyEw1lk1bIWFNCaYV0kVjtsZB1XWLc57mptlLJ hhB5KkFUvxCuYBJ4vOP11GMJ6jYkxWImgKqkWxADtRexyaMprt82jvx2dnGWhCfrwBRQmDk5p fJ5h3+/ZS2Lvbv/HZBNUbJN/lABvKc7oNi5nL8BqxSoGjscHfcih2y5OFvCY5asaw+LoggZ7O hEsbPLxM1dfCC437Z9vyvBwRxDaJfq7q0aOaf89riv01rZAn29mduAVXdZSwpRgyPayhaVjhr wdV5RNf/EpXG1lNVmbNBG618uJuc85NKY7L0kCtfqqGIIhU2ZtTumnoUmyWJVL/K/lV4ej93L fqHdFcYChfwyeFxOupbIZPvoc2PLk9nL8DGSQVXBxw4oRgBYCYSZqpH7ApugrbJJKn9R32rlw g+zN2RBJ4UF/6cDMyydNsY3O2Eu/Li0p2vPGOGZETpH/Prnwa7IRYaRb52puX2tokLaia/oEC DeGAcZ3g+63nPmRGEECK1mXZ+6xyOj4pt1/MbiKh7slvKDwRvMTib3FGwgGjUkY3NmFtqHm Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org This function is one of the remaining users of compat_alloc_user_space() and copy_in_user(). Clean it up by copying to a local data structure copy instead, which also leads to more readable code. Signed-off-by: Arnd Bergmann --- drivers/video/fbdev/core/fbmem.c | 44 ++++++++++++++------------------ 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index da7c88ffaa6a..4e162e3d3538 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1211,36 +1211,30 @@ struct fb_cmap32 { static int fb_getput_cmap(struct fb_info *info, unsigned int cmd, unsigned long arg) { - struct fb_cmap_user __user *cmap; - struct fb_cmap32 __user *cmap32; - __u32 data; - int err; - - cmap = compat_alloc_user_space(sizeof(*cmap)); - cmap32 = compat_ptr(arg); + struct fb_cmap32 cmap32; + struct fb_cmap cmap_from; + struct fb_cmap_user cmap; - if (copy_in_user(&cmap->start, &cmap32->start, 2 * sizeof(__u32))) + if (copy_from_user(&cmap32, compat_ptr(arg), sizeof(cmap32))) return -EFAULT; - if (get_user(data, &cmap32->red) || - put_user(compat_ptr(data), &cmap->red) || - get_user(data, &cmap32->green) || - put_user(compat_ptr(data), &cmap->green) || - get_user(data, &cmap32->blue) || - put_user(compat_ptr(data), &cmap->blue) || - get_user(data, &cmap32->transp) || - put_user(compat_ptr(data), &cmap->transp)) - return -EFAULT; + cmap = (struct fb_cmap_user) { + .start = cmap32.start, + .len = cmap32.len, + .red = compat_ptr(cmap32.red), + .green = compat_ptr(cmap32.green), + .blue = compat_ptr(cmap32.blue), + .transp = compat_ptr(cmap32.transp), + }; - err = do_fb_ioctl(info, cmd, (unsigned long) cmap); + if (cmd == FBIOPUTCMAP) + return fb_set_user_cmap(&cmap, info); - if (!err) { - if (copy_in_user(&cmap32->start, - &cmap->start, - 2 * sizeof(__u32))) - err = -EFAULT; - } - return err; + lock_fb_info(info); + cmap_from = info->cmap; + unlock_fb_info(info); + + return fb_cmap_to_user(&cmap_from, &cmap); } static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,