Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp4614660rwd; Tue, 23 May 2023 09:57:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5TTmJY6DBZZC2Xo1XYqNch9u+PGPhi9cxJjxHa4sM9mTTzzjJc1qeDwOeDbRJHyBh2/55m X-Received: by 2002:a05:6a00:1741:b0:64d:42f6:4c7b with SMTP id j1-20020a056a00174100b0064d42f64c7bmr16289353pfc.27.1684861034660; Tue, 23 May 2023 09:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684861034; cv=none; d=google.com; s=arc-20160816; b=WZnbst+DTqeJpYyA01iAJTsx59rIagpDvceO0VxFPsXiodoMArsPC3ooDc00/hm6wW 5NcZ6IGxC3xrDt3JMUZQ41tVRn4c9y201MpxUMloH8MIWebwMBgrBurmWQNsTNrjbNhF 2TGJYx+yJYXni/elR6RxO1UndpoPYH/S7BA/l7/afOL5ycAUJr6qw3mo+tfMJDk+PvdT WYqicqwZcsqMtoCcQEmpOoRVHtt6hT5YqrEHEjQ8ENat9zuWm6jkPrxNiCn80C06sjaN kE+TToOC7oP6A52b8FOeGrHi5cISl/Ih/MPMng6X+oW+rTTMVs1DzFZ1jawMiSdTczDU T8mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=rGIwkL0PP8YODaMN3n8QoDck+WHcXF208Kv/zXnG360=; b=hCZ2qn18HkDKfYTSPY2bXupkAelrd7qaxuYPQN+0wp7Zud78XQJ+vTBwzIjcLOAq8a wyYkxEs597J3ZBEvaVPfrh766uqxZn4ZpAxRZOvZk/R3IKmehryRi243jr6COOrnFxFO WrN27BOnJ5nu1Ow2AtBYA16ppXJ1AXkqXiVss7+f+TTLftmS6oSSChUx5ymaQGJKPa1H zncVKt69yKSk39nWLHJx2F9+QXpQeuYEOp8smXgXu1oy1Ws/AneMcmARzzt4d+utiYdD 8uEN6bZR+q2cTn0naPl7Z+e5e+sRkb6jdkcwvgSHS3BaSFesGUvwd/CEStHRq4so3LgC ZMeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=JkG507Os; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e28-20020aa798dc000000b0063b5e220edasi6757083pfm.400.2023.05.23.09.57.00; Tue, 23 May 2023 09:57:14 -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=@gmail.com header.s=20221208 header.b=JkG507Os; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237109AbjEWQbM (ORCPT + 99 others); Tue, 23 May 2023 12:31:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231152AbjEWQbL (ORCPT ); Tue, 23 May 2023 12:31:11 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B1AAE0; Tue, 23 May 2023 09:31:09 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f3b9e54338so105520e87.0; Tue, 23 May 2023 09:31:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684859467; x=1687451467; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=rGIwkL0PP8YODaMN3n8QoDck+WHcXF208Kv/zXnG360=; b=JkG507OsWCRuHvJbGgL3PIM7CSsl4ixF0HV9tX0MjNaGMutXtl59HlMQaTi9L7TVQ0 0uW5whc6Uncb8VJ+UytyUZbpe/ZrZ3n4yHGip0vcVYlfn5mkQM+H82cO3oE+WS1fuH2J oaq2OGqrAie+QFQjcmc9z4OWzi14fnSehly/q2rQNbdPfj8nayCLWNSjfLxxdoV35R+L BnvJsWmdrtHggw6phVHjTp2Oo0uHezCb4JHR6tVPP1140j+7jh6s7uBxhkSEmk8LAM2V 5PBvZJ6VcUJCqWo5DVJikkLqEBWPrZv4no9B+IMbTKoYW8CpWHMUMy35U/2VqdDvbeBi DH0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684859467; x=1687451467; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rGIwkL0PP8YODaMN3n8QoDck+WHcXF208Kv/zXnG360=; b=WrbwhKyOMhVAnhzvAGaIIiBBf4QpiW+u1uaT0L1uh+EKiUknptVK1hzJ0iOhv06DDf d7BkCECsp2pR9VrCRCN7uAW+E6zeFoPXRIZOB+CO7leT2bYCgS1pHo+zFoxMXzHjCuj3 nJABLOjXKYx8UXrSk1EbzCno5a6DpWwqdTPG11B5wO89XuHXPPNkgGgBrO2j2RIbfS7n Dt8w/9QE6dxzDInVHE+VovmUYb6g1x6gSzOxW9Cr7+JNtcasEoGK2sX2A3bgWaHdm6pe mZoqoFlc+zVKJ/Tq5YCo0/dH9tNhsIfoVseW/2sFVMjBBWJT6ltZXPIzDdD8M6hLA5l0 80eg== X-Gm-Message-State: AC+VfDx1roCHeLrLKknDbZHDC06mn0JgmFuGAH/s8QNj3L4Ev3OeQFdE kA4Sz5+5bZSnGsHShMD07Ur4YIQ+eSZZsBxlq/w= X-Received: by 2002:a05:6512:15e:b0:4f0:e2:c709 with SMTP id m30-20020a056512015e00b004f000e2c709mr4868396lfo.17.1684859467103; Tue, 23 May 2023 09:31:07 -0700 (PDT) MIME-Version: 1.0 References: <2989165.1684846121@warthog.procyon.org.uk> In-Reply-To: <2989165.1684846121@warthog.procyon.org.uk> From: Shyam Prasad N Date: Tue, 23 May 2023 22:00:55 +0530 Message-ID: Subject: Re: [PATCH v2] cifs: Fix cifs_limit_bvec_subset() to correctly check the maxmimum size To: David Howells Cc: Shyam Prasad N , 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 On Tue, May 23, 2023 at 6:24=E2=80=AFPM David Howells = wrote: > > 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 rathe= r 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 =3D min3(n, bvecs[ix].bv_len - skip, max_size); > span +=3D len; > + max_size -=3D len; > nsegs++; > ix++; > - if (span >=3D max_size || nsegs >=3D max_segs) > + if (max_size =3D=3D 0 || nsegs >=3D max_segs) > break; > skip =3D 0; > n -=3D len; > Looks good to me. --=20 Regards, Shyam