Hi Salvatore,
On Fri, Nov 13, 2026 at 10:19:09AM +0100, Salvatore Bonaccorso wrote:
> Hi Guido,
> 
> On Thu, Nov 12, 2026 at 07:59:05PM +0100, Guido Günther wrote:
> > Hi Salvatore,
> > On Thu, Sep 17, 2026 at 08:29:05AM +0200, Salvatore Bonaccorso wrote:
> > > Source: network-manager-iodine
> > > Version: 1.2.0-3.3
> > > Severity: grave
> > > Tags: security upstream
> > > Justification: user security hole
> > > Forwarded: 
> > > https://gitlab.gnome.org/GNOME/network-manager-iodine/-/work_items/4
> > > X-Debbugs-Cc: [email protected], Debian Security Team 
> > > <[email protected]>
> > > 
> > > Hi,
> > > 
> > > The following vulnerability was published for network-manager-iodine.
> > > 
> > > CVE-2026-91837[0]:
> > > | network-manager-iodine: Option confusion reaches iodine's pre-drop
> > > | root shell
> > 
> > Should the Trixie update happen via s.d.o or via a stable update?
> 
> We have network-manager-iodine in our dsa-needed list, so a DSA is
> fine, but we have some backlog to handle. Can you prepare an update?
> The alternative is defintively as well given the timing a point
> release, but SRM would need to accept the upload this upcoming
> weekend, and I know they have as well quite some substantial load. So
> let's stick I guess to the orginal plan of releasing a DSA.

I have the package for trixie already prepared. Diff is attached,
there's no urgency. Just let me know if this looks o.k. and if I should
upload to security-master directly or if DSA wants to pick it up
(whatever is the *least* effor for you).

Cheers,
 -- Guido

> 
> Regards,
> Salvatore
> 
diff --git a/debian/changelog b/debian/changelog
index 230efc4..d0fc903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager-iodine (1.2.0-4) unstable; urgency=medium
+
+  * Backport patches to fix CVE-2026-91837 (Closes: #1148114)
+
+ -- Guido Günther <[email protected]>  Thu, 12 Nov 2026 19:49:23 +0100
+
 network-manager-iodine (1.2.0-3.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index c7caf59..1a4536d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = debian/sid
+debian-branch = debian/trixie
 upstream-tag = v%(version)s
-upstream-branch = master
+upstream-branch = upstream
diff --git a/debian/patches/series b/debian/patches/series
index 7aa0e10..05599a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,6 @@ appdata-rename-the-xml-file.patch
 Let-dh-handle-any-autoreconf-configure-invocations.patch
 Install-appdata-into-metainfo.patch
 Use-full-path-to-auth-dialog-in-service-file.patch
+service-Move-user-controlled-options-together.patch
+service-Validate-fragsize.patch
+service-Use-option-separator.patch
diff --git a/debian/patches/service-Move-user-controlled-options-together.patch b/debian/patches/service-Move-user-controlled-options-together.patch
new file mode 100644
index 0000000..3e35915
--- /dev/null
+++ b/debian/patches/service-Move-user-controlled-options-together.patch
@@ -0,0 +1,40 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <[email protected]>
+Date: Sat, 12 Sep 2026 14:10:32 +0200
+Subject: service: Move user controlled options together
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Guido Günther <[email protected]>
+---
+ src/nm-iodine-service.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/nm-iodine-service.c b/src/nm-iodine-service.c
+index 89023d4..035c169 100644
+--- a/src/nm-iodine-service.c
++++ b/src/nm-iodine-service.c
+@@ -459,11 +459,6 @@ nm_iodine_start_iodine_binary (NMIodinePlugin *plugin,
+ 	/* Run in foreground */
+ 	g_ptr_array_add (iodine_argv, (gpointer) "-f");
+ 
+-	if (props_fragsize && strlen(props_fragsize)) {
+-		g_ptr_array_add (iodine_argv, (gpointer) "-m");
+-		g_ptr_array_add (iodine_argv, (gpointer) props_fragsize);
+-	}
+-
+ 	if (has_user(NM_IODINE_USER)) {
+ 		g_ptr_array_add (iodine_argv, (gpointer) "-u");
+ 		g_ptr_array_add (iodine_argv, (gpointer) NM_IODINE_USER);
+@@ -476,6 +471,11 @@ nm_iodine_start_iodine_binary (NMIodinePlugin *plugin,
+ 	} else
+ 		g_warning("Not running chrooted");
+ 
++	if (props_fragsize && strlen(props_fragsize)) {
++		g_ptr_array_add (iodine_argv, (gpointer) "-m");
++		g_ptr_array_add (iodine_argv, (gpointer) props_fragsize);
++	}
++
+ 	if (props_nameserver && strlen(props_nameserver))
+ 		g_ptr_array_add (iodine_argv, (gpointer) props_nameserver);
+ 
diff --git a/debian/patches/service-Use-option-separator.patch b/debian/patches/service-Use-option-separator.patch
new file mode 100644
index 0000000..35f7457
--- /dev/null
+++ b/debian/patches/service-Use-option-separator.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <[email protected]>
+Date: Thu, 12 Nov 2026 08:04:28 +0100
+Subject: service: Use option separator
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+This prevents domain names being treated as options
+
+Signed-off-by: Guido Günther <[email protected]>
+---
+ src/nm-iodine-service.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/nm-iodine-service.c b/src/nm-iodine-service.c
+index 162fa0a..fa0ca6f 100644
+--- a/src/nm-iodine-service.c
++++ b/src/nm-iodine-service.c
+@@ -476,6 +476,8 @@ nm_iodine_start_iodine_binary (NMIodinePlugin *plugin,
+ 		g_ptr_array_add (iodine_argv, (gpointer) props_fragsize);
+ 	}
+ 
++	g_ptr_array_add (iodine_argv, (gpointer) "--");
++
+ 	if (props_nameserver && strlen(props_nameserver))
+ 		g_ptr_array_add (iodine_argv, (gpointer) props_nameserver);
+ 
diff --git a/debian/patches/service-Validate-fragsize.patch b/debian/patches/service-Validate-fragsize.patch
new file mode 100644
index 0000000..1a42ee5
--- /dev/null
+++ b/debian/patches/service-Validate-fragsize.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <[email protected]>
+Date: Thu, 12 Nov 2026 08:16:18 +0100
+Subject: service: Validate fragsize
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+We already have a validation for ints, use it
+
+Signed-off-by: Guido Günther <[email protected]>
+---
+ src/nm-iodine-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nm-iodine-service.c b/src/nm-iodine-service.c
+index 035c169..162fa0a 100644
+--- a/src/nm-iodine-service.c
++++ b/src/nm-iodine-service.c
+@@ -81,7 +81,7 @@ typedef struct {
+ static ValidProperty valid_properties[] = {
+ 	{ NM_IODINE_KEY_TOPDOMAIN,  G_TYPE_STRING, 0, 0 },
+ 	{ NM_IODINE_KEY_NAMESERVER, G_TYPE_STRING, 0, 0 },
+-	{ NM_IODINE_KEY_FRAGSIZE,   G_TYPE_STRING, 0, 0 },
++	{ NM_IODINE_KEY_FRAGSIZE,   G_TYPE_INT, 1, 65535 },
+ 	{ NULL,                     G_TYPE_NONE, 0, 0 }
+ };
+ 

Reply via email to