From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7C4BC433FE for ; Mon, 21 Feb 2022 18:14:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231830AbiBUSOi (ORCPT ); Mon, 21 Feb 2022 13:14:38 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:40334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231436AbiBUSLk (ORCPT ); Mon, 21 Feb 2022 13:11:40 -0500 Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF24013DCA for ; Mon, 21 Feb 2022 10:02:04 -0800 (PST) Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-2d6923bca1aso138098807b3.9 for ; Mon, 21 Feb 2022 10:02:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gCnwk+1fZd2CNAqs8BK/DEcQnsMZ5KV6kM4CCv+XVUE=; b=Y41xGrzIr+L/F15uGmFs1ADcDgdKMDPg8RTj9wutV/T5sVvjPalRvyMbI/mE7H4Azd PfPgtKwe6aJ4FtAlBGRZWamLzZOd8Hn9HrkP1OQLqPp4AyychKcJgLeZW2naPUETbWkj AOyGODFYi+Mo17air25626pWvCec6oM/7UBJ04ywVrcgA86ohGAtOvfcQkb51Zr43fLB LUWoksIxfT6lbV6qwZf8njlVK2WvnTdlmkHsCO/fFWfst30HglsX/YEs9xPGgpIQnprI vbMdKKzPuuJ1RGbzxkSeqOiK1vM9CwvvflmCGNePgi95EbKMZILnS9wK4volIsp5wZK6 xxwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gCnwk+1fZd2CNAqs8BK/DEcQnsMZ5KV6kM4CCv+XVUE=; b=kZj3LtmoxOVzA+oc7AUfQsPT4rK7CjeGPpuUJfR7JJB5T1NwoiVmjfk6J5MIwvvzFF hNI/ibXoB1iTB6Rzm7P2iNpQxKq4S2GHfU9uoSqzVpgJPejCof4zDT7xcSoghMzItshV aixILMleKV1aRZYiMViQj4RCRxxd7s5BjD7hXYjhH/BdcbVyflawVev2V8o+a7JcNIqn Ip01LrrKtnuO27mCh3O33RKskwUg/J9OIuLpBnvY2rj78w6U3DfY57qNEc9RInQbBj9y zXCmSOXZDumsyCG1AvPaSnOufEe5K5LUgeT0jMowSWism3vXzCAO/GCdhptbr5BJama1 4TLA== X-Gm-Message-State: AOAM532JG6EvUn1bgaw0yhr5ewJyGyikMA4VK2z2DNnZ+5+mymBK0/4f E38JSaCBqdhIP0gMYukNZos+GUqzImMJnMACn98a9g== X-Google-Smtp-Source: ABdhPJyFuzJXFuAgKnJy1SVe6M8VS3ba2FIQHRrucF8KaYmPL+i/iLg8UjHQ3oZu9UqtNJdybUgY3BGV5hrhcU2Hst0= X-Received: by 2002:a81:993:0:b0:2d6:15f5:b392 with SMTP id 141-20020a810993000000b002d615f5b392mr20619739ywj.489.1645466523677; Mon, 21 Feb 2022 10:02:03 -0800 (PST) MIME-Version: 1.0 References: <8f331927-69d4-e4e7-22bc-c2a2a098dc1e@gmail.com> In-Reply-To: From: Eric Dumazet Date: Mon, 21 Feb 2022 10:01:52 -0800 Message-ID: Subject: Re: Linux 5.17-rc5 To: Linus Torvalds Cc: Woody Suwalski , Pablo Neira Ayuso , Florian Westphal , Linux Kernel Mailing List , Netdev Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 21, 2022 at 9:56 AM Linus Torvalds wrote: > > On Mon, Feb 21, 2022 at 6:23 AM Woody Suwalski wrote: > > > > Compile failed like reported by Robert Gadson in > > https://lkml.org/lkml/2022/2/20/341 > > > > As a workaround: > > nf_defrag_ipv6.patch > > --- a/net/netfilter/xt_socket.c 2022-02-21 07:29:21.938263397 -0500 > > +++ b/net/netfilter/xt_socket.c 2022-02-21 07:40:16.730022272 -0500 > > @@ -17,11 +17,11 @@ > > #include > > #include > > > > -#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) > > +//#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) > > #include > ... > > Hmm. That may fix the compile failure, but it looks somewhat broken to me. > > Other cases of nf_defrag_ipv6_disable() end up being protected by > > #if IS_ENABLED(CONFIG_NF_TABLES_IPV6) > > at the use-point, not by just assuming it always exists even when > CONFIG_NF_TABLES_IPV6 is off. > > So I think the proper fix is something along the lines of > > --- a/net/netfilter/xt_socket.c > +++ b/net/netfilter/xt_socket.c > @@ -220,8 +220,10 @@ static void socket_mt_destroy(const struct > xt_mtdtor_param *par) > { > 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 > } > > instead. Entirely untested, because that's how I roll, but I suspect > the netfilter people will know what to do. > > Added guilty parties and mailing list to the participants. > > Linus I am pretty sure Pablo fixed this one week ago. https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git/commit/?id=2874b7911132f6975e668f6849c8ac93bc4e1f35