Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp6979364rwi; Mon, 24 Oct 2022 08:22:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4JT3aBxKGJzK0lpPjZGOaH8QU5j2ZDTbJCH0w3RvYJgLLOe3gN5RiWL4ZQztGwhbd+QFvg X-Received: by 2002:a17:902:a502:b0:186:aed2:f69d with SMTP id s2-20020a170902a50200b00186aed2f69dmr4356963plq.46.1666624920593; Mon, 24 Oct 2022 08:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666624920; cv=none; d=google.com; s=arc-20160816; b=cSeh61LkZUNvgMVQoesbCOLir3N/1Djirctf9GHqb+O/1Ab6VZsBf/zU6YL9oBjvUy 8uXOvtIk/EhNU0bD+Uel40n/4Q2pHhw6SW+fW1A1WcnFzs1iwCPFAtG7uubIN7/AqfNu U8mVI2JKCU1efIqhPZ43Jh2vBzlahMG9TGZEcz3BhRBYsXWiT9gAEYnLzIHLRPAFWTI5 NR0xcVcMAVFMfLOhJJeMmygNd0uj5ScKFX3M6frI4r36hbNTQKfd96nfLZjr4skoN7SR 0tTkCseq4BqxnlgAsyOIL4J9iJg2WTAsAAMMFF6NSXOTednRupRlxiJXU75UQKQLCj31 oUzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vvI3+VWA+2mcXN4KXlGusSzPv4NyoHHcIk3s6pIfUvg=; b=h/M0OJYKXgnrl/6zZtAdkKcMsooLVXxWiQ9WOV24P16T/rU37tmMJqmiM52BMhtYV9 Frms6f3K8eUsJVWkiTf3qUDgQzdPeAvfKr5hIljdQTEOiamsmDaHqvaVSAEK0FZHro4S 1KY1UvCdsOevl2MgJqHqn1Feqc/gjPFpshGkSkyTteyvUHXSSSCColOnEOfXvGGsTM8W KCD6dGFqlEID2K2Q/um6/2FVWn959/hJ9r2DGWfFsH1wCJbc+Cfs+zsFrMb6V9/0qFzA gS9AncyduLPQF7p06HP85cGarUSf5mT+oAxE2culN11PU/q/2MAU1CCI1MqcGhXbQcrB y/yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TqOj6uVl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q2-20020a170902788200b0017840d9d579si29004006pll.67.2022.10.24.08.21.47; Mon, 24 Oct 2022 08:22:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TqOj6uVl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236656AbiJXNwn (ORCPT + 99 others); Mon, 24 Oct 2022 09:52:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236240AbiJXNwC (ORCPT ); Mon, 24 Oct 2022 09:52:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A6B8BA25B; Mon, 24 Oct 2022 05:42:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E21E86134C; Mon, 24 Oct 2022 12:42:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03D0EC433C1; Mon, 24 Oct 2022 12:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615353; bh=FGLUiA+nI5EoWurmpv9dwxt2Cwd9+rHSJ5m5kYCZDGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TqOj6uVlOhjedZDU+3/PyxL8jOsVre5M6mDT12ytRvR7Fvuu9v6GvaYIQhQQ2H4Yi TG0w9hy6OVHmr+IXz3mTyUdHfhwobGTLt0jBO9pL5UFnGfZEk1/91FmqvCS04ybzyt 123ifmZqr03bB3++3ho7mVo86ucPiAMDscg/TiOI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Guenter Roeck , Tzung-Bi Shih , Sasha Levin Subject: [PATCH 5.15 218/530] platform/chrome: fix memory corruption in ioctl Date: Mon, 24 Oct 2022 13:29:22 +0200 Message-Id: <20221024113054.965538493@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 8a07b45fd3c2dda24fad43639be5335a4595196a ] If "s_mem.bytes" is larger than the buffer size it leads to memory corruption. Fixes: eda2e30c6684 ("mfd / platform: cros_ec: Miscellaneous character device to talk with the EC") Signed-off-by: Dan Carpenter Reviewed-by: Guenter Roeck Signed-off-by: Tzung-Bi Shih Link: https://lore.kernel.org/r/Yv8dpCFZJdbUT5ye@kili Signed-off-by: Sasha Levin --- drivers/platform/chrome/cros_ec_chardev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c index fd33de546aee..0de7c255254e 100644 --- a/drivers/platform/chrome/cros_ec_chardev.c +++ b/drivers/platform/chrome/cros_ec_chardev.c @@ -327,6 +327,9 @@ static long cros_ec_chardev_ioctl_readmem(struct cros_ec_dev *ec, if (copy_from_user(&s_mem, arg, sizeof(s_mem))) return -EFAULT; + if (s_mem.bytes > sizeof(s_mem.buffer)) + return -EINVAL; + num = ec_dev->cmd_readmem(ec_dev, s_mem.offset, s_mem.bytes, s_mem.buffer); if (num <= 0) -- 2.35.1