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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 46C1EC55179 for ; Tue, 27 Oct 2020 14:08:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1B3D21D7B for ; Tue, 27 Oct 2020 14:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807685; bh=KkQt/FvxAA+fdzfTN8UhQWHaftWivf3zZK6bppI139Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cWj3m+Bn7XtQhX0rfLpQJHMK8GeUOluoirKpmKIg1Y1J5J8Vf49TLIgOIG2OukV9z vyM0G29kVEFAHl9X1eyOUr1sql7afdtm0OuXpt7cpptiDwg053EPtSWexioErlkZDi FwJkTBfNY5dRZARjXZuX/Q7nQp1CRYlRNApJ0HSQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755017AbgJ0OID (ORCPT ); Tue, 27 Oct 2020 10:08:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:56696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754946AbgJ0OHq (ORCPT ); Tue, 27 Oct 2020 10:07:46 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EE3B620757; Tue, 27 Oct 2020 14:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603807666; bh=KkQt/FvxAA+fdzfTN8UhQWHaftWivf3zZK6bppI139Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IX7MqYst+m1OGZ5xENwgQCb3zQXvbVsTE6FvmcR/o6EM5uHn5g+Qi2rGT80fX0sy4 ofdGQSttip5/qLslxH4rcQu6wz4cN55hCebF94v0NsUTDI730m/ILbmAIKxoZeYz7r snKWOCqZAr27clVkKuOcqg+PBU53dA8aOif09txI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= , Ulf Hansson , Sasha Levin Subject: [PATCH 4.9 106/139] mmc: sdio: Check for CISTPL_VERS_1 buffer size Date: Tue, 27 Oct 2020 14:50:00 +0100 Message-Id: <20201027134907.165862669@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027134902.130312227@linuxfoundation.org> References: <20201027134902.130312227@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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