From nobody Fri May 3 04:24:40 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp734803jam; Fri, 4 Feb 2022 17:02:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWuArb+Dr+hfaCPnGuKQY1pp1i30/yuQntyzrTcCSoIL6879+1hrifYbNQTzQFTQiviDmz X-Received: by 2002:ac8:4e4a:: with SMTP id e10mr1241595qtw.687.1644022971658; Fri, 04 Feb 2022 17:02:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644022971; cv=none; d=google.com; s=arc-20160816; b=zuV5YRXSgx7ioCo+KUOG+gER/DEb1kbVPIXNU8c7+dLjxN8pEzXLxQ6x2r43VXsSEl n1MhZbiZmFZMD0qZIiydTeTIzb//fkXh057WJ/uWpBewc41B4XzRp/fFtyxHfRV3l2G/ tU7mwGerqK0m7sUUBOBPXT5Tta/8e3/fwVNPpn2Dc+L0lBOonHPLkgSPnrGegvlJ8flB oRzmaJ77pYxZewATqZbWqc1n8CqI5Zm2czSjNk+EeN9AzYX20aMftNAeGnzgmxMnG97N v/U28WPD1pAXXwtHexwlzE5LRLjKrkUprr5DUXRNK0l0mYq3q3+UY7zt88JKwlsondT4 IGyQ== 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=G9noJ/RKUu270L4ASK4VnQx6e4YmAE/ASbBNgRGLyW0=; b=krFPDjNU+IChSLdufUCeUQXAfgOzApFP7MzYi+aKOixb1W0HRXSBiWnPyKu3WSj0dE qTOoW7blPMtDhSeUImv/XKTIzX3CthlmF4GDc+HAJyvEpGj4nmMWGFPi0GvkQbEJLzud Q7FBE2DaxT4rrvZdlMQuSNa1D4K2PNNj13iEC/mnu9jfoIWDLWx2Mj/wkwis6gec9bwt 9XoATOt0wMYWzb0k99QJdCC9MA9TRK/Pxe6h6wt61dVXCZeqMKhGJTHZYbEOi7kxJDIc fnmJ2C7VGIJkWh/l+/vQKrgEDv5cHIcA4MqmQflUPJU2KoZjLquR3vjArbuKHAUQ+Jyo sXFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="gbHhW/Lv"; spf=pass (google.com: domain of mptcp+bounces-3485-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3485-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id eq11si832069qvb.11.2022.02.04.17.02.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 17:02:51 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3485-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="gbHhW/Lv"; spf=pass (google.com: domain of mptcp+bounces-3485-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3485-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 125521C0D50 for ; Sat, 5 Feb 2022 01:02:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C624329CA; Sat, 5 Feb 2022 01:02:49 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 421162F25 for ; Sat, 5 Feb 2022 01:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644022968; x=1675558968; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xkyVW7E/+O7tWkj/9uNn3xGmnPUBci6DZeRuJO3bhE0=; b=gbHhW/Lv3C60J+MGR1i0BvFH/2bPgtJF3AhjLTWuTox+R4i0n3WcznDR GCSdRTg9Mo24BFj1SY3d+Yv/QM2wZ9yWDpHT8dxlu8QnboQdPUadPLXXg 6erwEZ9woK9CXx87xwzOKKr32gxCyr/e6v/YyzkFeadrvOL30Obm91sZb EbG3G+VDRNx6hk6PnhZ6d07HJOIPCjUa744IkYbgBAKPy2kIvOaXE750u dbnACOLfhLNRdm1UF81tAXs/qhctWO4NXGrg20LsV9dmD5G4ZHOMUiLH9 OGDwISMBcuaCiscXYq/mQxI8U8Jtub3dHRn5OoExoaoOSQPSc/n9knhkE w==; X-IronPort-AV: E=McAfee;i="6200,9189,10248"; a="272977435" X-IronPort-AV: E=Sophos;i="5.88,344,1635231600"; d="scan'208";a="272977435" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2022 17:02:37 -0800 X-IronPort-AV: E=Sophos;i="5.88,344,1635231600"; d="scan'208";a="535690177" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.231.200]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2022 17:02:36 -0800 From: Mat Martineau To: stable@vger.kernel.org Cc: Mat Martineau , mptcp@lists.linux.dev, Paolo Abeni Subject: [PATCH] mptcp: fix msk traversal in mptcp_nl_cmd_set_flags() Date: Fri, 4 Feb 2022 17:02:31 -0800 Message-Id: <20220205010231.189151-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 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" commit 8e9eacad7ec7a9cbf262649ebf1fa6e6f6cc7d82 upstream. The upstream commit had to handle a lookup_by_id variable that is only present in 5.17. This version of the patch removes that variable, so the __lookup_addr() function only handles the lookup as it is implemented in 5.15 and 5.16. It also removes one 'const' keyword to prevent a warning due to differing const-ness in the 5.17 version of addresses_equal(). 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. Cc: # 5.15.x Cc: # 5.16.x Fixes: 0f9f696a502e ("mptcp: add set_flags command in PM netlink") Acked-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 65764c8171b3..5d305fafd0e9 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -459,6 +459,18 @@ static unsigned int fill_remote_addresses_vec(struct m= ptcp_sock *msk, bool fullm return i; } =20 +static struct mptcp_pm_addr_entry * +__lookup_addr(struct pm_nl_pernet *pernet, struct mptcp_addr_info *info) +{ + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, &pernet->local_addr_list, list) { + if (addresses_equal(&entry->addr, info, true)) + return entry; + } + return NULL; +} + static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) { struct sock *sk =3D (struct sock *)msk; @@ -1725,17 +1737,21 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) bkup =3D 1; =20 - list_for_each_entry(entry, &pernet->local_addr_list, list) { - if (addresses_equal(&entry->addr, &addr.addr, true)) { - 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); + 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.35.1