Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4355558pxj; Tue, 8 Jun 2021 12:16:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/tQKyynyIryNa7gCuuc7AjgKNrsNzbNk9KfI3ZkoopJ5QNM7+cTYksijQ3liK1sYKndWn X-Received: by 2002:a05:6402:702:: with SMTP id w2mr27263567edx.189.1623179769013; Tue, 08 Jun 2021 12:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623179769; cv=none; d=google.com; s=arc-20160816; b=g5E5ez6/0u/5r9lip7DvHchYIN2mT87ekw5DYjCx1DYU2lpz5T0VI/N7+TfJBe/D87 u+QljdqKWmgZS9DRFerhbcCeYwVHl65UBOoT3ViEfXvXRacJQy/KIJEzXJ51jIJXW4k+ z6JBhqJeNE6HM5GKRvJkiH9CjA7NRcDHGbIMI6VyUcCxhafxHOQhPC/PCmLfwY1/IWBE E+TPuSHH86NNS+d+b350cTBdIgLleCwkCS0kP70qK58RMZrCZF1Kd1iDBQ2/CTFTk3Ba UJ0uB9pFWf1JCrl72epCj0FcTUEcL3zcoWLi99YzmSybfBl5pg/eJYRS8epGHDIPPi90 PR2w== 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=0t4Qbxav9+LkjGKA70B3rtL+ySC707xrHnyWjVmjOZ0=; b=P8+PRhYhoPBlnTBaqtnRRS4wmMdHu1pOpVhrmm1L0i3BtKh2txDWcgz86H9MSenxKh Gm8akjrGyaaB5VM25GhfAHQ2ZiGmTLNxOLT+N5VokHGh6W2h94zYtwc2L75ftMdEJrGa TeeZVG3tLhdcmA7E/ye+eGvRlFFrR6IwdwrLGR+i3+Ce9IYMyHbDV9PsVE6NIsE4UG8w oyHQwQyD0ODiliOkt/P/CuxiqUgVYlBdyFj7KV0NElFTM70LE4fS79bCu/odd6UXK6a4 mzWmdEuAigMWNnVUbPUX2wcRoUbruU4IQLJl8VHALbuXt546T+PHH9rFCXD4IBcOsv0E 65CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=by9Jzj6E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ch8si404710edb.535.2021.06.08.12.15.45; Tue, 08 Jun 2021 12:16:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=by9Jzj6E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232764AbhFHTNu (ORCPT + 99 others); Tue, 8 Jun 2021 15:13:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:40168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236333AbhFHTDU (ORCPT ); Tue, 8 Jun 2021 15:03:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3FD4D61879; Tue, 8 Jun 2021 18:45:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177928; bh=SR7TwnqRT9aOFTBruccWbgoF5gRaRBe/+emlZzBKv+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=by9Jzj6EQhPPkis77AoRLc13/cOqmJRgPmqqug/YOE9WHaEW+zs8zs5TAQpTwb5Pp lX80zIJZVVnAhNLLuaIqQ53fKpV9cATgr4wg1prvMUG4ryaHMTiUWjx6N+ucddRlU2 kx6N3KdsrsHXs2Q84swQYkjXuXMwEBXFbVo8uK1k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.12 006/161] netfilter: conntrack: unregister ipv4 sockopts on error unwind Date: Tue, 8 Jun 2021 20:25:36 +0200 Message-Id: <20210608175945.692084164@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175945.476074951@linuxfoundation.org> References: <20210608175945.476074951@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Westphal [ Upstream commit 22cbdbcfb61acc78d5fc21ebb13ccc0d7e29f793 ] When ipv6 sockopt register fails, the ipv4 one needs to be removed. Fixes: a0ae2562c6c ("netfilter: conntrack: remove l3proto abstraction") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 47e9319d2cf3..71892822bbf5 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -660,7 +660,7 @@ int nf_conntrack_proto_init(void) #if IS_ENABLED(CONFIG_IPV6) cleanup_sockopt: - nf_unregister_sockopt(&so_getorigdst6); + nf_unregister_sockopt(&so_getorigdst); #endif return ret; } -- 2.30.2