From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 12 Nov 2014 06:30:51 +0000 (+0900)
Subject: fix up of-fix-overflow-bug-in-string-property-parsing-functions.patch
X-Git-Tag: v3.10.60~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36b884a026278c7a3d5d3867698758ea51a70002;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up of-fix-overflow-bug-in-string-property-parsing-functions.patch

fixes it for 3.10 and 3.14
---

diff --git a/queue-3.10/of-fix-overflow-bug-in-string-property-parsing-functions.patch b/queue-3.10/of-fix-overflow-bug-in-string-property-parsing-functions.patch
index 0f87d74abe9..cbc40c85be4 100644
--- a/queue-3.10/of-fix-overflow-bug-in-string-property-parsing-functions.patch
+++ b/queue-3.10/of-fix-overflow-bug-in-string-property-parsing-functions.patch
@@ -35,9 +35,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
  drivers/of/base.c     |   88 ++++++++++++--------------------------------------
- drivers/of/selftest.c |   64 +++++++++++++++++++++++++++++++++---
+ drivers/of/selftest.c |   66 ++++++++++++++++++++++++++++++++++---
  include/linux/of.h    |   84 +++++++++++++++++++++++++++++++++++++++--------
- 3 files changed, 151 insertions(+), 85 deletions(-)
+ 3 files changed, 152 insertions(+), 86 deletions(-)
 
 --- a/drivers/of/base.c
 +++ b/drivers/of/base.c
@@ -248,6 +248,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static int __init of_selftest(void)
+@@ -167,7 +221,7 @@ static int __init of_selftest(void)
+ 
+ 	pr_info("start of selftest - you will see error messages\n");
+ 	of_selftest_parse_phandle_with_args();
+-	of_selftest_property_match_string();
++	of_selftest_property_string();
+ 	pr_info("end of selftest - %s\n", selftest_passed ? "PASS" : "FAIL");
+ 	return 0;
+ }
 --- a/include/linux/of.h
 +++ b/include/linux/of.h
 @@ -252,14 +252,12 @@ extern int of_property_read_u64(const st
diff --git a/queue-3.14/of-fix-overflow-bug-in-string-property-parsing-functions.patch b/queue-3.14/of-fix-overflow-bug-in-string-property-parsing-functions.patch
index 66a85a80a84..c759a299bc6 100644
--- a/queue-3.14/of-fix-overflow-bug-in-string-property-parsing-functions.patch
+++ b/queue-3.14/of-fix-overflow-bug-in-string-property-parsing-functions.patch
@@ -35,10 +35,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
  drivers/of/base.c                           |   88 +++++++---------------------
- drivers/of/selftest.c                       |   64 ++++++++++++++++++--
+ drivers/of/selftest.c                       |   66 +++++++++++++++++++--
  drivers/of/testcase-data/tests-phandle.dtsi |    2 
  include/linux/of.h                          |   84 ++++++++++++++++++++++----
- 4 files changed, 153 insertions(+), 85 deletions(-)
+ 4 files changed, 154 insertions(+), 86 deletions(-)
 
 --- a/drivers/of/base.c
 +++ b/drivers/of/base.c
@@ -249,6 +249,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static void __init of_selftest_parse_interrupts(void)
+@@ -379,7 +433,7 @@ static int __init of_selftest(void)
+ 
+ 	pr_info("start of selftest - you will see error messages\n");
+ 	of_selftest_parse_phandle_with_args();
+-	of_selftest_property_match_string();
++	of_selftest_property_string();
+ 	of_selftest_parse_interrupts();
+ 	of_selftest_parse_interrupts_extended();
+ 	of_selftest_match_node();
 --- a/drivers/of/testcase-data/tests-phandle.dtsi
 +++ b/drivers/of/testcase-data/tests-phandle.dtsi
 @@ -32,7 +32,9 @@