From nobody Tue Jan 27 18:44:35 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f0vTH5B0Qz6QG77 for ; Tue, 27 Jan 2026 18:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vTH18fqz3rfZ for ; Tue, 27 Jan 2026 18:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxBlrBmD9IxZ1Z4+MqNqQuexMmm4vguF9n9ncuoJYa4=; b=PygxpmZb8PEmven8fgaiG/GJMAV6TOhk4ioFq/8vd+bqEMQPCV8DUzeWmNwzieasJS3OpX c28Q5w3QSYDfZ5yUztAkLT/pLBi/zD0rvYE9vXy73U51Zjv7pvzN0dZ5faF1k61DPZ0mqN HDM9v9DpIh/qK2O2Ld+4UZ8ofhMsMGMx6dr9e65XQEAj/wApty00ZpTOhXfNnqaI1A/fax 3S4rg830mBIRGzBWMhKHwNzNdsD2dtCN/T6lJpEiRdbyMyBpELEE5yH+rPz+hHnWdrdAXE GyUz+wbth6is3XjOBcplEB9PjFcUxqHreEFvBa3AJyWnWqSretG9mz0v3VQR1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxBlrBmD9IxZ1Z4+MqNqQuexMmm4vguF9n9ncuoJYa4=; b=pp//SGPi9aiA1amCgW+N+Kuq8elODbkcf5Chg+Ij4474eLlkARdytGmPrn5fFhMsgA5xY3 exYeu8dEf71awzlJzRA1DYM2pc7tOc1UostZuf4F49Nl2nnghZBpBUQ8/I67tJtNEc54Ty XN9e38022FM3oNuV5eNj02H/FStwxUMCfh7NkDfCAp47VKmR9pRS05RQzrs5HFTM3EDm5/ yh5FJZBkDBYZloOaY37H3TJDzMhNT89H1HiXxd0nI2S9Ehxg7O+dopJTStQy0RwjX2Aok1 dYRbxhANPe0U29ZXWi32FyucVD+cPzGLmQT4FO6XR7TxDIbU+xJfdK31NAU/Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539475; a=rsa-sha256; cv=none; b=JgP2p/fj9rozukw/Msz28KGM7zVaTmQW71dZGdodL+B3WCGSp5ghAXGGJ6cRIdn4jUSNQy YCHtptxgoLHmhy/HNiWIGHVf82s5FcnVizpKhn4hdb3tyMmaqmK6Ds8oT8h6pCWKBhZmjr IFfX96z/sqlb0GaRCeMGbomphENMhQ3/fTox6f7qpqDU3M2SXAN+83hor9fdNUveAQBpTj cMgUfeV9gbzyb3xA68QpkELNKT8U9zLlGPTCwOSyigA50M7OJ7TIUzJtsTKZ3O6vgxc9QG rXNEOXQz8L52aH94aJ5VM7Yz/t2raqRtysYxw1CBosuL6ctVm//Vr190YApOtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vTH0ZjKz3Yc for ; Tue, 27 Jan 2026 18:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f7e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4054439b47f2 - stable/14 - ctld: Do not remove item from an nvlist while iterating it List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4054439b47f2b58fa038c3fed8efc6b0be7b624c Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:35 +0000 Message-Id: <69790793.f7e4.1891fbd2@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4054439b47f2b58fa038c3fed8efc6b0be7b624c commit 4054439b47f2b58fa038c3fed8efc6b0be7b624c Author: John Baldwin AuthorDate: 2025-04-11 14:02:48 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +0000 ctld: Do not remove item from an nvlist while iterating it While here, make use of cnvlist_* to simplify this code. Fixes: d42a73fb6a85 ("ctld: Add a dedicated API between parse.y and the rest of the program") Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49650 (cherry picked from commit 30020689fb1e5c9549e430bd23600c88e1257697) --- usr.sbin/ctld/kernel.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index cda84872e269..b1b6e36a5c87 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -636,12 +637,12 @@ retry_port: NULL) { if (strcmp(key, "file") == 0 || strcmp(key, "dev") == 0) { - cl->l_path = nvlist_take_string(lun->attr_list, - key); + cl->l_path = checked_strdup( + cnvlist_get_string(cookie)); continue; } nvlist_add_string(cl->l_options, key, - nvlist_get_string(lun->attr_list, key)); + cnvlist_get_string(cookie)); error = nvlist_error(cl->l_options); if (error != 0) log_warnc(error, "unable to add CTL lun option "