From patchwork Tue May 23 12:48:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 97989 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2129791vqo; Tue, 23 May 2023 06:10:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BRju0kZAxRyz9mTx/7wMV4CTs+vwR2YnrKTygTMuoSeG6exhLsC9/aFOqybZC528KGKTF X-Received: by 2002:a05:6a20:6f07:b0:109:c477:540 with SMTP id gt7-20020a056a206f0700b00109c4770540mr12559287pzb.45.1684847426860; Tue, 23 May 2023 06:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684847426; cv=none; d=google.com; s=arc-20160816; b=MX+s6kSEWxLIg07mFTraLWFnG/HskIUZcvsHhDJraD0IYDNrbhhamMmNSGw0KeMRIO DCs6vfI9qZbZoJfWRKkZ2pCqQLMdLed22V1VBh+c3nmV6QCVgKfijr7U5L1jThxNcGt8 o8LIdRzv70AW938wZwl8cm0dbpNiO4v/3vC0Qyj39w9bzHWRi+qIka1dZKIRJwHf0fIS 8skeQGCiU5RiLtQBCfmuNKc4+ft02bur0Fxlj8YTUCYSCmb1P/Xo3nRd0CXtvUDmCOaE igdGt081iF1Vs27UVhHpOMdZJEIldf6d+VEShwXqkE9l3iXjw8/Rb/uONDZYQhdmIPPu wbTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:content-transfer-encoding :content-id:mime-version:subject:cc:to:from:organization :dkim-signature; bh=hz+rQBDAcdUtSJzBU0XZBYw1XZqw4mtBlUpMTPXSzN4=; b=wfM1OsDaIl0HLddkydfaTHjKiz3EY3llvtZM/ui4ARolag9FJ5AgobRflZ6L4PDcYZ sHZYGAnANG54Nr0TqF+JBIP+OYxIBZUhPo+dXWKp8WKsM23/LFMPcQ27EfT3XcxQPGTR KCmJ6c2upvMzmflEyTlnBXD6ucdk2rtSVO9ItprlX1CF+wCVvjhDAGGkRcUJJyUJjO3s FCDDxoAkYgabNCX2/a60tMCk+G5unBzohN4AhzgWOpiFtlgih7joNkN/HcKOoGXOFuPg j5bbdPW+QurXYbvQc7kdHLTofxv+fgx9qxcLzw03SYm2XOS/FOH1xphjB/EWk4Ntjocp ryPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Trh/pZ9G"; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bu26-20020a63295a000000b0051b59786e6csi820328pgb.300.2023.05.23.06.10.13; Tue, 23 May 2023 06:10:26 -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=@redhat.com header.s=mimecast20190719 header.b="Trh/pZ9G"; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236760AbjEWMtm (ORCPT + 99 others); Tue, 23 May 2023 08:49:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbjEWMtk (ORCPT ); Tue, 23 May 2023 08:49:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 731C1133 for ; Tue, 23 May 2023 05:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684846129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hz+rQBDAcdUtSJzBU0XZBYw1XZqw4mtBlUpMTPXSzN4=; b=Trh/pZ9GaKa5PKi+JyvofVF1+Zgym3EN2PxjuTm6X4d59KRkU19ICBAnpt2tYpfPughZ0/ e+GU58dO8YxCQ6QSpHByV2Sw4zgYPBOcEsnpu0msDfTKES2y7RxB1STrwMjmFVaZ2JCWdB nA5EnqE9C5/CGsJHb9H3kUA11GoY340= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-36-2A2PiPSiNQaORPT8h7GuJQ-1; Tue, 23 May 2023 08:48:44 -0400 X-MC-Unique: 2A2PiPSiNQaORPT8h7GuJQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 35CF2811E93; Tue, 23 May 2023 12:48:43 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id C540A40CFD46; Tue, 23 May 2023 12:48:41 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells To: Shyam Prasad N cc: dhowells@redhat.com, Steve French , Rohith Surabattula , Paulo Alcantara , Tom Talpey , Jeff Layton , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size MIME-Version: 1.0 Content-ID: <2989164.1684846121.1@warthog.procyon.org.uk> Date: Tue, 23 May 2023 13:48:41 +0100 Message-ID: <2989165.1684846121@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766690575473712377?= X-GMAIL-MSGID: =?utf-8?q?1766690575473712377?= Fix cifs_limit_bvec_subset() so that it limits the span to the maximum specified and won't return with a size greater than max_size. Fixes: d08089f649a0 ("cifs: Change the I/O paths to use an iterator rather than a page list") Reported-by: Shyam Prasad N Signed-off-by: David Howells cc: Steve French cc: Rohith Surabattula cc: Paulo Alcantara cc: Tom Talpey cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org --- fs/cifs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ba7f2e09d6c8..df88b8c04d03 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3353,9 +3353,10 @@ static size_t cifs_limit_bvec_subset(const struct iov_iter *iter, size_t max_siz while (n && ix < nbv) { len = min3(n, bvecs[ix].bv_len - skip, max_size); span += len; + max_size -= len; nsegs++; ix++; - if (span >= max_size || nsegs >= max_segs) + if (max_size == 0 || nsegs >= max_segs) break; skip = 0; n -= len;