[kernel] r17892 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Aug  7 20:36:57 2011
New Revision: 17892

Log:
perf: do not look at ./config for configuration (Closes: #632923)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Aug  7 18:46:27 2011	(r17891)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Aug  7 20:36:57 2011	(r17892)
@@ -41,7 +41,10 @@
   [ Moritz Muehlenhoff ]
   * ksm: fix NULL pointer dereference in scan_get_next_rmap_item() (CVE-2011-2183)
   * inet_diag: fix inet_diag_bc_audit() (CVE-2011-2213)
-	
+
+  [ Jonathan Nieder ]
+  * perf: do not look at ./config for configuration (Closes: #632923)
+
  -- maximilian attems <maks at debian.org>  Sat, 25 Jun 2011 10:22:27 +0200
 
 linux-2.6 (2.6.32-35) stable; urgency=high

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch	Sun Aug  7 20:36:57 2011	(r17892)
@@ -0,0 +1,51 @@
+Date: Fri, 5 Aug 2011 18:58:38 +0200
+From: Jonathan Nieder <jrnieder at gmail.com>
+Subject: [PATCH] perf: do not look at ./config for configuration
+
+In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for
+configuration in the file ./config, imitating git which looks at
+$GIT_DIR/config.  If ./config is not a perf configuration file, it
+fails, or worse, treats it as a configuration file and changes
+behavior in some unexpected way.
+
+"config" is not an unusual name for a file to be lying around and perf
+does not have a private directory dedicated for its own use, so let's
+just stop looking for configuration in the cwd.  Callers needing
+context-sensitive configuration can use the PERF_CONFIG environment
+variable.
+
+Requested-by: Christian Ohm <chr.ohm at gmx.net>
+Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
+---
+ tools/perf/util/config.c |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
+index e02d78ca..6c86eca8 100644
+--- a/tools/perf/util/config.c
++++ b/tools/perf/util/config.c
+@@ -399,7 +399,6 @@ static int perf_config_global(void)
+ int perf_config(config_fn_t fn, void *data)
+ {
+ 	int ret = 0, found = 0;
+-	char *repo_config = NULL;
+ 	const char *home = NULL;
+ 
+ 	/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
+@@ -421,12 +420,6 @@ int perf_config(config_fn_t fn, void *data)
+ 		free(user_config);
+ 	}
+ 
+-	repo_config = perf_pathdup("config");
+-	if (!access(repo_config, R_OK)) {
+-		ret += perf_config_from_file(fn, repo_config, data);
+-		found += 1;
+-	}
+-	free(repo_config);
+ 	if (found == 0)
+ 		return -1;
+ 	return ret;
+-- 
+1.7.6
+
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sun Aug  7 18:46:27 2011	(r17891)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sun Aug  7 20:36:57 2011	(r17892)
@@ -15,3 +15,4 @@
 + bugfix/all/drm-i915-Add-a-no-lvds-quirk-for-the-Asus-EeeBox-PC-.patch
 + bugfix/all/drm-radeon-kms-fix-for-radeon-on-systems-4GB-without.patch
 + bugfix/all/stable/2.6.32.43.patch
++ bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch