From nobody Mon Feb 9 13:21:22 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp1930691pid; Tue, 19 Apr 2022 21:25:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGIW5jfjfOo3J4+cahWrIx+U8UVlJ8/+mTJMJfJjfG0769S3yy2QNSl2itYbHscGiw//gc X-Received: by 2002:a63:cf4d:0:b0:399:40fc:addf with SMTP id b13-20020a63cf4d000000b0039940fcaddfmr17476179pgj.416.1650428734215; Tue, 19 Apr 2022 21:25:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650428734; cv=none; d=google.com; s=arc-20160816; b=aaktA61qzEaP5tyTsZCpds2wip0LFBFYtL+vTZePhdy/fXUPu1BuT/Fqv1lG5Ck+KD dLoLmHkaLZXzLzBSruBVDF6GTiGtvk80Bay63jWhuXPH2LRmKtJTTx90sjsSa2Yd976d 4NGACW0lUbZQhY3NSs5uP8I/jnQRnqCKkzYYD3ozq46R7e1DrjLOr7vL3lMUll3lKvsy p6XWeKKPd4naOIDH9YOZ2neqq1+iE9lGqhEQ7plk+qfOzqk0B9t7BFK3B9Cbkfz+lnEL SHJDhhuTKit/LSnwEzxRSet+rGryx5zpAe96CyjSg5L3UpLq4fTYHHToNC1zFl8QRXxP KjHQ== ARC-Message-Signature: i=1; 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:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=Qa22KHnr2btriiQOpksqcOX9dWe2nQsMcDB2MTSraxU=; b=VLNdXwlZqLJmV49kbzmICxlqjoIYPCM4anISTgHDel1/co13D1vTNxOktnE6JGqYhe d9UA9mnbmiX4YauswQM+RcROJOLkLTLXMSZpZR44AzFS6WlXQo2YHZxIXR/bGTsL+J2j KV+PtD5bpeSqrKwezbOGhO7RaLh6uHaj2oiFJouwORRhbZDaI1Mhb3OXjjVR9Eg8J4dO BsUNYCPxkpbn5jBIwpf2e1D2NCW4NccIVOex+W/ppIkrito21clC9VJmX6r9aixi51T3 gqBpZlDBJMFcoE76UOMvmQjUrN6hTq3hm/nmJpseDd2wsT5TxWSjVJmMUFrbGhXXWDVr xu5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="VyH/zWlt"; spf=pass (google.com: domain of mptcp+bounces-4781-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4781-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id kb8-20020a17090ae7c800b001d2c6c93948si1303276pjb.80.2022.04.19.21.25.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2022 21:25:34 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4781-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="VyH/zWlt"; spf=pass (google.com: domain of mptcp+bounces-4781-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4781-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 329D82808F8 for ; Wed, 20 Apr 2022 04:25:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED1D01109; Wed, 20 Apr 2022 04:25:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 9034710ED for ; Wed, 20 Apr 2022 04:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650428729; x=1681964729; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=r8oISTE1yPoUIpDSwXE9J8a4R8amCYca23/2wVOMr4c=; b=VyH/zWlt4u85Gx7ouju/J3m0j6XoDZaY95zecx58kgPthT42bD8fq1Gl 18+9ggkOMCrOvznVS1ujqGrHBmMqBqwK142snPBjM7CEQbjqO0TGxiRW8 MpTyVHio7pH0a5T7CsfbyuQVdm935c/S0uCIjP434GlAMGdKwIDsmER+b 6V2xyUZv3v6ouy2/TGeyF4BAVzjXEHKmZmnDBHbmoFhbn65R1x197gz0E ZeDUAcQ+p4/EojIP6exVHrqawxoLNaiXKYVGdLithTWl8CQE14mFBnGZO uZx92G4OJ30iCUSaZ7VZ80d9siArEQdn7p1Uhkdx3oLR+tR+w9hyA8nXq g==; X-IronPort-AV: E=McAfee;i="6400,9594,10322"; a="251242271" X-IronPort-AV: E=Sophos;i="5.90,274,1643702400"; d="scan'208";a="251242271" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2022 21:25:28 -0700 X-IronPort-AV: E=Sophos;i="5.90,274,1643702400"; d="scan'208";a="529584150" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2022 21:25:28 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 2/3] Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_REMOVE Date: Wed, 20 Apr 2022 00:25:23 -0400 Message-Id: <20220420042524.2268380-3-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220420042524.2268380-1-kishen.maloor@intel.com> References: <20220420042524.2268380-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Kishen Maloor --- net/mptcp/pm_userspace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index a2de579ebd6d..bd8b692c60c4 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -189,12 +189,13 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct g= enl_info *info) struct mptcp_pm_addr_entry *entry; struct mptcp_sock *msk; LIST_HEAD(free_list); + int err =3D -EINVAL; u32 token_val; u8 id_val; =20 if (!id || !token) { GENL_SET_ERR_MSG(info, "missing required inputs"); - return -EINVAL; + return err; } =20 id_val =3D nla_get_u8(id); @@ -203,12 +204,12 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct g= enl_info *info) msk =3D mptcp_token_get_sock(sock_net(skb->sk), token_val); if (!msk) { NL_SET_ERR_MSG_ATTR(info->extack, token, "invalid token"); - return -EINVAL; + return err; } =20 if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); - return -EINVAL; + goto remove_err; } =20 lock_sock((struct sock *)msk); @@ -223,7 +224,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) if (!match) { GENL_SET_ERR_MSG(info, "address with specified id not found"); release_sock((struct sock *)msk); - return -EINVAL; + goto remove_err; } =20 list_move(&match->list, &free_list); @@ -235,7 +236,11 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct ge= nl_info *info) list_for_each_entry_safe(match, entry, &free_list, list) { sock_kfree_s((struct sock *)msk, match, sizeof(*match)); } - return 0; + + err =3D 0; + remove_err: + sock_put((struct sock *)msk); + return err; } =20 int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) --=20 2.31.1