Skip to contentSkip to conversation

package/reaver: fix static build on m68k

PATCH Superseded Fabrice Fontaine 2 participants 3 messages Feb 22, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/reaver: fix static build on m68k

Fixes:
- http://autobuild.buildroot.org/results/935c038b921ffa0f185571de41223e4c201e964b

---
Changes v1 -> v2 (after review of Peter Korsgaard):
- Use upstream patch

 package/reaver/0001-fix-271.patch | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/reaver/0001-fix-271.patch
package/reaver/0001-fix-271.patch new file +32 -0
new file mode 100644
index 0000000000..9f6b395120
@@ -0,0 +1,32 @@
+From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001
+From: rofl0r <[email protected]>
+Date: Fri, 22 Feb 2019 17:38:24 +0000
+Subject: [PATCH] fix #271
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391]
+---
+ src/wps/wps_attr_parse.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c
+index 30b0e79..d681b70 100644
+--- a/src/wps/wps_attr_parse.c
++++ b/src/wps/wps_attr_parse.c
+@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr)
+ 			 * Mac OS X 10.6 seems to be adding 0x00 padding to the
+ 			 * end of M1. Skip those to avoid interop issues.
+ 			 */
+-			int i;
+-			for (i = 0; i < end - pos; i++) {
++			uintptr_t i, left = end - pos;
++			for (i = 0; i < left; i++) {
+ 				if (pos[i])
+ 					break;
+ 			}
+-			if (i == end - pos) {
++			if (i == left) {
+ 				wpa_printf(MSG_DEBUG, "WPS: Workaround - skip "
+ 					   "unexpected message padding");
+ 				break;
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 1/1 package/reaver: fix static build on m68k

Hello,

Quoted 4 lines · On Fri, 22 Feb 2019 21:12:34 +0100 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/935c038b921ffa0f185571de41223e4c201e964b

How is this related to static linking ? It seems to be a m68k issue that would also occur when dynamic linking (if m68k had support for that).

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/reaver: fix static build on m68k

Dear Thomas,
Le ven. 22 f?vr. 2019 ? 21:37, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 6 lines

Hello,

On Fri, 22 Feb 2019 21:12:34 +0100
Fabrice Fontaine <[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/935c038b921ffa0f185571de41223e4c201e964b

How is this related to static linking ? It seems to be a m68k issue that would also occur when dynamic linking (if m68k had support for that).

Indeed, I'll update the title.

Quoted 8 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice