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=-13.1 required=3.0 tests=BAYES_00,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 8A44CC433E7 for ; Sun, 18 Oct 2020 19:30:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45C2020791 for ; Sun, 18 Oct 2020 19:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049418; bh=CO+FUODqhobCGWD5uWt+v0rTAV+RLiKHYwAG7UiGCoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S3mjFLEtJXcAkvVzorcZ4GU9xbseSdmw2uUcCZlPO4Gky+dH8Is/yqsTCETnocoZn sqZ1vKGrnBI0mXaiP/ZUHjLXcvLkf9BsRp933tXxEfs8UGR2j0RL/FN8zh9RKU4Iwi n5RlSAFeOUOQyHOI6jYfx3pWEqAisAvE/VgfiwV8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732475AbgJRTaR (ORCPT ); Sun, 18 Oct 2020 15:30:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:43656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728168AbgJRT1k (ORCPT ); Sun, 18 Oct 2020 15:27:40 -0400 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 A3F1422282; Sun, 18 Oct 2020 19:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049260; bh=CO+FUODqhobCGWD5uWt+v0rTAV+RLiKHYwAG7UiGCoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tD0NldliH5GnDjYlDmeZr2k5KGPZxZW6JH+ytzOJNCtlsau7z0k8uRLSqKWpybs1q qfRCcf2a53OthbW0rr1mAJalYeCDy2PhdwMP74djs5Zn6Kv1atEpb/BzqeH9B5g3DT jhixyb0RY5eU6kENg2VLXvWmA+nibt23CCNC7HnU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 09/33] mmc: sdio: Check for CISTPL_VERS_1 buffer size Date: Sun, 18 Oct 2020 15:27:04 -0400 Message-Id: <20201018192728.4056577-9-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192728.4056577-1-sashal@kernel.org> References: <20201018192728.4056577-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pali Rohár [ Upstream commit 8ebe2607965d3e2dc02029e8c7dd35fbe508ffd0 ] Before parsing CISTPL_VERS_1 structure check that its size is at least two bytes to prevent buffer overflow. Signed-off-by: Pali Rohár Link: https://lore.kernel.org/r/20200727133837.19086-2-pali@kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/sdio_cis.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c index 8e94e555b788d..8651bd30863d4 100644 --- a/drivers/mmc/core/sdio_cis.c +++ b/drivers/mmc/core/sdio_cis.c @@ -30,6 +30,9 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, unsigned i, nr_strings; char **buffer, *string; + if (size < 2) + return 0; + /* Find all null-terminated (including zero length) strings in the TPLLV1_INFO field. Trailing garbage is ignored. */ buf += 2; -- 2.25.1