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=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 EE3F2C433E7 for ; Sun, 18 Oct 2020 19:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB3C6204FD for ; Sun, 18 Oct 2020 19:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049577; bh=KkQt/FvxAA+fdzfTN8UhQWHaftWivf3zZK6bppI139Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m7sZYeL+m9aGXEMFF5Omjs1j4sa7z6Ci0RsQBzJ7Cz0kvHVym3s9Kfgvop7EKrHOr cht7PcI+5NU6hS5/4kjI4906awWzrEPJ0SBFMms6Umt9VUM3LnTx+SQG3VNQI7Tu/8 GBCsZgmZ3lUxrMe/37uChrjLzYv9VClWnnM6+/HY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732590AbgJRTc4 (ORCPT ); Sun, 18 Oct 2020 15:32:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:42278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731881AbgJRT0x (ORCPT ); Sun, 18 Oct 2020 15:26:53 -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 70A2F222EC; Sun, 18 Oct 2020 19:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049213; bh=KkQt/FvxAA+fdzfTN8UhQWHaftWivf3zZK6bppI139Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFkVtx6SGdmxRm+wKnEzsdEIn+PvtrasmDMkDHerNM/Y1O3CLdBuk9j+BAaJLyx0p vBAwAixo1MOZiqbOviVTPVw/Mfn/vByDDYtj4q82zrwLPIhC6AVtfrvejMMfuava1F 9ynQBQfPFCcC/cNgZQuAiLCQxED47ULEi5I73DPE= 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.9 13/41] mmc: sdio: Check for CISTPL_VERS_1 buffer size Date: Sun, 18 Oct 2020 15:26:07 -0400 Message-Id: <20201018192635.4056198-13-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192635.4056198-1-sashal@kernel.org> References: <20201018192635.4056198-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 dcb3dee59fa5f..934c4816d78bf 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