[kernel] r22736 - in dists/jessie/linux/debian: . patches patches/features/all

[Ian James Campbell]

Author: ijc
Date: Tue Jun  9 18:18:01 2015
New Revision: 22736

Log:
of: make sure of_alias is initialized before accessing it. (Closes: #784053)

Added:
   dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch
Modified:
   dists/jessie/linux/debian/changelog
   dists/jessie/linux/debian/patches/series

Modified: dists/jessie/linux/debian/changelog
==============================================================================
--- dists/jessie/linux/debian/changelog	Mon Jun  8 14:18:48 2015	(r22735)
+++ dists/jessie/linux/debian/changelog	Tue Jun  9 18:18:01 2015	(r22736)
@@ -5,6 +5,8 @@
 
   [ Ian Campbell ]
   * [xen] xen-netback: return correct ethtool stats (Closes: #786936)
+  * of: make sure of_alias is initialized before accessing it.
+    (Closes: #784053)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 26 May 2015 01:42:36 +0100
 

Added: dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch	Tue Jun  9 18:18:01 2015	(r22736)
@@ -0,0 +1,45 @@
+From 7dbe5849fb50fc9b5b77a8f590c87a577ddc9bb6 Mon Sep 17 00:00:00 2001
+From: Laurentiu Tudor <b10716 at freescale.com>
+Date: Wed, 27 Aug 2014 17:09:39 +0300
+Subject: [PATCH] of: make sure of_alias is initialized before accessing it
+Origin: http://git.kernel.org/linus/7dbe5849fb50fc9b5b77a8f590c87a577ddc9bb6
+
+Simply swap of_alias and of_chosen initialization so
+that of_alias ends up read first. This must be done
+because it is accessed couple of lines below when
+trying to initialize the of_stdout using the alias
+based legacy method.
+
+[Fixes a752ee5 - tty: Update hypervisor tty drivers to
+use core stdout parsing code]
+
+Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor at freescale.com>
+[glikely: Don't move the 'if (!of_aliases)' test]
+Signed-off-by: Grant Likely <grant.likely at linaro.org>
+---
+ drivers/of/base.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/of/base.c b/drivers/of/base.c
+index 7af64c4..293ed4b 100644
+--- a/drivers/of/base.c
++++ b/drivers/of/base.c
+@@ -1859,6 +1859,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
+ {
+ 	struct property *pp;
+ 
++	of_aliases = of_find_node_by_path("/aliases");
+ 	of_chosen = of_find_node_by_path("/chosen");
+ 	if (of_chosen == NULL)
+ 		of_chosen = of_find_node_by_path("/chosen at 0");
+@@ -1874,7 +1875,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
+			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
+ 	}
+ 
+-	of_aliases = of_find_node_by_path("/aliases");
+ 	if (!of_aliases)
+ 		return;
+ 
+-- 
+2.1.4
+

Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series	Mon Jun  8 14:18:48 2015	(r22735)
+++ dists/jessie/linux/debian/patches/series	Tue Jun  9 18:18:01 2015	(r22736)
@@ -252,6 +252,7 @@
 features/all/of-correct-of_console_check-s-return-value.patch
 features/all/of-add-optional-options-parameter-to-of_find_node_by.patch
 features/all/of-support-passing-console-options-with-stdout-path.patch
+features/all/of-make-sure-of_alias-is-initialized-before-accessin.patch
 features/all/efi-expose-underlying-uefi-firmware-platform-size-to.patch
 features/all/simplefb-formalize-pseudo-palette-handling.patch
 features/all/simplefb-add-goto-error-path-to-probe.patch