From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date: Fri, 27 May 2016 22:27:41 +0000 (-0700)
Subject: lantiq: fix segfault inside ltq-adsl-app
X-Git-Tag: v17.01.0-rc1~2591
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=96ad827e17dca3351ecac40a2bc15f0fcaf39edd;p=openwrt%2Fstaging%2Fchunkeey.git

lantiq: fix segfault inside ltq-adsl-app

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
---

diff --git a/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch b/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch
new file mode 100644
index 0000000000..a868678d1e
--- /dev/null
+++ b/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch
@@ -0,0 +1,65 @@
+--- a/src/dsl_cpe_cli_access.c	2016-05-27 12:34:43.612485449 -0700
++++ b/src/dsl_cpe_cli_access.c	2016-05-27 12:45:37.491727862 -0700
+@@ -1142,7 +1142,7 @@
+ 
+       if ((ret < 0) && (autobootCtrl.accessCtl.nReturn < DSL_SUCCESS))
+       {
+-         DSL_CPE_FPrintf (out, sFailureReturn, autobootCtrl.accessCtl.nReturn);
++         DSL_CPE_FPrintf (out, sFailureReturn, autobootCtrl.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
+       }
+       else
+       {
+@@ -1213,7 +1213,7 @@
+ 
+    if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
+    {
+-      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
++      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
+    }
+    else
+    {
+@@ -1290,7 +1290,7 @@
+ 
+    if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
+    {
+-      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
++      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
+    }
+    else
+    {
+@@ -1355,7 +1355,7 @@
+                   pCtx, &resourceUsageStatisticsData);
+          if (ret < 0)
+          {
+-            DSL_CPE_FPrintf (out, sFailureReturn, ret);
++            DSL_CPE_FPrintf (out, sFailureReturn, ret, DSL_CPE_Fd2DevStr(fd));
+          }
+          else
+          {
+@@ -3084,7 +3084,7 @@
+ 
+    if ((ret < 0) && (pData->accessCtl.nReturn < DSL_SUCCESS))
+    {
+-      DSL_CPE_FPrintf (out, sFailureReturn, pData->accessCtl.nReturn);
++      DSL_CPE_FPrintf (out, sFailureReturn, pData->accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
+    }
+    else
+    {
+@@ -4654,7 +4654,7 @@
+ 
+    if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
+    {
+-      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
++      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
+    }
+    else
+    {
+@@ -5714,7 +5714,7 @@
+ 
+    if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
+    {
+-      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
++      DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
+    }
+    else
+    {