[gentoo-commits] gentoo-x86 commit in x11-misc/colord/files: colord-0.1.14-sql-injections-2.patch colord-0.1.14-sql-injections.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    11/11/25 18:15:24

  Added:                colord-0.1.14-sql-injections-2.patch
                        colord-0.1.14-sql-injections.patch
  Log:
  Add patches to fix SQL injections (bug #391879, thanks to Agostino Sarubbo for reporting). Allow building against freebsd's libusb (bug #387959, thanks to Naohiro Aota). Drop old versions.
  
  (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/colord/files/colord-0.1.14-sql-injections-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/files/colord-0.1.14-sql-injections-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/files/colord-0.1.14-sql-injections-2.patch?rev=1.1&content-type=text/plain

Index: colord-0.1.14-sql-injections-2.patch
===================================================================
From 36549e0ed255e7dfa7852d08a75dd5f00cbd270e Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@××××.de>
Date: Fri, 25 Nov 2011 11:14:21 +0100
Subject: [PATCH] fix more sql injections

https://bugs.freedesktop.org/show_bug.cgi?id=42904

Signed-off-by: Richard Hughes <richard@×××××××.com>
---
 src/cd-device-db.c |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/cd-device-db.c b/src/cd-device-db.c
index 808a338..e69fa64 100644
--- a/src/cd-device-db.c
+++ b/src/cd-device-db.c
@@ -151,8 +151,8 @@ cd_device_db_add (CdDeviceDb *ddb,
 	g_return_val_if_fail (ddb->priv->db != NULL, FALSE);
 
 	g_debug ("CdDeviceDb: add device %s", device_id);
-	statement = g_strdup_printf ("INSERT INTO devices (device_id) "
-				     "VALUES ('%s')",
+	statement = sqlite3_mprintf ("INSERT INTO devices (device_id) "
+				     "VALUES ('%q')",
 				     device_id);
 
 	/* insert the entry */
@@ -168,7 +168,7 @@ cd_device_db_add (CdDeviceDb *ddb,
 		goto out;
 	}
 out:
-	g_free (statement);
+	sqlite3_free (statement);
 	return ret;
 }
 
@@ -191,9 +191,9 @@ cd_device_db_set_property (CdDeviceDb *ddb,
 	g_return_val_if_fail (ddb->priv->db != NULL, FALSE);
 
 	g_debug ("CdDeviceDb: add device %s [%s=%s]", device_id, property, value);
-	statement = g_strdup_printf ("INSERT INTO properties (device_id, "
+	statement = sqlite3_mprintf ("INSERT INTO properties (device_id, "
 				     "property, value) "
-				     "VALUES ('%s', '%s', '%s')",
+				     "VALUES ('%q', '%q', '%q')",
 				     device_id, property, value);
 
 	/* insert the entry */
@@ -209,7 +209,7 @@ cd_device_db_set_property (CdDeviceDb *ddb,
 		goto out;
 	}
 out:
-	g_free (statement);
+	sqlite3_free (statement);
 	return ret;
 }
 
@@ -232,8 +232,8 @@ cd_device_db_remove (CdDeviceDb *ddb,
 
 	/* remove the entry */
 	g_debug ("CdDeviceDb: remove device %s", device_id);
-	statement1 = g_strdup_printf ("DELETE FROM devices WHERE "
-				     "device_id = '%s';",
+	statement1 = sqlite3_mprintf ("DELETE FROM devices WHERE "
+				     "device_id = '%q';",
 				     device_id);
 	rc = sqlite3_exec (ddb->priv->db, statement1, NULL, NULL, &error_msg);
 	if (rc != SQLITE_OK) {
@@ -246,8 +246,8 @@ cd_device_db_remove (CdDeviceDb *ddb,
 		ret = FALSE;
 		goto out;
 	}
-	statement2 = g_strdup_printf ("DELETE FROM properties WHERE "
-				     "device_id = '%s';",
+	statement2 = sqlite3_mprintf ("DELETE FROM properties WHERE "
+				     "device_id = '%q';",
 				     device_id);
 	rc = sqlite3_exec (ddb->priv->db, statement2, NULL, NULL, &error_msg);
 	if (rc != SQLITE_OK) {
@@ -261,8 +261,8 @@ cd_device_db_remove (CdDeviceDb *ddb,
 		goto out;
 	}
 out:
-	g_free (statement1);
-	g_free (statement2);
+	sqlite3_free (statement1);
+	sqlite3_free (statement2);
 	return ret;
 }
 
@@ -302,9 +302,9 @@ cd_device_db_get_property (CdDeviceDb *ddb,
 	g_return_val_if_fail (ddb->priv->db != NULL, FALSE);
 
 	g_debug ("CdDeviceDb: get property %s for %s", property, device_id);
-	statement = g_strdup_printf ("SELECT value FROM properties WHERE "
-				     "device_id = '%s' AND "
-				     "property = '%s' LIMIT 1;",
+	statement = sqlite3_mprintf ("SELECT value FROM properties WHERE "
+				     "device_id = '%q' AND "
+				     "property = '%q' LIMIT 1;",
 				     device_id, property);
 
 	/* remove the entry */
@@ -338,7 +338,7 @@ cd_device_db_get_property (CdDeviceDb *ddb,
 	value = g_strdup (g_ptr_array_index (array_tmp, 0));
 out:
 	g_ptr_array_unref (array_tmp);
-	g_free (statement);
+	sqlite3_free (statement);
 	return value;
 }
 
@@ -360,7 +360,7 @@ cd_device_db_get_devices (CdDeviceDb *ddb,
 
 	/* get all the devices */
 	g_debug ("CdDeviceDb: get devices");
-	statement = g_strdup_printf ("SELECT device_id FROM devices;");
+	statement = sqlite3_mprintf ("SELECT device_id FROM devices;");
 	array_tmp = g_ptr_array_new_with_free_func (g_free);
 	rc = sqlite3_exec (ddb->priv->db,
 			   statement,
@@ -381,7 +381,7 @@ cd_device_db_get_devices (CdDeviceDb *ddb,
 	array = g_ptr_array_ref (array_tmp);
 out:
 	g_ptr_array_unref (array_tmp);
-	g_free (statement);
+	sqlite3_free (statement);
 	return array;
 }
 
@@ -404,8 +404,8 @@ cd_device_db_get_properties (CdDeviceDb *ddb,
 
 	/* get all the devices */
 	g_debug ("CdDeviceDb: get properties for device %s", device_id);
-	statement = g_strdup_printf ("SELECT property FROM properties "
-				     "WHERE device_id = '%s';",
+	statement = sqlite3_mprintf ("SELECT property FROM properties "
+				     "WHERE device_id = '%q';",
 				     device_id);
 	array_tmp = g_ptr_array_new_with_free_func (g_free);
 	rc = sqlite3_exec (ddb->priv->db,
@@ -427,7 +427,7 @@ cd_device_db_get_properties (CdDeviceDb *ddb,
 	array = g_ptr_array_ref (array_tmp);
 out:
 	g_ptr_array_unref (array_tmp);
-	g_free (statement);
+	sqlite3_free (statement);
 	return array;
 }
 
-- 
1.7.8.rc3




1.1                  x11-misc/colord/files/colord-0.1.14-sql-injections.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/files/colord-0.1.14-sql-injections.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/files/colord-0.1.14-sql-injections.patch?rev=1.1&content-type=text/plain

Index: colord-0.1.14-sql-injections.patch
===================================================================
From 1fadd90afcb4bbc47513466ee9bb1e4a8632ac3b Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@×××××.org>
Date: Mon, 14 Nov 2011 10:51:29 +0100
Subject: [PATCH] Use sqlite3_mprintf() to avoid SQL injections

https://bugs.freedesktop.org/show_bug.cgi?id=42904

Signed-off-by: Richard Hughes <richard@×××××××.com>
---
 src/cd-mapping-db.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/cd-mapping-db.c b/src/cd-mapping-db.c
index 6e1f4f3..e59a058 100644
--- a/src/cd-mapping-db.c
+++ b/src/cd-mapping-db.c
@@ -162,8 +162,8 @@ cd_mapping_db_add (CdMappingDb *mdb,
 	g_debug ("CdMappingDb: add %s<=>%s",
 		 device_id, profile_id);
 	timestamp = g_get_real_time ();
-	statement = g_strdup_printf ("INSERT INTO mappings (device, profile, timestamp) "
-				     "VALUES ('%s', '%s', %"G_GINT64_FORMAT")",
+	statement = sqlite3_mprintf ("INSERT INTO mappings (device, profile, timestamp) "
+				     "VALUES ('%q', '%q', %"G_GINT64_FORMAT")",
 				     device_id, profile_id, timestamp);
 
 	/* insert the entry */
@@ -179,7 +179,7 @@ cd_mapping_db_add (CdMappingDb *mdb,
 		goto out;
 	}
 out:
-	g_free (statement);
+	sqlite3_free (statement);
 	return ret;
 }
 /**
@@ -203,8 +203,8 @@ cd_mapping_db_update_timestamp (CdMappingDb *mdb,
 	g_debug ("CdMappingDb: update timestamp %s<=>%s",
 		 device_id, profile_id);
 	timestamp = g_get_real_time ();
-	statement = g_strdup_printf ("UPDATE mappings SET timestamp = %"G_GINT64_FORMAT
-				     " WHERE device = '%s' AND profile = '%s';",
+	statement = sqlite3_mprintf ("UPDATE mappings SET timestamp = %"G_GINT64_FORMAT
+				     " WHERE device = '%q' AND profile = '%q';",
 				     timestamp, device_id, profile_id);
 
 	/* update the entry */
@@ -220,7 +220,7 @@ cd_mapping_db_update_timestamp (CdMappingDb *mdb,
 		goto out;
 	}
 out:
-	g_free (statement);
+	sqlite3_free (statement);
 	return ret;
 }
 
@@ -242,8 +242,8 @@ cd_mapping_db_remove (CdMappingDb *mdb,
 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
 
 	g_debug ("CdMappingDb: remove %s<=>%s", device_id, profile_id);
-	statement = g_strdup_printf ("DELETE FROM mappings WHERE "
-				     "device = '%s' AND profile = '%s';",
+	statement = sqlite3_mprintf ("DELETE FROM mappings WHERE "
+				     "device = '%q' AND profile = '%q';",
 				     device_id, profile_id);
 
 	/* remove the entry */
@@ -259,7 +259,7 @@ cd_mapping_db_remove (CdMappingDb *mdb,
 		goto out;
 	}
 out:
-	g_free (statement);
+	sqlite3_free (statement);
 	return ret;
 }
 
@@ -301,8 +301,8 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
 
 	g_debug ("CdMappingDb: get profiles for %s", device_id);
-	statement = g_strdup_printf ("SELECT profile FROM mappings WHERE "
-				     "device = '%s' ORDER BY timestamp ASC;", device_id);
+	statement = sqlite3_mprintf ("SELECT profile FROM mappings WHERE "
+				     "device = '%q' ORDER BY timestamp ASC;", device_id);
 
 	/* remove the entry */
 	array_tmp = g_ptr_array_new_with_free_func (g_free);
@@ -325,7 +325,7 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
 	array = g_ptr_array_ref (array_tmp);
 out:
 	g_ptr_array_unref (array_tmp);
-	g_free (statement);
+	sqlite3_free (statement);
 	return array;
 }
 
@@ -350,8 +350,8 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
 
 	g_debug ("CdMappingDb: get devices for %s", profile_id);
-	statement = g_strdup_printf ("SELECT device FROM mappings WHERE "
-				     "profile = '%s' ORDER BY timestamp ASC;", profile_id);
+	statement = sqlite3_mprintf ("SELECT device FROM mappings WHERE "
+				     "profile = '%q' ORDER BY timestamp ASC;", profile_id);
 
 	/* remove the entry */
 	array_tmp = g_ptr_array_new_with_free_func (g_free);
@@ -374,7 +374,7 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
 	array = g_ptr_array_ref (array_tmp);
 out:
 	g_ptr_array_unref (array_tmp);
-	g_free (statement);
+	sqlite3_free (statement);
 	return array;
 }
 
@@ -416,8 +416,8 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
 
 	g_debug ("CdMappingDb: get checksum for %s<->%s",
 		 device_id, profile_id);
-	statement = g_strdup_printf ("SELECT timestamp FROM mappings WHERE "
-				     "device = '%s' AND profile = '%s' "
+	statement = sqlite3_mprintf ("SELECT timestamp FROM mappings WHERE "
+				     "device = '%q' AND profile = '%q' "
 				     "LIMIT 1;", device_id, profile_id);
 
 	/* query the checksum */
@@ -436,7 +436,7 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
 		goto out;
 	}
 out:
-	g_free (statement);
+	sqlite3_free (statement);
 	return timestamp;
 }
 
-- 
1.7.8.rc3