From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2F4AC43464 for ; Fri, 18 Sep 2020 10:10:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5DC3B21D7B for ; Fri, 18 Sep 2020 10:10:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726587AbgIRKKB (ORCPT ); Fri, 18 Sep 2020 06:10:01 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:45339 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725882AbgIRKJ4 (ORCPT ); Fri, 18 Sep 2020 06:09:56 -0400 Received: from threadripper.lan ([149.172.98.151]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1M1q8m-1kLQG00GBU-002Jcp; Fri, 18 Sep 2020 12:09:44 +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 Subject: [PATCH 3/3] fbdev: sbuslib: remove compat_alloc_user_space usage Date: Fri, 18 Sep 2020 12:09:06 +0200 Message-Id: <20200918100926.1447563-3-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 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:HKl3xxYSvyhA+JIl+nlo9qpNjrLsxo9vURIHerUOHnl60TdZkan tzIABrGkg/YRq17ShVdHy9rPV3ryj1yGdazrJOt8995wSQs5asRLOTG1fOjR2FLcsmZNRR2 l06hFlOQJDBUmwZvw35WRKJXxxSA7BHxfImIE3u1cpI1T9V0YB3ttyb5TMB1usfqWb00KGk N3kjYIIgYEOuRSiFZ5gYA== X-UI-Out-Filterresults: notjunk:1;V03:K0:paCiFwAgXs8=:EbwH1eGpO9RWhDbDyytNh2 yn1XoEnWCW61xMIJ0lbRKDUNWXy92QmK3W/PHrIGiEPWPiH1GULjO6eIviQ3awN8YxFukEJIQ XmFifHTrTK0OK/0NPKK5UCTxV5xakXCVeHd711ebm9qG1GBZRDKQWfWXZ+xBs3Ofj42wspljs Xp/q+CaPMVOcE9ER8n+xEPf45XqWBg1iGaTOvxGQPfFR6iOtY7JO3oMBVmq243dtHuDqsyAKZ 0JQoJ+0NHOm1Vp69A64wvYfBMTkew1uxPjjzCIVCnbi9cqyGGFqFIqJ3wSo63o3EfzYdzxBTq 6I/tZWkxs2bpFZfovfXY8Ql4HVuQm+HScr9V4kZA1Vm1KYwnXp4pLOV27ayPkDPsQeBNaznyf sQj+oWTiokxigQmaLtGv94IN7tK2HSLWGhnY3ysjJ4yZturtxOXP/rxqTRxXffMyw8W4OzKLC hzIxBrbi/eqhwcs/R6X8AJ/JiNA3U+CoJ8ZmHKt7ZW3Xx7cQ5j+FnpqW/UY2hUYDcdpoOVQ0C exLx79JXuPlhbAflmawy3j8PGKqLaOqZOrY4UbRewtr0/ydUzwiOL3RJaBKIblHlmSFdQVxeo C9JhT9kwjZZ6jW30Ll1ibGgodEqoew/7HjZaKH2yC3v+pF+3CIXc4fB+eHQdPu+ZJM56pp5i/ 2wYFWo2UDTIo3OUoOdM1z4vPQwEExP2LnU0R1c2cHAq0IDVBmaRYiHjagcCwIMwO9N25K3iSP rJ2hpgvPHsJwDvjxVMAEWiyzgPsn9/uAWpaKyzKQm6MzPX519hh5ak7qYgFWp32wNEH626es+ cH/cHH8+Jh8D1yK1unlWz+sFtPQw7Ik8QWTuBJrx5u5i8/sTdlZgVJTQ8/OFE0kNRCwZtw7 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is one of the last users of compat_alloc_user_space() and copy_in_user(). The actual handler is implemented in the same file and could be shared, but as I couldn't test this properly I leave the native case alone and just make a straight copy of it for the compat case, with a minimum set of modifications. Signed-off-by: Arnd Bergmann --- drivers/video/fbdev/sbuslib.c | 95 ++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index f728db9bcff8..da28c279a54b 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -192,28 +192,6 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, EXPORT_SYMBOL(sbusfb_ioctl_helper); #ifdef CONFIG_COMPAT -static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long arg) -{ - struct fbcmap32 __user *argp = (void __user *)arg; - struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p)); - u32 addr; - int ret; - - ret = copy_in_user(p, argp, 2 * sizeof(int)); - ret |= get_user(addr, &argp->red); - ret |= put_user(compat_ptr(addr), &p->red); - ret |= get_user(addr, &argp->green); - ret |= put_user(compat_ptr(addr), &p->green); - ret |= get_user(addr, &argp->blue); - ret |= put_user(compat_ptr(addr), &p->blue); - if (ret) - return -EFAULT; - return info->fbops->fb_ioctl(info, - (cmd == FBIOPUTCMAP32) ? - FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC, - (unsigned long)p); -} - int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -230,9 +208,76 @@ int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar case FBIOGCURMAX: return info->fbops->fb_ioctl(info, cmd, arg); case FBIOPUTCMAP32: - return fbiogetputcmap(info, cmd, arg); - case FBIOGETCMAP32: - return fbiogetputcmap(info, cmd, arg); + case FBIOPUTCMAP_SPARC: { + struct fbcmap32 c; + struct fb_cmap cmap; + u16 red, green, blue; + u8 red8, green8, blue8; + unsigned char __user *ured; + unsigned char __user *ugreen; + unsigned char __user *ublue; + unsigned int i; + + if (copy_from_user(&c, compat_ptr(arg), sizeof(c))) + return -EFAULT; + ured = compat_ptr(c.red); + ugreen = compat_ptr(c.green); + ublue = compat_ptr(c.blue); + + cmap.len = 1; + cmap.red = &red; + cmap.green = &green; + cmap.blue = &blue; + cmap.transp = NULL; + for (i = 0; i < c.count; i++) { + int err; + + if (get_user(red8, &ured[i]) || + get_user(green8, &ugreen[i]) || + get_user(blue8, &ublue[i])) + return -EFAULT; + + red = red8 << 8; + green = green8 << 8; + blue = blue8 << 8; + + cmap.start = c.index + i; + err = fb_set_cmap(&cmap, info); + if (err) + return err; + } + return 0; + } + case FBIOGETCMAP32: { + struct fbcmap32 c; + unsigned char __user *ured; + unsigned char __user *ugreen; + unsigned char __user *ublue; + struct fb_cmap *cmap = &info->cmap; + unsigned int index, i; + u8 red, green, blue; + + if (copy_from_user(&c, compat_ptr(arg), sizeof(c))) + return -EFAULT; + index = c.index; + ured = compat_ptr(c.red); + ugreen = compat_ptr(c.green); + ublue = compat_ptr(c.blue); + + if (index > cmap->len || c.count > cmap->len - index) + return -EINVAL; + + for (i = 0; i < c.count; i++) { + red = cmap->red[index + i] >> 8; + green = cmap->green[index + i] >> 8; + blue = cmap->blue[index + i] >> 8; + if (put_user(red, &ured[i]) || + put_user(green, &ugreen[i]) || + put_user(blue, &ublue[i])) + return -EFAULT; + } + return 0; + } default: return -ENOIOCTLCMD; } -- 2.27.0