Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp3219165pxb; Mon, 18 Apr 2022 19:35:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmlBezkm7Q0d1DQR0GG6CheFJUjejPZOZD1XvcLgaN3y1SWKhQVyEXGIlnzdrzlBbX1HCS X-Received: by 2002:a17:902:e841:b0:158:f139:29df with SMTP id t1-20020a170902e84100b00158f13929dfmr11757750plg.82.1650335738537; Mon, 18 Apr 2022 19:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650335738; cv=none; d=google.com; s=arc-20160816; b=EASkk05IjjCtA0MSHG1MoBd/89aQ0n8gI3rsS4znyCuAyoeJC5w7jQAIsagoQRj2kR zzjK9Klj1HU5dETY/ZqU2AfpHMYjkQEBbuKXEDXoxnIbitzwNxA2d0+h0mqVFNNeUVy4 25ZIYsdMugcwRvkY9xSzQZYjUPyAXabx2YBmMvrzGHcpnk0DvaUD0JUsYf6ZSudBqptV LKpUMYk+Q2PwpmxzRZwADLdmELMjzj42CNwglYjEir4OEQXaR5LZlNIcJYQ4TYlmr+xu uvQ6i7BCZPNM03Cdh031sSBwyMgWCtD0jKGQi6IuC/MJrtLldn7OTdX/S1BQf6OagPtk Uh0g== 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=RA7azsGUrLCu9jeXlhkXZ649PM99Gn74z6bWA4+/cOM=; b=igTyTaHlr5Rznjn66IrZmUKrJZMKzO0uEeyksiYPagel8TrAyA7zWkhu9dVIkb48wb N1oExtyyrtEPqFmwcr94wnAgT1PcJ6mhLLYo0nTuFcGXfBjBZ8NduvSreHQnbf7RN1si Ryin/TvY75oNDBA7798kLMiG1Dnv8oCNZM1NHPPesv7V5xHNnQmWUzvV7T/dqxvABprh /+YwWejmIKdsMcnNaXbe9EBl6lHE7E1KmFVXyb9ffvj4Hi2beSuHjlREmpkbkq1fdJX4 5nu0/QBnQSqFbbGJ9JcWcpQL6AZpsXM0Yx4nGVELBU/xAjR6yFq0/iMBJVnOly8brxrE dQHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P2iUn7FN; 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 s23-20020a634517000000b003a9ee7f8df4si5193080pga.759.2022.04.18.19.35.22; Mon, 18 Apr 2022 19:35:38 -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=P2iUn7FN; 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 S1344637AbiDRO2E (ORCPT + 99 others); Mon, 18 Apr 2022 10:28:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244239AbiDROQs (ORCPT ); Mon, 18 Apr 2022 10:16:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B2F53983D; Mon, 18 Apr 2022 06:13:13 -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 ams.source.kernel.org (Postfix) with ESMTPS id 6DBDAB80EC4; Mon, 18 Apr 2022 13:13:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA2E9C385A1; Mon, 18 Apr 2022 13:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650287584; bh=rwfGwynTzrNOMEMCE4EK8HwQ70T5W23kbo9jj5fBnoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2iUn7FNY8NGGvV3zSfDEWvbJu9esC1Bd0iltZALT9kFHcqmriWMoxMzC2qAvB+2n 1JaAVLLN89dnG/SzNDgZC6Lc4yuDZp/Okts/BmNY0rTWXI1UDcRTvqHe1O9DokoVD5 +OMYmwjxL7RLod0Skn/fY3eJdm415s/tKVzj0D5E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harshit Mogalapalli , Ronnie Sahlberg , Steve French , Sasha Levin Subject: [PATCH 4.9 205/218] cifs: potential buffer overflow in handling symlinks Date: Mon, 18 Apr 2022 14:14:31 +0200 Message-Id: <20220418121207.810235827@linuxfoundation.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220418121158.636999985@linuxfoundation.org> References: <20220418121158.636999985@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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,T_SCC_BODY_TEXT_LINE 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: Harshit Mogalapalli [ Upstream commit 64c4a37ac04eeb43c42d272f6e6c8c12bfcf4304 ] Smatch printed a warning: arch/x86/crypto/poly1305_glue.c:198 poly1305_update_arch() error: __memcpy() 'dctx->buf' too small (16 vs u32max) It's caused because Smatch marks 'link_len' as untrusted since it comes from sscanf(). Add a check to ensure that 'link_len' is not larger than the size of the 'link_str' buffer. Fixes: c69c1b6eaea1 ("cifs: implement CIFSParseMFSymlink()") Signed-off-by: Harshit Mogalapalli Reviewed-by: Ronnie Sahlberg Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/link.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 38d26cbcad07..0c49e2aa7ea4 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c @@ -119,6 +119,9 @@ parse_mf_symlink(const u8 *buf, unsigned int buf_len, unsigned int *_link_len, if (rc != 1) return -EINVAL; + if (link_len > CIFS_MF_SYMLINK_LINK_MAXLEN) + return -EINVAL; + rc = symlink_hash(link_len, link_str, md5_hash); if (rc) { cifs_dbg(FYI, "%s: MD5 hash failure: %d\n", __func__, rc); -- 2.35.1