From patchwork Mon Oct 24 11:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp550369wru; Mon, 24 Oct 2022 09:45:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4KKaCo9QyOFPychJS1ItJAej9e2i0WZRBvH8Ht2J1SlVXtl1TOxwRe/aTE0asVhFH9E+9X X-Received: by 2002:a17:902:e395:b0:186:9cf7:3147 with SMTP id g21-20020a170902e39500b001869cf73147mr9113373ple.52.1666629954787; Mon, 24 Oct 2022 09:45:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629954; cv=none; d=google.com; s=arc-20160816; b=jDCdbtLJ/8aSaDJgBpoBQ0OQNkVCGeBxlpUYGbo7Vx0Ar57MdF++lTIi1kGYqObd6S mTjNjsqgovLD7zaeK6kO1bz1cna7tEBWf/+5EG5LOXO99AaJY66gSojD+ynF55kN20fy LLh6M7Q41ZqovPx5ltLcZRLmlQK4oNtD2TjyvR7EnZzl7gPf/l43QPGAiaiFpn6QkwJs rorpDneIWglgXLBC/VH9+N40TLsnYOpe0NW6FlefgnO91qGznVUM+dUqSxlpXN6RbLfm dyLhR/e+NaNb7A4dDjMBHXHZOekMaX+mbratiZh2SzmR9L+B9nMQYCJrfVyhpY+GBpOZ DaOg== 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=V8JHDc6Kw47PmH7/ZnMxiK9FPgkpXW1hnVI/KWTa+2w=; b=HbV9r1DGHxBjL+bs1Z9/V8tFIo/qePygjyTsgFOUemmTLI5yjoZqGk8CdvdtNLudLO eboSuDkY+pfmlAjYlQ4MyS9lUnDhRwo5YBvgQh/4coztBGSwVpP9TJCHARAfzpProPBw jNSMv6T6CCVGEQLAkpvts5uGSExmXiYoMnnCAJhbrVMapA9X/3FqOwnxIksDKEhzrtvo gaZQKTo+e4xmYVqeOTAInNww6yWc0yKTSd1bOo2yldxngXAAsVVndqYZ7dIvqw8tSZqb 9SlJjJlI7mmW5gC+cOqnJQOj3nHKaxy1u8TplACJFUPJQmGA7kyxTjcrV4wPZ11VKZI4 NmzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hTeQkhIX; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a5-20020a1709027d8500b0017d2311af5dsi9591plm.69.2022.10.24.09.45.40; Mon, 24 Oct 2022 09:45:54 -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=hTeQkhIX; 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 S234888AbiJXQpV (ORCPT + 99 others); Mon, 24 Oct 2022 12:45:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235044AbiJXQoS (ORCPT ); Mon, 24 Oct 2022 12:44:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5099C58BC; Mon, 24 Oct 2022 08:30:36 -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 AA942B8171C; Mon, 24 Oct 2022 12:39:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 126C7C433D6; Mon, 24 Oct 2022 12:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615164; bh=DnF/33ZwbQ4RzHxSAd6B6kCFDaMLeMVbkzlWfObRVzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hTeQkhIXbsKrYX+RfHG8YpQjNmvG5FupWLiu+5Ese5uIUm3xj4cBzfsKZBHqjGV+I AptbRHFAvUUZBN1nhS/Ojee8TGJQ3C/b+VPHqY1VwpBYSTppd/Y61NlRJgKnY9Y8c0 Kj0MLE1x/Zfci15P7+vDdf6bOOmyf2hT4fFRBe0E= 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 147/530] SUNRPC: Fix svcxdr_init_decodes end-of-buffer calculation Date: Mon, 24 Oct 2022 13:28:11 +0200 Message-Id: <20221024113051.718398785@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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747588171494151459?= X-GMAIL-MSGID: =?utf-8?q?1747588171494151459?= From: Chuck Lever [ Upstream commit 90bfc37b5ab91c1a6165e3e5cfc49bf04571b762 ] Ensure that stream-based argument decoding can't go past the actual end of the receive buffer. xdr_init_decode's calculation of the value of xdr->end over-estimates the end of the buffer because the Linux kernel RPC server code does not remove the size of the RPC header from rqstp->rq_arg before calling the upper layer's dispatcher. The server-side still uses the svc_getnl() macros to decode the RPC call header. These macros reduce the length of the head iov but do not update the total length of the message in the buffer (buf->len). A proper fix for this would be to replace the use of svc_getnl() and friends in the RPC header decoder, but that would be a large and invasive change that would be difficult to backport. Fixes: 5191955d6fc6 ("SUNRPC: Prepare for xdr_stream-style decoding on the server-side") Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- include/linux/sunrpc/svc.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 01f09adccc63..6be55d0e73fd 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -566,16 +566,27 @@ static inline void svc_reserve_auth(struct svc_rqst *rqstp, int space) } /** - * svcxdr_init_decode - Prepare an xdr_stream for svc Call decoding + * svcxdr_init_decode - Prepare an xdr_stream for Call decoding * @rqstp: controlling server RPC transaction context * + * This function currently assumes the RPC header in rq_arg has + * already been decoded. Upon return, xdr->p points to the + * location of the upper layer header. */ static inline void svcxdr_init_decode(struct svc_rqst *rqstp) { struct xdr_stream *xdr = &rqstp->rq_arg_stream; - struct kvec *argv = rqstp->rq_arg.head; + struct xdr_buf *buf = &rqstp->rq_arg; + struct kvec *argv = buf->head; - xdr_init_decode(xdr, &rqstp->rq_arg, argv->iov_base, NULL); + /* + * svc_getnl() and friends do not keep the xdr_buf's ::len + * field up to date. Refresh that field before initializing + * the argument decoding stream. + */ + buf->len = buf->head->iov_len + buf->page_len + buf->tail->iov_len; + + xdr_init_decode(xdr, buf, argv->iov_base, NULL); xdr_set_scratch_page(xdr, rqstp->rq_scratch_page); }