Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2229860/?format=api
{ "id": 2229860, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2229860/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-55-andrei.otcheretianski@intel.com/", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.1/projects/22/?format=api", "name": "HostAP Development", "link_name": "hostap", "list_id": "hostap.lists.infradead.org", "list_email": "hostap@lists.infradead.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260428200639.40243-55-andrei.otcheretianski@intel.com>", "date": "2026-04-28T20:05:55", "name": "[54/97] NAN: Terminate all NDPs with peer if security upgrade fails", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a67dd2019937d92a31018fdf62f49f16ad034427", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.1/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-55-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 501927, "url": "http://patchwork.ozlabs.org/api/1.1/series/501927/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/list/?series=501927", "date": "2026-04-28T20:05:05", "name": "NAN: Group keys support, schedule update and more", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/501927/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2229860/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2229860/checks/", "tags": {}, "headers": { "Return-Path": "\n <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=bZmiGOQd;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=ReVSmU4y;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g4s6l1CxWz1xrS\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 29 Apr 2026 06:12:31 +1000 (AEST)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHomg-00000002I8c-0nW6;\n\tTue, 28 Apr 2026 20:11:54 +0000", "from mgamail.intel.com ([198.175.65.16])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHok4-00000002CcZ-1Y0F\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:09:18 +0000", "from fmviesa001.fm.intel.com ([10.60.135.141])\n by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 13:08:38 -0700", "from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 13:08:37 -0700" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=VxgAjpCA+91sj1FaYFmyupdn2vtGUTd4x+xWQgrbmPk=; b=bZmiGOQdWMpUum\n\tPGqLJojOQV1axZljyIe7acmmRObHJexsV+7ls7RwDDE9PLurMNBlwWRf8qa79H2cPSH9s5bXasyWr\n\tRUDJNkNjZzCgPpnMit2wwgRqMyGwayoJZMvP8xwi3kq54tZaPo+xK4zryHcx6AEJnGSqAjUzyr6Jn\n\tHUin1RDNe0wpKRha25h+oeHS5D/yhLjAqE3vvHCOn/hOEKrm/QhvpkpO8beYua2yxIKerCbM2Yazu\n\tLJcuh3CgvGuZghpf/7gMHh/fy8QrWM4OnZeWeE+QBmz3mjt5deo9zH0pXESYgEGT541Dn1Epf6LbT\n\tmzrqWCpU7xHyKZym62XQ==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406952; x=1808942952;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=bZ+WSEsHEJxkEt6gY60ArrY6lsh1E/2kaJ11WRHDrxk=;\n b=ReVSmU4yWlaf2mQg7YrJ6Chbspc2yqQUhFkIkHu+rqKr6ixncQANiRc/\n vhS9Kv5g6Bt/9/sRIlfLEUS+kGzG+5W3/9Cn9nuxCC9CW89fiqq8lGBix\n ouzT4Kyn/PloGqEOlA3qIj+eaOHmQUDkgABL47hVWGUo6d7HVweDMgAa9\n Aq47NBfriXKkSkFg+obizcMBxlQTZziw1Za5NmyQw0+KMpmDLskcZoKCb\n rkzwxhAKWMdTsVHuWUoXxAHpRT5VspzoDb/zPF6FIaz51t5tUjYOtZ+J6\n Py6abCXABTEvndP6pHsxLPv2mvntJoTl3P+DSopcIo3Zp8nxfRN4MlPH9\n w==;" ], "X-CSE-ConnectionGUID": [ "HbQU/PNVT9q3nUDB85MFUw==", "I9cl0ZKhStWnQ+91hw/dyA==" ], "X-CSE-MsgGUID": [ "wFXqjjaOQziDw/9HZrhF+Q==", "obOrujZHTJmHu47wSZgNVg==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11770\"; a=\"78519459\"", "E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519459\"", "E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610538\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Cc": "vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tAndrei Otcheretianski <andrei.otcheretianski@intel.com>", "Subject": "[PATCH 54/97] NAN: Terminate all NDPs with peer if security upgrade\n fails", "Date": "Tue, 28 Apr 2026 23:05:55 +0300", "Message-ID": "<20260428200639.40243-55-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260428200639.40243-1-andrei.otcheretianski@intel.com>", "References": "<20260428200639.40243-1-andrei.otcheretianski@intel.com>", "MIME-Version": "1.0", "X-CRM114-Version": "20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ", "X-CRM114-CacheID": "sfid-20260428_130912_605518_10184015 ", "X-CRM114-Status": "GOOD ( 16.83 )", "X-Spam-Score": "-4.5 (----)", "X-Spam-Report": "Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: When new NDP is created, it may be needed to \"upgrade\" the\n existing NDPs with the same peer. However,\n this security upgrade is not trivial\n and if it fails, it might be difficult to restore the previou [...]\n Content analysis details: (-4.5 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,\n medium trust\n [198.175.65.16 listed in list.dnswl.org]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.1 DKIMWL_WL_HIGH DKIMwl.org - High trust sender", "X-BeenThere": "hostap@lists.infradead.org", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "<hostap.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/hostap/>", "List-Post": "<mailto:hostap@lists.infradead.org>", "List-Help": "<mailto:hostap-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"Hostap\" <hostap-bounces@lists.infradead.org>", "Errors-To": "hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "When new NDP is created, it may be needed to \"upgrade\" the existing NDPs\nwith the same peer. However, this security upgrade is not trivial and if\nit fails, it might be difficult to restore the previous state, thus all\nthe NDPs should be terminated.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n src/nan/nan.c | 46 ++++++++++++++++++++++++++++++---\n src/nan/nan.h | 5 +++-\n wpa_supplicant/nan_supplicant.c | 15 ++++++++---\n 3 files changed, 58 insertions(+), 8 deletions(-)", "diff": "diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 4f69f85c01..1e2f625405 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1639,9 +1639,39 @@ static bool nan_peer_ndi_in_use(struct nan_peer *peer, const u8 *peer_ndi)\n }\n \n \n+static void nan_terminate_ndps_for_ndi(struct nan_data *nan,\n+\t\t\t\t struct nan_peer *peer,\n+\t\t\t\t const u8 *peer_ndi)\n+{\n+\tstruct nan_ndp *ndp, *tndp, *curr_ndp;\n+\n+\tcurr_ndp = peer->ndp_setup.ndp;\n+\n+\tdl_list_for_each_safe(ndp, tndp, &peer->ndps, struct nan_ndp, list) {\n+\t\tconst u8 *ndp_peer_ndi = ndp->initiator ?\n+\t\t\tndp->resp_ndi : ndp->init_ndi;\n+\n+\t\tif (!ether_addr_equal(ndp_peer_ndi, peer_ndi))\n+\t\t\tcontinue;\n+\n+\t\tdl_list_del(&ndp->list);\n+\n+\t\t/* Temporarily set the NDP being disconnected */\n+\t\tpeer->ndp_setup.ndp = ndp;\n+\t\tnan_ndp_disconnected(nan, peer,\n+\t\t\t\t NAN_REASON_UNSPECIFIED_REASON,\n+\t\t\t\t true);\n+\t}\n+\n+\t/* Restore the current NDP */\n+\tpeer->ndp_setup.ndp = curr_ndp;\n+}\n+\n+\n static int nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n {\n \tstruct nan_ndp_connection_params params;\n+\tint ret;\n \n \tos_memset(¶ms, 0, sizeof(params));\n \n@@ -1685,10 +1715,18 @@ static int nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n \t}\n \n \tparams.new_ndi_sta = !nan_peer_ndi_in_use(peer, params.peer_ndi);\n-\tif (nan->cfg->ndp_connected &&\n-\t nan->cfg->ndp_connected(nan->cfg->cb_ctx, ¶ms)) {\n-\t\twpa_printf(MSG_DEBUG, \"NAN: NDP connected notification failed\");\n-\t\treturn -1;\n+\tif (nan->cfg->ndp_connected) {\n+\t\tret = nan->cfg->ndp_connected(nan->cfg->cb_ctx, ¶ms);\n+\t\tif (ret) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: NDP connected notification failed ret=%d\",\n+\t\t\t\t ret);\n+\t\t\tif (ret == -2)\n+\t\t\t\tnan_terminate_ndps_for_ndi(nan, peer,\n+\t\t\t\t\t\t\t params.peer_ndi);\n+\n+\t\t\treturn ret;\n+\t\t}\n \t}\n \n \t/* Move the NDP to the list of tracked NDPs */\ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 8b23f1ae93..1cded92519 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -512,7 +512,10 @@ struct nan_config {\n \t * ndp_connected - Notify that NDP was successfully connected\n \t * @ctx: Callback context from cb_ctx\n \t * @params: NDP connection parameters\n-\t * Returns: 0 on success, -1 on failure\n+\t * Returns: 0 on success, negative on failure. Note that new NDPs\n+\t * may trigger security upgrade for the peer NDI station.\n+\t * If this fails, -2 is returned and the caller should cleanup\n+\t * all the existing NDPs with this peer NDI.\n \t */\n \tint (*ndp_connected)(void *ctx,\n \t\t\t struct nan_ndp_connection_params *params);\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 774012da21..e2f49f24b6 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -679,9 +679,16 @@ out_success:\n \treturn 0;\n \n remove_sta:\n+\t/*\n+\t * Cleanup the NDI station if it was newly added for this NDP.\n+\t * For existing stations, we assume that the caller will\n+\t * tear down other NDPs with this station on failure as\n+\t * it may be now in some inconsistent state that is too hard\n+\t * to rollback here.\n+\t */\n \tif (params->new_ndi_sta)\n \t\twpa_drv_sta_remove(ndi_wpa_s, params->peer_ndi);\n-\treturn -1;\n+\treturn -2;\n }\n \n \n@@ -737,11 +744,13 @@ static int wpas_nan_ndp_connected_cb(void *ctx,\n \t\t\t\t struct nan_ndp_connection_params *params)\n {\n \tstruct wpa_supplicant *wpa_s = ctx;\n+\tint ret;\n \n-\tif (wpas_nan_add_ndi_sta(wpa_s, params) < 0) {\n+\tret = wpas_nan_add_ndi_sta(wpa_s, params);\n+\tif (ret) {\n \t\twpa_printf(MSG_INFO,\n \t\t\t \"NAN: Failed to add NDI station for NDP connection\");\n-\t\treturn -1;\n+\t\treturn ret;\n \t}\n \n \twpas_notify_nan_ndp_connected(wpa_s, params->ndp_id.peer_nmi,\n", "prefixes": [ "54/97" ] }