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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30700C04AAF for ; Thu, 16 May 2019 15:23:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D60020848 for ; Thu, 16 May 2019 15:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727650AbfEPPXV (ORCPT ); Thu, 16 May 2019 11:23:21 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:56634 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727375AbfEPPXU (ORCPT ); Thu, 16 May 2019 11:23:20 -0400 Received: from svr-orw-mbx-01.mgc.mentorg.com ([147.34.90.201]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1hRIDy-0001aO-L8 from George_Davis@mentor.com ; Thu, 16 May 2019 08:23:14 -0700 Received: from localhost (147.34.91.1) by svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 16 May 2019 08:23:12 -0700 From: "George G. Davis" To: "David S. Miller" , "open list:NETWORKING [GENERAL]" , open list CC: "George G. Davis" Subject: [PATCH] net: sysctl: cleanup net_sysctl_init error exit paths Date: Thu, 16 May 2019 11:23:08 -0400 Message-ID: <1558020189-16843-1-git-send-email-george_davis@mentor.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Unwind net_sysctl_init error exit goto spaghetti code Suggested-by: Joshua Frkuska Signed-off-by: George G. Davis --- net/sysctl_net.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 9aed6fe1bf1a..7710a2d7f79a 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -104,14 +104,12 @@ __init int net_sysctl_init(void) if (!net_header) goto out; ret = register_pernet_subsys(&sysctl_pernet_ops); - if (ret) - goto out1; -out: - return ret; -out1: + if (!ret) + goto out; unregister_sysctl_table(net_header); net_header = NULL; - goto out; +out: + return ret; } struct ctl_table_header *register_net_sysctl(struct net *net, -- 2.7.4