From nobody Tue May 7 23:44:40 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp3527267jap; Tue, 11 Jan 2022 04:07:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSm70vAZeLRYQDE8Nj07883hPH91myXaaSH4BcDo0GdfpoiuwgVKT8dbFF7Qg1zUBYA4F+ X-Received: by 2002:a63:bd02:: with SMTP id a2mr3817912pgf.351.1641902853684; Tue, 11 Jan 2022 04:07:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641902853; cv=none; d=google.com; s=arc-20160816; b=B1hbaBJXf6vqEhGm3nRLIahYpK2e3HJDu5a0qXhv1J5/AaMCYN1kehntr8icvv/5Pl dnOCRtxl5K1pKxModpCDvAJ/vEQiOwYV69CcsbdcYVcg9A0rxvoRfzNBL7JxuFDEmFLr HmH3erJses0kC/5/4zX8sVouXw1yADxQGqNE7HuIB0PImLwb+2wjwoptgrDw7wjwhQ43 YbhAlp68VAkr+BdxrcvXFXTObZOkWs2mOvgyBUJn41pV/KOhqSd2ib6Yr2OmhxsVPgSI SMBEDjPv/YkhJhSpSMK7/6IPuN3Z/U+VTKiqDFs3HzJEnScN/XlYqgPYaydRyF0dW2zc qdiA== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=8/9ZmW7lVyd1YgZ0beURrAeJWPqAJdVDMC8rZ+4cj8k=; b=vTznOhaZbC5frLJae0ioa5kUXWZ8fk2LIlfJ+2ob08XnotBFNQPhZze28ODYO7w7xX h01VXENP0AtIeXMZS0IY2xqIhZ9glyGnWCclyEVo0DURjzZ+k7Fx7pcDIxTHSLIEsbaE Tg6lZNqpC/u7Ecv0DjLvtv98LAZ35uR0XpDAGIVPtKWNStnDd2FOSCgBdchpWcGsxTyp mKxWeemTtKST3rxavQ6ePRDkU8vlLRM/x2SdPQASAHu/cmNzsQmsexTBW3ysMHmhdNI0 HzniE+yCPmGslgM49DlA/oqwA94FLLzhTTPAKrsZc0O34WLKUP4E0G5sxi9BzZM0K5SH WUpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KxqL31ZI; spf=pass (google.com: domain of mptcp+bounces-3039-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3039-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id s30si9656759pfg.241.2022.01.11.04.07.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 04:07:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3039-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KxqL31ZI; spf=pass (google.com: domain of mptcp+bounces-3039-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3039-wpasupplicant.patchew=gmail.com@lists.linux.dev"; 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 sjc.edge.kernel.org (Postfix) with ESMTPS id AA7473E0E54 for ; Tue, 11 Jan 2022 12:07:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C367B2CA3; Tue, 11 Jan 2022 12:07:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 0ACB32C9D for ; Tue, 11 Jan 2022 12:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641902849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/9ZmW7lVyd1YgZ0beURrAeJWPqAJdVDMC8rZ+4cj8k=; b=KxqL31ZIitPPAiUnkZsCdhFLOHRqJtGYQ/EC2LMdlGs4TUey8jD8QbkjB6yN1DPInLsL3y 2ZfO2Z862eQzo6xRxFv0gmw5huD2cLJBxqq4Ilxw2WBVz1B/9MsvKAUJB6dslyZ7obh5nl UeLs6R4wBOX9e/6NPzSyDCmRw0Bbx3w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-195-ScwQ-lPjNbuKxQzkf4J-sg-1; Tue, 11 Jan 2022 07:07:26 -0500 X-MC-Unique: ScwQ-lPjNbuKxQzkf4J-sg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02DE4344E1; Tue, 11 Jan 2022 12:07:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 388807B6E2; Tue, 11 Jan 2022 12:07:24 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net] mptcp: fix msk traversal in mptcp_nl_cmd_set_flags() Date: Tue, 11 Jan 2022 13:07:11 +0100 Message-Id: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The MPTCP endpoint list is under RCU protection, guarded by the pernet spinlock. mptcp_nl_cmd_set_flags() traverses the list without acquiring the spin-lock nor under the RCU critical section. This change addresses the issue performing the lookup and the endpoint update under the pernet spinlock. Fixes: 0f9f696a502e ("mptcp: add set_flags command in PM netlink") Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/pm_netlink.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index f12effa71942..20b9037c4906 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -478,6 +478,20 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsig= ned int id) return NULL; } =20 +static struct mptcp_pm_addr_entry * +__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *i= nfo, + bool lookup_by_id) +{ + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, &pernet->local_addr_list, list) { + if ((!lookup_by_id && addresses_equal(&entry->addr, info, true)) || + (lookup_by_id && entry->addr.id =3D=3D info->id)) + return entry; + } + return NULL; +} + static int lookup_id_by_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_inf= o *addr) { @@ -1757,18 +1771,21 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) return -EOPNOTSUPP; } =20 - list_for_each_entry(entry, &pernet->local_addr_list, list) { - if ((!lookup_by_id && addresses_equal(&entry->addr, &addr.addr, true)) || - (lookup_by_id && entry->addr.id =3D=3D addr.addr.id)) { - mptcp_nl_addr_backup(net, &entry->addr, bkup); - - if (bkup) - entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; - else - entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; - } + spin_lock_bh(&pernet->lock); + entry =3D __lookup_addr(pernet, &addr.addr, lookup_by_id); + if (!entry) { + spin_unlock_bh(&pernet->lock); + return -EINVAL; } =20 + if (bkup) + entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; + else + entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + addr =3D *entry; + spin_unlock_bh(&pernet->lock); + + mptcp_nl_addr_backup(net, &addr.addr, bkup); return 0; } =20 --=20 2.33.1