From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Date: Wed, 13 Nov 2019 02:01:15 +0000 Subject: [PATCH AUTOSEL 4.4 32/48] fbdev: sbuslib: use checked version of put_user() Message-Id: <20191113020131.13356-32-sashal@kernel.org> List-Id: References: <20191113020131.13356-1-sashal@kernel.org> In-Reply-To: <20191113020131.13356-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Mathieu Malaterre , dri-devel@lists.freedesktop.org, Philippe Ombredanne , Dan Carpenter , Peter Malone From: Dan Carpenter [ Upstream commit d8bad911e5e55e228d59c0606ff7e6b8131ca7bf ] I'm not sure why the code assumes that only the first put_user() needs an access_ok() check. I have made all the put_user() and get_user() calls checked. Signed-off-by: Dan Carpenter Cc: Philippe Ombredanne Cc: Mathieu Malaterre Cc: Peter Malone , Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/sbuslib.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index 31c301d6be621..b425718925c01 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -105,11 +105,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, struct fbtype __user *f = (struct fbtype __user *) arg; if (put_user(type, &f->fb_type) || - __put_user(info->var.yres, &f->fb_height) || - __put_user(info->var.xres, &f->fb_width) || - __put_user(fb_depth, &f->fb_depth) || - __put_user(0, &f->fb_cmsize) || - __put_user(fb_size, &f->fb_cmsize)) + put_user(info->var.yres, &f->fb_height) || + put_user(info->var.xres, &f->fb_width) || + put_user(fb_depth, &f->fb_depth) || + put_user(0, &f->fb_cmsize) || + put_user(fb_size, &f->fb_cmsize)) return -EFAULT; return 0; } @@ -124,10 +124,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, unsigned int index, count, i; if (get_user(index, &c->index) || - __get_user(count, &c->count) || - __get_user(ured, &c->red) || - __get_user(ugreen, &c->green) || - __get_user(ublue, &c->blue)) + get_user(count, &c->count) || + get_user(ured, &c->red) || + get_user(ugreen, &c->green) || + get_user(ublue, &c->blue)) return -EFAULT; cmap.len = 1; @@ -164,10 +164,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, u8 red, green, blue; if (get_user(index, &c->index) || - __get_user(count, &c->count) || - __get_user(ured, &c->red) || - __get_user(ugreen, &c->green) || - __get_user(ublue, &c->blue)) + get_user(count, &c->count) || + get_user(ured, &c->red) || + get_user(ugreen, &c->green) || + get_user(ublue, &c->blue)) return -EFAULT; if (index + count > cmap->len) -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.4 32/48] fbdev: sbuslib: use checked version of put_user() Date: Tue, 12 Nov 2019 21:01:15 -0500 Message-ID: <20191113020131.13356-32-sashal@kernel.org> References: <20191113020131.13356-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE6288941D for ; Wed, 13 Nov 2019 02:02:25 +0000 (UTC) In-Reply-To: <20191113020131.13356-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Mathieu Malaterre , dri-devel@lists.freedesktop.org, Philippe Ombredanne , Dan Carpenter , Peter Malone List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKWyBVcHN0cmVh bSBjb21taXQgZDhiYWQ5MTFlNWU1NWUyMjhkNTljMDYwNmZmN2U2YjgxMzFjYTdiZiBdCgpJJ20g bm90IHN1cmUgd2h5IHRoZSBjb2RlIGFzc3VtZXMgdGhhdCBvbmx5IHRoZSBmaXJzdCBwdXRfdXNl cigpIG5lZWRzCmFuIGFjY2Vzc19vaygpIGNoZWNrLiAgSSBoYXZlIG1hZGUgYWxsIHRoZSBwdXRf dXNlcigpIGFuZCBnZXRfdXNlcigpCmNhbGxzIGNoZWNrZWQuCgpTaWduZWQtb2ZmLWJ5OiBEYW4g Q2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+CkNjOiBQaGlsaXBwZSBPbWJyZWRh bm5lIDxwb21icmVkYW5uZUBuZXhiLmNvbT4KQ2M6IE1hdGhpZXUgTWFsYXRlcnJlIDxtYWxhdEBk ZWJpYW4ub3JnPgpDYzogUGV0ZXIgTWFsb25lIDxwZXRlci5tYWxvbmVAZ21haWwuY29tPiwKU2ln bmVkLW9mZi1ieTogQmFydGxvbWllaiBab2xuaWVya2lld2ljeiA8Yi56b2xuaWVya2llQHNhbXN1 bmcuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0t LQogZHJpdmVycy92aWRlby9mYmRldi9zYnVzbGliLmMgfCAyNiArKysrKysrKysrKysrLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvc2J1c2xpYi5jIGIvZHJpdmVycy92 aWRlby9mYmRldi9zYnVzbGliLmMKaW5kZXggMzFjMzAxZDZiZTYyMS4uYjQyNTcxODkyNWMwMSAx MDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9zYnVzbGliLmMKKysrIGIvZHJpdmVycy92 aWRlby9mYmRldi9zYnVzbGliLmMKQEAgLTEwNSwxMSArMTA1LDExIEBAIGludCBzYnVzZmJfaW9j dGxfaGVscGVyKHVuc2lnbmVkIGxvbmcgY21kLCB1bnNpZ25lZCBsb25nIGFyZywKIAkJc3RydWN0 IGZidHlwZSBfX3VzZXIgKmYgPSAoc3RydWN0IGZidHlwZSBfX3VzZXIgKikgYXJnOwogCiAJCWlm IChwdXRfdXNlcih0eXBlLCAmZi0+ZmJfdHlwZSkgfHwKLQkJICAgIF9fcHV0X3VzZXIoaW5mby0+ dmFyLnlyZXMsICZmLT5mYl9oZWlnaHQpIHx8Ci0JCSAgICBfX3B1dF91c2VyKGluZm8tPnZhci54 cmVzLCAmZi0+ZmJfd2lkdGgpIHx8Ci0JCSAgICBfX3B1dF91c2VyKGZiX2RlcHRoLCAmZi0+ZmJf ZGVwdGgpIHx8Ci0JCSAgICBfX3B1dF91c2VyKDAsICZmLT5mYl9jbXNpemUpIHx8Ci0JCSAgICBf X3B1dF91c2VyKGZiX3NpemUsICZmLT5mYl9jbXNpemUpKQorCQkgICAgcHV0X3VzZXIoaW5mby0+ dmFyLnlyZXMsICZmLT5mYl9oZWlnaHQpIHx8CisJCSAgICBwdXRfdXNlcihpbmZvLT52YXIueHJl cywgJmYtPmZiX3dpZHRoKSB8fAorCQkgICAgcHV0X3VzZXIoZmJfZGVwdGgsICZmLT5mYl9kZXB0 aCkgfHwKKwkJICAgIHB1dF91c2VyKDAsICZmLT5mYl9jbXNpemUpIHx8CisJCSAgICBwdXRfdXNl cihmYl9zaXplLCAmZi0+ZmJfY21zaXplKSkKIAkJCXJldHVybiAtRUZBVUxUOwogCQlyZXR1cm4g MDsKIAl9CkBAIC0xMjQsMTAgKzEyNCwxMCBAQCBpbnQgc2J1c2ZiX2lvY3RsX2hlbHBlcih1bnNp Z25lZCBsb25nIGNtZCwgdW5zaWduZWQgbG9uZyBhcmcsCiAJCXVuc2lnbmVkIGludCBpbmRleCwg Y291bnQsIGk7CiAKIAkJaWYgKGdldF91c2VyKGluZGV4LCAmYy0+aW5kZXgpIHx8Ci0JCSAgICBf X2dldF91c2VyKGNvdW50LCAmYy0+Y291bnQpIHx8Ci0JCSAgICBfX2dldF91c2VyKHVyZWQsICZj LT5yZWQpIHx8Ci0JCSAgICBfX2dldF91c2VyKHVncmVlbiwgJmMtPmdyZWVuKSB8fAotCQkgICAg X19nZXRfdXNlcih1Ymx1ZSwgJmMtPmJsdWUpKQorCQkgICAgZ2V0X3VzZXIoY291bnQsICZjLT5j b3VudCkgfHwKKwkJICAgIGdldF91c2VyKHVyZWQsICZjLT5yZWQpIHx8CisJCSAgICBnZXRfdXNl cih1Z3JlZW4sICZjLT5ncmVlbikgfHwKKwkJICAgIGdldF91c2VyKHVibHVlLCAmYy0+Ymx1ZSkp CiAJCQlyZXR1cm4gLUVGQVVMVDsKIAogCQljbWFwLmxlbiA9IDE7CkBAIC0xNjQsMTAgKzE2NCwx MCBAQCBpbnQgc2J1c2ZiX2lvY3RsX2hlbHBlcih1bnNpZ25lZCBsb25nIGNtZCwgdW5zaWduZWQg bG9uZyBhcmcsCiAJCXU4IHJlZCwgZ3JlZW4sIGJsdWU7CiAKIAkJaWYgKGdldF91c2VyKGluZGV4 LCAmYy0+aW5kZXgpIHx8Ci0JCSAgICBfX2dldF91c2VyKGNvdW50LCAmYy0+Y291bnQpIHx8Ci0J CSAgICBfX2dldF91c2VyKHVyZWQsICZjLT5yZWQpIHx8Ci0JCSAgICBfX2dldF91c2VyKHVncmVl biwgJmMtPmdyZWVuKSB8fAotCQkgICAgX19nZXRfdXNlcih1Ymx1ZSwgJmMtPmJsdWUpKQorCQkg ICAgZ2V0X3VzZXIoY291bnQsICZjLT5jb3VudCkgfHwKKwkJICAgIGdldF91c2VyKHVyZWQsICZj LT5yZWQpIHx8CisJCSAgICBnZXRfdXNlcih1Z3JlZW4sICZjLT5ncmVlbikgfHwKKwkJICAgIGdl dF91c2VyKHVibHVlLCAmYy0+Ymx1ZSkpCiAJCQlyZXR1cm4gLUVGQVVMVDsKIAogCQlpZiAoaW5k ZXggKyBjb3VudCA+IGNtYXAtPmxlbikKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 B8F65C43331 for ; Wed, 13 Nov 2019 02:02:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90043222CA for ; Wed, 13 Nov 2019 02:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610553; bh=sRrLkyUGgCKpwty94eVo3szlNVzGQWCr0iIWSeGW3dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P699fsGYh41UKG0dZSVLTy3FhXb99ub5Dbn3/0ZaRG71en+AHKZiFNzYaTXpKn6ew E3XYz7/Vy5TRLnF0gaR1hblxuGvy2nqErQUVLiPU6WJC9AQgpbjE6/9F+VaIuHK5jR MVSmyeKUBBxNgkwJEW3LDwuUyB97gptoW7plq9h8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731034AbfKMCCb (ORCPT ); Tue, 12 Nov 2019 21:02:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:58934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731019AbfKMCC0 (ORCPT ); Tue, 12 Nov 2019 21:02:26 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BCC50204EC; Wed, 13 Nov 2019 02:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610545; bh=sRrLkyUGgCKpwty94eVo3szlNVzGQWCr0iIWSeGW3dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vt5Vy3ufTvimNav0XOMmJEvNA3X5/eAtEAH4BB3yaoxTL5F+F+SGrsK3l+chWCcPK 61j6CR12prTjfwpbS2+6C0IS9YtIo2+4Y4R3Wt51+6QySHKdQ7PbnTw+1SIdssBp4h Lci3SJoRpEbtpUqmh/mk1VqVsXscNSEYFgQK1arA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Philippe Ombredanne , Mathieu Malaterre , Peter Malone , Bartlomiej Zolnierkiewicz , Sasha Levin , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 32/48] fbdev: sbuslib: use checked version of put_user() Date: Tue, 12 Nov 2019 21:01:15 -0500 Message-Id: <20191113020131.13356-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113020131.13356-1-sashal@kernel.org> References: <20191113020131.13356-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit d8bad911e5e55e228d59c0606ff7e6b8131ca7bf ] I'm not sure why the code assumes that only the first put_user() needs an access_ok() check. I have made all the put_user() and get_user() calls checked. Signed-off-by: Dan Carpenter Cc: Philippe Ombredanne Cc: Mathieu Malaterre Cc: Peter Malone , Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/sbuslib.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index 31c301d6be621..b425718925c01 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -105,11 +105,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, struct fbtype __user *f = (struct fbtype __user *) arg; if (put_user(type, &f->fb_type) || - __put_user(info->var.yres, &f->fb_height) || - __put_user(info->var.xres, &f->fb_width) || - __put_user(fb_depth, &f->fb_depth) || - __put_user(0, &f->fb_cmsize) || - __put_user(fb_size, &f->fb_cmsize)) + put_user(info->var.yres, &f->fb_height) || + put_user(info->var.xres, &f->fb_width) || + put_user(fb_depth, &f->fb_depth) || + put_user(0, &f->fb_cmsize) || + put_user(fb_size, &f->fb_cmsize)) return -EFAULT; return 0; } @@ -124,10 +124,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, unsigned int index, count, i; if (get_user(index, &c->index) || - __get_user(count, &c->count) || - __get_user(ured, &c->red) || - __get_user(ugreen, &c->green) || - __get_user(ublue, &c->blue)) + get_user(count, &c->count) || + get_user(ured, &c->red) || + get_user(ugreen, &c->green) || + get_user(ublue, &c->blue)) return -EFAULT; cmap.len = 1; @@ -164,10 +164,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, u8 red, green, blue; if (get_user(index, &c->index) || - __get_user(count, &c->count) || - __get_user(ured, &c->red) || - __get_user(ugreen, &c->green) || - __get_user(ublue, &c->blue)) + get_user(count, &c->count) || + get_user(ured, &c->red) || + get_user(ugreen, &c->green) || + get_user(ublue, &c->blue)) return -EFAULT; if (index + count > cmap->len) -- 2.20.1