From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Date: Wed, 13 Nov 2019 01:59:11 +0000 Subject: [PATCH AUTOSEL 4.9 47/68] fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() Message-Id: <20191113015932.12655-47-sashal@kernel.org> List-Id: References: <20191113015932.12655-1-sashal@kernel.org> In-Reply-To: <20191113015932.12655-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 e5017716adb8aa5c01c52386c1b7470101ffe9c5 ] The "index + count" addition can overflow. Both come directly from the user. This bug leads to an information leak. Signed-off-by: Dan Carpenter Cc: Peter Malone Cc: Philippe Ombredanne Cc: Mathieu Malaterre Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/sbuslib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index b425718925c01..52e161dbd2047 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -170,7 +170,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, get_user(ublue, &c->blue)) return -EFAULT; - if (index + count > cmap->len) + if (index > cmap->len || count > cmap->len - index) return -EINVAL; for (i = 0; i < count; i++) { -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 47/68] fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() Date: Tue, 12 Nov 2019 20:59:11 -0500 Message-ID: <20191113015932.12655-47-sashal@kernel.org> References: <20191113015932.12655-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 CE3DE6EC55 for ; Wed, 13 Nov 2019 02:00:56 +0000 (UTC) In-Reply-To: <20191113015932.12655-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 bSBjb21taXQgZTUwMTc3MTZhZGI4YWE1YzAxYzUyMzg2YzFiNzQ3MDEwMWZmZTljNSBdCgpUaGUg ImluZGV4ICsgY291bnQiIGFkZGl0aW9uIGNhbiBvdmVyZmxvdy4gIEJvdGggY29tZSBkaXJlY3Rs eSBmcm9tIHRoZQp1c2VyLiAgVGhpcyBidWcgbGVhZHMgdG8gYW4gaW5mb3JtYXRpb24gbGVhay4K ClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4K Q2M6IFBldGVyIE1hbG9uZSA8cGV0ZXIubWFsb25lQGdtYWlsLmNvbT4KQ2M6IFBoaWxpcHBlIE9t YnJlZGFubmUgPHBvbWJyZWRhbm5lQG5leGIuY29tPgpDYzogTWF0aGlldSBNYWxhdGVycmUgPG1h bGF0QGRlYmlhbi5vcmc+ClNpZ25lZC1vZmYtYnk6IEJhcnRsb21pZWogWm9sbmllcmtpZXdpY3og PGIuem9sbmllcmtpZUBzYW1zdW5nLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNh c2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvc2J1c2xpYi5jIHwgMiAr LQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9zYnVzbGliLmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2 L3NidXNsaWIuYwppbmRleCBiNDI1NzE4OTI1YzAxLi41MmUxNjFkYmQyMDQ3IDEwMDY0NAotLS0g YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NidXNsaWIuYworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2 L3NidXNsaWIuYwpAQCAtMTcwLDcgKzE3MCw3IEBAIGludCBzYnVzZmJfaW9jdGxfaGVscGVyKHVu c2lnbmVkIGxvbmcgY21kLCB1bnNpZ25lZCBsb25nIGFyZywKIAkJICAgIGdldF91c2VyKHVibHVl LCAmYy0+Ymx1ZSkpCiAJCQlyZXR1cm4gLUVGQVVMVDsKIAotCQlpZiAoaW5kZXggKyBjb3VudCA+ IGNtYXAtPmxlbikKKwkJaWYgKGluZGV4ID4gY21hcC0+bGVuIHx8IGNvdW50ID4gY21hcC0+bGVu IC0gaW5kZXgpCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAogCQlmb3IgKGkgPSAwOyBpIDwgY291bnQ7 IGkrKykgewotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWw= 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=unavailable 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 3F3E3C43331 for ; Wed, 13 Nov 2019 02:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0806121783 for ; Wed, 13 Nov 2019 02:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610799; bh=NGvcGUUb/zX84EsKjg1TLdH6Al2JKVLtjEr2dAXuSVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xt4Y231qrsJCcGqDyMdarZX6P0MxZ2pRQ6XriSiQ0VTbIX1SPX/bNM+Z0yJ302kmv F8StWTH0IXDIMKW0/+azoxNZTGx8SsD2dZG68NCL2eYDX1La19gBcF6UvERP+fbCNY a5skovnQefq+y2sa/CcwwtKWwHvu9698xWnj6IqM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730649AbfKMCBK (ORCPT ); Tue, 12 Nov 2019 21:01:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:56484 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730561AbfKMCA5 (ORCPT ); Tue, 12 Nov 2019 21:00:57 -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 ADB5C2245A; Wed, 13 Nov 2019 02:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610456; bh=NGvcGUUb/zX84EsKjg1TLdH6Al2JKVLtjEr2dAXuSVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rlsdT7miM+cvAPPxBJtkyoPXIplfKXQHBGaB/nlwidLdTG/sIZVI2PM+edRdOcWjn BCWo/ng4MHEv0ALnDp0xiP8LqVH3VJWWLNue8XGBMaMLE2dhbOwEkIKbHWD/XhcAkC fEI7PpyvejrPBo2Q4VK41d45kRcRidTl0tDzKV98= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Peter Malone , Philippe Ombredanne , Mathieu Malaterre , Bartlomiej Zolnierkiewicz , Sasha Levin , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 47/68] fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() Date: Tue, 12 Nov 2019 20:59:11 -0500 Message-Id: <20191113015932.12655-47-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015932.12655-1-sashal@kernel.org> References: <20191113015932.12655-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 e5017716adb8aa5c01c52386c1b7470101ffe9c5 ] The "index + count" addition can overflow. Both come directly from the user. This bug leads to an information leak. Signed-off-by: Dan Carpenter Cc: Peter Malone Cc: Philippe Ombredanne Cc: Mathieu Malaterre Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/sbuslib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index b425718925c01..52e161dbd2047 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -170,7 +170,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, get_user(ublue, &c->blue)) return -EFAULT; - if (index + count > cmap->len) + if (index > cmap->len || count > cmap->len - index) return -EINVAL; for (i = 0; i < count; i++) { -- 2.20.1