From patchwork Wed Nov 16 08:16:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 20785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp22508wru; Wed, 16 Nov 2022 00:26:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf6UNrGwlNgJar4sgH3BV5EPMmm9zCuTJhjtr2F3k62YDXij7gjEqt5UwGnSPo8DDGJcDjYW X-Received: by 2002:a17:90b:3944:b0:214:1df0:fe53 with SMTP id oe4-20020a17090b394400b002141df0fe53mr2506062pjb.214.1668587177288; Wed, 16 Nov 2022 00:26:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668587177; cv=none; d=google.com; s=arc-20160816; b=EsiKdIFelLoJXvSxh7ioU8TTzAdZRKJtCUNqPO9pD/8b4qhD4l47XYauHOj+AMt8OM G4fMyHy9l2Ro2D94JQvTl+BPT8Hzq4e2ig5F2hPNn4dH+1hDkM3mH04sR9LwOEWP9pKj uQD3uUPSqn3jxYrbu4+YN33D+v/c/4Xty8VDcAux7tsxtKcGZ4idaNrQRO6UnAa1oY22 JLvDTTsr6RUvgcJUzQ7+lRginfpC6j7CVN3hWu3BAMnjuqrOsf9oyxqr7yyhlgz+EVgQ qWg1I4VTq165Aqe0jxXQOyMptfPXao+xiknNtpAQkqf1QAS8anU4xKApeA6uASQsc2ww yngg== 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=i9d1x3IOEClUC0qavYogMQagsbboIJFcHLUHadOyzrg=; b=IR8yRBHsr45tj9eXkHXeBnIJpkP/U/zViEhi8UlbvN8er2tnzVzqpfJYEXb2wusBCL 3zvjWMXTD5KfAofmu1P07ZBJelKY9cW+pqXyDFSDt1gAZmWGclq/Oc0Bmya3gUwoK/cV vTshfuTkotOD8PCbQF7YIzLWvfyBhbJwCa1zDdgd6srypODQml1dlmkKhGBhvktNZDvF SIVmOMUc3L7R+WlVtNT51FFDPFqLs+WjM/9cmoNM3rugAh418l0cqYgTexaydMfRy1DB HwxXAf1/mhL7cegUN7bdfOR8KAXPW+h0/LGaOxAAx+Bmk/7w9osebq2vn/VPZye21Be8 QsNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fXIcC0xN; 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 f12-20020a170902ce8c00b001769b63ec65si16796731plg.483.2022.11.16.00.26.03; Wed, 16 Nov 2022 00:26:17 -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=fXIcC0xN; 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 S232170AbiKPISK (ORCPT + 99 others); Wed, 16 Nov 2022 03:18:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237857AbiKPIRo (ORCPT ); Wed, 16 Nov 2022 03:17:44 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5293BBA for ; Wed, 16 Nov 2022 00:16:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668586606; 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=i9d1x3IOEClUC0qavYogMQagsbboIJFcHLUHadOyzrg=; b=fXIcC0xNySq2teBggHM6rgpolIYY/cT4qBRksiZf8ZCUFSKWU7Vo60EuW6mRndojpal043 K8SgSNWjAKIjKZ5CdggrzYi+WDeG/fKuJsAlR980VPXImjY4H1vC4EOuOEigTaXTU6m4TR rYcrDzJuqrKjgx+f7/nJHG744qBpays= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-407-wIQBQWIKOBG1HOOwGEY4Aw-1; Wed, 16 Nov 2022 03:16:44 -0500 X-MC-Unique: wIQBQWIKOBG1HOOwGEY4Aw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 25AF8381494B; Wed, 16 Nov 2022 08:16:44 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A20E140EBF3; Wed, 16 Nov 2022 08:16: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 1/3] rxrpc: Fix missing IPV6 #ifdef From: David Howells To: netdev@vger.kernel.org Cc: dhowells@redhat.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Date: Wed, 16 Nov 2022 08:16:40 +0000 Message-ID: <166858660085.2154965.8163437106785496427.stgit@warthog.procyon.org.uk> In-Reply-To: <166858659236.2154965.18023032361364343888.stgit@warthog.procyon.org.uk> References: <166858659236.2154965.18023032361364343888.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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=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?1749640467764972778?= X-GMAIL-MSGID: =?utf-8?q?1749640467764972778?= Fix rxrpc_encap_err_rcv() to make the call to ipv6_icmp_error conditional on IPV6 support being enabled. Fixes: b6c66c4324e7 ("rxrpc: Use the core ICMP/ICMP6 parsers") Reported-by: kernel test robot Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org --- net/rxrpc/local_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c index a178f71e5082..a943fdf91e24 100644 --- a/net/rxrpc/local_object.c +++ b/net/rxrpc/local_object.c @@ -33,7 +33,8 @@ static void rxrpc_encap_err_rcv(struct sock *sk, struct sk_buff *skb, int err, { if (ip_hdr(skb)->version == IPVERSION) return ip_icmp_error(sk, skb, err, port, info, payload); - return ipv6_icmp_error(sk, skb, err, port, info, payload); + if (IS_ENABLED(CONFIG_AF_RXRPC_IPV6)) + return ipv6_icmp_error(sk, skb, err, port, info, payload); } /*