Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp3119534pxm; Mon, 28 Feb 2022 12:26:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/D52MCTFqTgBgG/pp3+BMSO4rDz9sBlR95+PHnhi8KrDdxQBuXbW3jC9xvXpGlSUeUtak X-Received: by 2002:a63:4d02:0:b0:372:9a57:5873 with SMTP id a2-20020a634d02000000b003729a575873mr18787767pgb.503.1646079969894; Mon, 28 Feb 2022 12:26:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646079969; cv=none; d=google.com; s=arc-20160816; b=IfIYtxO7E4jvTzmxm7/bObCpzU/ImH2AhLmmnffjdH1SawLSy+m1bPkLsXTFzMM/dL h/VMHai0CKezXBvnlOXQXSlSTFSxe4cD81Srqjz9yjGA7zSOHVx2xpG3el8S6F2/meh1 Zdm/TyKc+JbbdhUxO3uzqpgpxRBjnJRZy6tgWyAcmSjVqvLXpnNGS3u8KGM7pvMk0xpq YzwQMA35ZlGp4Fww34eSc00ned9fiH1C3/39yGi87m+YV8AkJfnVo+8c8AfUV5WSNzLS eVeCKvkh9WjFI3aOsGGJWWiTChWS8lCx1zz0Xparsnm8O+1Sz7RLNIh6ftGDGf87ZI9x bm7A== 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=4jTxedNHLltn1Lu6MXx4ivQGbcEV9TVlPXY/rSPKFtM=; b=kE2aAMipUDGluHOYxSZD4MUwxCy0HEDEtwjGRDQhXJM1Mroc7Dhc0H+K/w8DLAVBh9 xmNoIfsoJiJl6YNLFIBz3lmfz7NBiJRXYG7IL7KGdawziCxdfy5RfYCZ2T8MtG4Gk+wF IbopuI7rulc2SnGiV2lglnEFpft2WS/W+mXYckizZ31vRQYmPymrgRvrxTpQJsZsOkr0 mdIzsEN0XWoqM+DgChhs3W5CLcCGJol6ERGoDpSszHT0TSDyzI7u5OabYivqjdyAGlJg bPbFqO8WfI/qIToPQIftNbSb5vFQhxMf0KZmZ5MqsRGHClO762QkMRKsJQYDGw9KliUc u5Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RdEreY8v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id n5-20020a632705000000b003744256941dsi10654547pgn.639.2022.02.28.12.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 12:26:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RdEreY8v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 868DF1E7A43; Mon, 28 Feb 2022 11:44:17 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239426AbiB1SBF (ORCPT + 99 others); Mon, 28 Feb 2022 13:01:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240794AbiB1Ryp (ORCPT ); Mon, 28 Feb 2022 12:54:45 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA967532FB; Mon, 28 Feb 2022 09:43:44 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 79A6F6066C; Mon, 28 Feb 2022 17:43:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7ED98C340F0; Mon, 28 Feb 2022 17:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646070223; bh=j302gKTO4w+K7obYcgnAaWR6s5bMHrwgcd+p4UPzX7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RdEreY8v6wtzhA11YIZ3R40wHuIsY8YlDjygTMM7k0R/jNWLuuLW/g7PwmQ4vUyHq D6jBA6HzASow63DkJuIW9TM+snWvygHgkspdi8zA71/ewCIOQc0chGKBPD6Wfy58Iq SC2Jf9EhndPAEAwLA4OTiHaAiBnvTc7eiFXWJWts= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Eric Dumazet , Pablo Neira Ayuso Subject: [PATCH 5.16 031/164] netfilter: xt_socket: missing ifdef CONFIG_IP6_NF_IPTABLES dependency Date: Mon, 28 Feb 2022 18:23:13 +0100 Message-Id: <20220228172403.031007307@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220228172359.567256961@linuxfoundation.org> References: <20220228172359.567256961@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE 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 From: Pablo Neira Ayuso commit 2874b7911132f6975e668f6849c8ac93bc4e1f35 upstream. nf_defrag_ipv6_disable() requires CONFIG_IP6_NF_IPTABLES. Fixes: 75063c9294fb ("netfilter: xt_socket: fix a typo in socket_mt_destroy()") Reported-by: kernel test robot Reviewed-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/xt_socket.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c @@ -220,8 +220,10 @@ static void socket_mt_destroy(const stru { if (par->family == NFPROTO_IPV4) nf_defrag_ipv4_disable(par->net); +#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) else if (par->family == NFPROTO_IPV6) nf_defrag_ipv6_disable(par->net); +#endif } static struct xt_match socket_mt_reg[] __read_mostly = {