From patchwork Tue Nov 8 22:18:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 17245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp10148wru; Tue, 8 Nov 2022 14:23:05 -0800 (PST) X-Google-Smtp-Source: AMsMyM73v3jzf/X0ZkAIPK8RMKJhLXC6FZBY6+aekkZjRw1e4M4DNODrjHVMOP+t1YJ3MLT4QWNX X-Received: by 2002:a63:cd42:0:b0:46f:9f49:9468 with SMTP id a2-20020a63cd42000000b0046f9f499468mr44856598pgj.361.1667946185224; Tue, 08 Nov 2022 14:23:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667946185; cv=none; d=google.com; s=arc-20160816; b=ufVQL8jo5ktJX2a9YEXXwXPHmjKPrKS0zg+CBZmqk0SycWFt1nyWGCoAbyG3kjfxYD loKjb4migPEoPbD08wihQOrVOGytKt4OH8cbdOThvlbWzk4sPdP93HOnt+xIJrkAKNBQ kQwFzf9Nc3OL/Aw7GjZNoybS5ZtqGvvLy7uhvvGeCDLzEQOmE/+ZsSVCJL/+5lyd0OrH dImGkhAW7sYhsywEhO/JCjlJs7ywXYQvHPGdmvwBvw7Z61eU7PyVVhi5n+ii5CCLdwG/ YkTzratcM6DlRd2Al2XBQFRZEoFY4T6dhLVgrxx6FbTtdXqzkXDyV1kFpX8ulNjnmp2x zJTg== 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:cc:to:from :subject:organization:dkim-signature; bh=IJ8j+2HRCtu2+T8QtaoFVqrUndr0AutIhy648UGWtg8=; b=01XuvC8yf+KSv6GamJz4+0gSlKbHrr2PP3bbCm7i2w29AqK3QUPLMZVvTX5xV0+HXt CEUnrtPCCvwEAW7Hib8pRzzEcQZStmEZczz5nx4dT5TF5XF9y/O4bvr1q0+dXyhaPmMi EFrTTMB508d2s2LYbVbFfLNC2IkRkjEHjYloB00etN6roipQyPSM/oRCiRSdx/SVisME gQ5i9QTNK971DdaxgLvDENdMR6J9zD26vC9JcPq2hVbSZR946NheD6qR9Z33K+skWvxC xmfticykOpE8Y6QqnqaPdq73QyJxt7DhqZHCqSoHHa5mB5dmVAFf+udg4oe4qnVlMsu0 2akA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=aL1Iwjv0; 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 q5-20020a170902bd8500b001867d0e4307si14464530pls.372.2022.11.08.14.22.49; Tue, 08 Nov 2022 14:23:05 -0800 (PST) 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=aL1Iwjv0; 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 S230174AbiKHWUW (ORCPT + 99 others); Tue, 8 Nov 2022 17:20:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbiKHWTr (ORCPT ); Tue, 8 Nov 2022 17:19:47 -0500 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 C6EBE20F73 for ; Tue, 8 Nov 2022 14:18:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667945929; 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: in-reply-to:in-reply-to:references:references; bh=IJ8j+2HRCtu2+T8QtaoFVqrUndr0AutIhy648UGWtg8=; b=aL1Iwjv0QgZf5VQSftJjhZsZCeO7xUL4923kyZC5445TUDfSyy2r86XhOogodv1gE0hGQC +FGLr3dr5lTeL7jPrEZO14TuHFsDinczuj+4RWLeiZtaNeQiojXm/xZtozVMmuHYhQkDQw g6z04V4XZIgCVqjNti5KnLSAoUM90nw= 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-640-yXFo6r4gO5qklGbH8iidew-1; Tue, 08 Nov 2022 17:18:44 -0500 X-MC-Unique: yXFo6r4gO5qklGbH8iidew-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6B9378027EB; Tue, 8 Nov 2022 22:18:44 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.37.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id E23012166B29; Tue, 8 Nov 2022 22:18:43 +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 Subject: [PATCH net-next 08/26] rxrpc: Fix ack.bufferSize to be 0 when generating an ack From: David Howells To: netdev@vger.kernel.org Cc: dhowells@redhat.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Date: Tue, 08 Nov 2022 22:18:43 +0000 Message-ID: <166794592324.2389296.7276588487382591895.stgit@warthog.procyon.org.uk> In-Reply-To: <166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk> References: <166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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 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?1748968339019227935?= X-GMAIL-MSGID: =?utf-8?q?1748968339019227935?= ack.bufferSize should be set to 0 when generating an ack. Fixes: 8d94aa381dab ("rxrpc: Calls shouldn't hold socket refs") Reported-by: Jeffrey Altman Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 77ed46ab33c5..b803bfe146de 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c @@ -97,7 +97,7 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn, *_hard_ack = hard_ack; *_top = top; - pkt->ack.bufferSpace = htons(8); + pkt->ack.bufferSpace = htons(0); pkt->ack.maxSkew = htons(0); pkt->ack.firstPacket = htonl(hard_ack + 1); pkt->ack.previousPacket = htonl(call->ackr_highest_seq);