summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-03-24 13:21:06 +0100
committerMichael Biebl <biebl@debian.org>2012-03-24 13:39:55 +0100
commit26a7936d86b996aa7ddc0a3ff4a3bdc2d366d962 (patch)
treef1d6a724b1425e9e70b9a46e524df78c79d536fe
parentb310de0d210420dd12e45723d0823a3de4cc8f54 (diff)
debian/patches/10-format-security.patch: Fix format string vulnerability by using g_set_error_literal().
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/10-format-security.patch21
-rw-r--r--debian/patches/series1
3 files changed, 25 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5d58d115..6f369456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ network-manager (0.9.4.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/patches/04-ifupdown-support-dns-search-entries.patch: Removed,
     merged upstream.
+  * debian/patches/10-format-security.patch: Fix format string vulnerability
+    by using g_set_error_literal().
   * Refresh patches.
 
- -- Michael Biebl <biebl@debian.org>  Sat, 24 Mar 2012 01:40:55 +0100
+ -- Michael Biebl <biebl@debian.org>  Sat, 24 Mar 2012 13:17:55 +0100
 
 network-manager (0.9.2.0-2) unstable; urgency=low
 
diff --git a/debian/patches/10-format-security.patch b/debian/patches/10-format-security.patch
new file mode 100644
index 00000000..84e50288
--- /dev/null
+++ b/debian/patches/10-format-security.patch
@@ -0,0 +1,21 @@
+Description: Fix a format string vulnerability
+Author: Michael Biebl <biebl@debian.org>
+diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
+index 9f9f438..fe874ab 100644
+--- a/libnm-util/nm-setting-bond.c
++++ b/libnm-util/nm-setting-bond.c
+@@ -402,10 +402,10 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
+ 		    || !value[0]
+ 		    || (strlen (value) > 200)
+ 		    || strchr (value, ' ')) {
+-			g_set_error (error,
+-			             NM_SETTING_BOND_ERROR,
+-			             NM_SETTING_BOND_ERROR_INVALID_OPTION,
+-			             key);
++			g_set_error_literal (error,
++			                     NM_SETTING_BOND_ERROR,
++			                     NM_SETTING_BOND_ERROR_INVALID_OPTION,
++			                     key);
+ 			return FALSE;
+ 		}
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index fc215f9c..14b01b8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # Debian patches for network-manager
 02-dbus_access_network_manager.patch
 03-systemd.patch
+10-format-security.patch