Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7115519rwi; Mon, 24 Oct 2022 10:01:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6uSrS2Ncu7eNj5lwn+t1EH7kP/d7z72TeVoemAzOmYH313AaQadkfNtBho4TPJTec0i6ZX X-Received: by 2002:a63:2c0b:0:b0:434:ebb6:7594 with SMTP id s11-20020a632c0b000000b00434ebb67594mr28425426pgs.245.1666630888786; Mon, 24 Oct 2022 10:01:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666630888; cv=none; d=google.com; s=arc-20160816; b=bE3zKTG+pxNvo92ngUfLO55HtybijiFqb2xVljaYwIRfifL0zCXhV121mUoQqPvck3 pNE6+zHyCV7jLjCLu4Yo4KPHBU7dSuwqzJQQHIUjBlTNzAj0OiuKBXFLcNzzLnIxO3ez q0OeqivAbd7x4jiteg1YNv75DW3Lu0yxarqamxeweWao3/o/8JiAq31TMRJXn2SHFCQb wiItwx6tYBRZ/b3G2WZAxrSEEQct3OiEZ1S2MWlC5gIlAKE/p6Ms0YEx0u5KbcTDsrJd TuP8o5R10TUUOiyT+QTSmj+jTeQVT5X2IHppiW02kE6u5nj+rIuL/BFB0XAoH5hUA0kW swIQ== 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=0bc+XD+apmhjJc9DOmpV6IW+itf1DCBgzSzPdZlBB1s=; b=rrzTFu1AAWXv8TyYD+x56/DA9WYCpQOqY8xvacU70uce6GE8JFKJavQlXXOxjfXKaT A6sz2jN6yBwxnWemKQaYuVp4YizrdppqZO7bBmTbwf+Zvoaso0Z4cZW4+Gl2oZESGRAy yxRNdIW6co6CR85XeMIYDaNanqsy9VEjgVZOb+eSxGbaVFDM+vCduJPCugz9DnPLUwre bsRuOUaghA0zZ1jpLDNRHi2KZ6t2RVDstdd/+brERBSaO1jxlEhDrzMFx68fxdK0Nulb vLwhU8uh94ghNDw8D0Ebj+NCCZ+htvfeELnkCRgVUIDCfy82p/Rs225yKBFV8eGeiodB NVbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ieP6Z9ub; 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 d18-20020a170902ced200b001865dfb6774si20855388plg.458.2022.10.24.10.01.16; Mon, 24 Oct 2022 10:01:28 -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=ieP6Z9ub; 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 S235884AbiJXQzQ (ORCPT + 99 others); Mon, 24 Oct 2022 12:55:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235647AbiJXQuB (ORCPT ); Mon, 24 Oct 2022 12:50:01 -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 7951333372; Mon, 24 Oct 2022 08:33:23 -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 0620CB818F0; Mon, 24 Oct 2022 12:39:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B14DC433C1; Mon, 24 Oct 2022 12:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615169; bh=QOSvvtDm2rCO1YO8iMoqViJjCHPUZLII/l1hg2+iGOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ieP6Z9ubbl6jJ4rfWR6LaCX9qyou5WGkQ1Mpl9NkLenb7Byr4AC1+qLDS9pHY2ca0 zXd4yUfnsJiRUvgC+IpmbE8pahHbEm69aqILMv9CfevJz9kXFHSbBraqHM8MPpnEf0 J3hTj7UqwDd6zIB87rv5YIvXi3AaUsr5IpQ9n/D0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeff Layton , Chuck Lever , Sasha Levin Subject: [PATCH 5.15 148/530] SUNRPC: Fix svcxdr_init_encodes buflen calculation Date: Mon, 24 Oct 2022 13:28:12 +0200 Message-Id: <20221024113051.767139056@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 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 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: Chuck Lever [ Upstream commit 1242a87da0d8cd2a428e96ca68e7ea899b0f4624 ] Commit 2825a7f90753 ("nfsd4: allow encoding across page boundaries") added an explicit computation of the remaining length in the rq_res XDR buffer. The computation appears to suffer from an "off-by-one" bug. Because buflen is too large by one page, XDR encoding can run off the end of the send buffer by eventually trying to use the struct page address in rq_page_end, which always contains NULL. Fixes: bddfdbcddbe2 ("NFSD: Extract the svcxdr_init_encode() helper") Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- include/linux/sunrpc/svc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 6be55d0e73fd..045f34add206 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -609,7 +609,7 @@ static inline void svcxdr_init_encode(struct svc_rqst *rqstp) xdr->end = resv->iov_base + PAGE_SIZE - rqstp->rq_auth_slack; buf->len = resv->iov_len; xdr->page_ptr = buf->pages - 1; - buf->buflen = PAGE_SIZE * (1 + rqstp->rq_page_end - buf->pages); + buf->buflen = PAGE_SIZE * (rqstp->rq_page_end - buf->pages); buf->buflen -= rqstp->rq_auth_slack; xdr->rqst = NULL; } -- 2.35.1