From patchwork Tue Feb 13 13:40:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shigeru Yoshida X-Patchwork-Id: 200427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp541946dyb; Tue, 13 Feb 2024 05:41:27 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXDnN6CvdYJ1BMMHeZpyVE8IfhpPcoiFu+OqL0/lCvyCrF2obizJXObHgccoCgQRbmky0uzAeghMqib9KhGEd7j9ICuiA== X-Google-Smtp-Source: AGHT+IFsWuOpYPbFdBifcUitW6yD/q1DndKAR4I8li+PbJukMZY1bt4NdNZHqjuoGODoDV/ItFQk X-Received: by 2002:a0c:8bc1:0:b0:68c:385b:ac93 with SMTP id a1-20020a0c8bc1000000b0068c385bac93mr11548736qvc.59.1707831687042; Tue, 13 Feb 2024 05:41:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707831687; cv=pass; d=google.com; s=arc-20160816; b=iWWgGjrDJeqsemuy5AUh4aQW6fuIYPNMHsYrl2tEOLFfxvZNjwZHav6AfZJlJZcWqc wu6f30Rv+obSnEHY8itL39mlviagRrydoXsuQEsyCYL25lIpi43N1FIUx8Q1wQ7Q/jiR djDlT55jgd4RGFgmKNHDyASCqckdxpfd3/Zv9uMLjYyXHvntWBgo8G03vNo4ZySlCOC3 OQIOQHncOLPa5Yv0PdimguYcHhgtFSYaxJZiiHMyeGy+fn6y7LB3pSvXNBlsEXgbL4mY G3txOyhkPmgySclTA/WJ/zDnZSsoWLSyuLqLRG0ekV1vvgZSh8IUX3r6AeBhRyqP4bsn pqbQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=sM9EeqHVbPE97OjydZplmGb04tZWIE1q6qjGihVxaso=; fh=0DZoTQt/DpnZoOYQk4wn5GeUaEY2nGZFoOt25lnBH/A=; b=V34o45ondklcQMKnGUE5e8Zu7nP4TlZKhH3sj5kK0+yoPV9uakcGx+kYWFpGqcE/PO j5xwmcr9KZecgKm3oJXRQ5CV4Lp8fFHjJbdFqmFxxCHcS8uOukx107TyiDntgRyx6kOR 5juT1LPBX9i/MH9Vs68NqUGYvRzxwmAjz32bSnytLyU1TvNYlR5D4YbW8x9UCpYLxH/I dWY7uo5iWQJByHNUTOsfK7ToxzVQ03ziS92q0ztV69roMaSlyyHPGnmhzYirB8NWetqo Fktv2Q63vP6VSQKYP8bxinewtFN5Io2BIOORo1/E/HL9y2QEWYUCHa+zGUJeswF3o5S9 oW7A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YR6qnwhC; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-63604-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63604-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=2; AJvYcCU2/MRMsGp57sbjPRmJKynDu1spTvzJmls54Z3MDdEV4DOkj2JZWEIc8cs7uKfbVAgywNgBDo0/yD9y4AqDZucOxllv4w== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id jl9-20020ad45e89000000b0068c3ca90f97si2815172qvb.564.2024.02.13.05.41.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 05:41:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63604-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YR6qnwhC; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-63604-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63604-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 957451C2259B for ; Tue, 13 Feb 2024 13:41:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 70CB45647F; Tue, 13 Feb 2024 13:41:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YR6qnwhC" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6632633989 for ; Tue, 13 Feb 2024 13:41:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707831671; cv=none; b=Xzw3765erNEiuDNm/mkpPbRBPkiDYo/fJNw6S5LJeoN5kE9hShSS3lwUPu2IfOPoKMkCII5FAHJYziFg/IMNKjdyjC0IFy2xGQiuR9g+9q1/MI95VrR/Q8pbr/US7flu99sf1fYv8p53QbYk5ZAiMt3mmvRuHSMT2uaXO1eV4ME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707831671; c=relaxed/simple; bh=vKmLuetPiqwNK/NvBA+xm8qgL06cnvFOrzu8BOu3TPA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HZDahAMLLLXbN5MqLaiYEvjwfBT5MxgXJzCkQK1lLsIk6kFsaKeL532bAvp+MfD7L75K2tUB+DbzYbzhwtbU/v85vJNUZb+1u4acOtMyqUyeHUmWPPjxbvYCyCmOmCrwY3NUIDUTQe9YUw29w1W4DZ9szm0ni7Sr65rzfmjDe/A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YR6qnwhC; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707831669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=sM9EeqHVbPE97OjydZplmGb04tZWIE1q6qjGihVxaso=; b=YR6qnwhCGfhpOsjVrPDDpFl3C+W3cgFFkgA/OR1XuoKGhcK2NHd2oIOtFpJ1FTnBae+QI+ OOiJH1VjEJZzvQh0Xv+iJQ+kTqzfXGqhaP+DnEgzuKVLWgYy3WcSfbm7YjFVwTZXCY8U6I gl5SNiYJD8RcOIrUFl1qtLt2MigiYAc= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-hNx1xmGJOOaE7aWHnwhkNA-1; Tue, 13 Feb 2024 08:41:07 -0500 X-MC-Unique: hNx1xmGJOOaE7aWHnwhkNA-1 Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-6e04e1ac036so5776355b3a.3 for ; Tue, 13 Feb 2024 05:41:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707831666; x=1708436466; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sM9EeqHVbPE97OjydZplmGb04tZWIE1q6qjGihVxaso=; b=LZowseIsxd80aB/mrZ8rw/8e7sHBLvpcAE+nd5S6Y+I1qNvdVCdujnAoW5abAGUyyJ NUFm7PRDUNstHIFoCerrUXhkWR4KyQ21yEe5sQTpEjILWWpWi8lTMxTmHy7abTbFeDmN rGVI8x/5bO/1B4dlW2rIwevVzO5DHMAb6s3V89LPci6lOYO7K8JyZs7h48pY8xJob9Y4 woUAq6L7bpQ46B6M08IwsWGQ3LcQTpTn7MPluNExxcVLz6XVJSt/iqdNVsIxHPK2GhAE AaPxQnxalDK05zjHobfXcTz1pC8PjRBquXWzDAgFEwMDYpOfPLjy9UWxw/Ter+g0Z/8J B6gw== X-Forwarded-Encrypted: i=1; AJvYcCXJFbQFgjtMPMGTqnaz6vaYHENDKS5NiEdE1tInYXtkhz9cByNrwx8Vzhd47iIYJUijyNT6cGTCqGuF+14ag4Nz1uuyvc16+zw5kw5Q X-Gm-Message-State: AOJu0Yz/okAqR7G72IvUidkJBlmsipPQ3gU4YlpHESS4omeCb84wF/56 x3REojvutmztyANVgIrvSks2KNN7aetZ/tLyxbSigr8gnuJma5cQ6bTUQLmbYKppRJ+FLMRrFpm 8NiaGY2ysarXEFE3WAUWte8iKE/GefFD4gquuLyvketKOOsl1veohfqgVyBX0Dg== X-Received: by 2002:a05:6a20:c707:b0:19c:a4d3:2041 with SMTP id hi7-20020a056a20c70700b0019ca4d32041mr15569188pzb.42.1707831666686; Tue, 13 Feb 2024 05:41:06 -0800 (PST) X-Received: by 2002:a05:6a20:c707:b0:19c:a4d3:2041 with SMTP id hi7-20020a056a20c70700b0019ca4d32041mr15569171pzb.42.1707831666433; Tue, 13 Feb 2024 05:41:06 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUPTpsWr88UqwU41Z/VTHCIQBM+G9Y3MSqC3XMWud5NWsOT2+3tszlERKJZO40rLdaH+zJf58/ZX30Bj/62Zv3cA7vVUzL6cLbiOUpTZtrqKq8GMYiP2ETfbtEIh44xzUAQob+BBd4EkxlLNm8U0YpDs1sLrry3sBtUiwReJmph18iVFoQDrF6RAywt4drK+lu1t3kDIWlYmjh9e9oMtQLgwDLIH5+aXXhLk0hugAdcIdBNssLXSgE8HABS0E+dXQXgX3alJfWcmjJo6IXDF0AXXI8tZxEmax4FwAfgaPNGJzMVd7k1dKHYyjVQqzis Received: from kernel-devel.local ([240d:1a:c0d:9f00:6883:65ff:fe1c:cf69]) by smtp.gmail.com with ESMTPSA id p39-20020a056a0026e700b006e0f3f544fcsm1932208pfw.67.2024.02.13.05.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 05:41:06 -0800 (PST) From: Shigeru Yoshida To: jmaloy@redhat.com, ying.xue@windriver.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org, Shigeru Yoshida Subject: [PATCH net-next] tipc: Cleanup tipc_nl_bearer_add() error paths Date: Tue, 13 Feb 2024 22:40:58 +0900 Message-ID: <20240213134058.386123-1-syoshida@redhat.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790791318830314268 X-GMAIL-MSGID: 1790791318830314268 Consolidate the error paths of tipc_nl_bearer_add() under the common label if the function holds rtnl_lock. Signed-off-by: Shigeru Yoshida Reviewed-by: Tung Nguyen --- net/tipc/bearer.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 878415c43527..5a526ebafeb4 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -1079,30 +1079,27 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info) rtnl_lock(); b = tipc_bearer_find(net, name); if (!b) { - rtnl_unlock(); NL_SET_ERR_MSG(info->extack, "Bearer not found"); - return -EINVAL; + err = -EINVAL; + goto out; } #ifdef CONFIG_TIPC_MEDIA_UDP if (attrs[TIPC_NLA_BEARER_UDP_OPTS]) { if (b->media->type_id != TIPC_MEDIA_TYPE_UDP) { - rtnl_unlock(); NL_SET_ERR_MSG(info->extack, "UDP option is unsupported"); - return -EINVAL; + err = -EINVAL; + goto out; } err = tipc_udp_nl_bearer_add(b, attrs[TIPC_NLA_BEARER_UDP_OPTS]); - if (err) { - rtnl_unlock(); - return err; - } } #endif +out: rtnl_unlock(); - return 0; + return err; } int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)