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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B44DC7EE2D for ; Tue, 23 May 2023 16:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236827AbjEWQbM (ORCPT ); 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-Google-Smtp-Source: ACHHUZ6XxYMjRPfT3xIGKngiLHoL5Ye98dFpjpDe+w98eFwhLgs2qTWaYrwILtPbNJvWKXFze81PctmbI6VCnaDdZOU= 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 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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