]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
scan: wps: fix some misplaced code
authorJohannes Berg <johannes.berg@intel.com>
Thu, 13 Feb 2020 20:28:04 +0000 (21:28 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 13 Feb 2020 20:28:04 +0000 (21:28 +0100)
I added a length check, but neglected to move the actual
data access after that ... fix that!

Change-Id: I6cf3f396ce86c70df0d1f917b6a028de657ff2a7
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
scan.c

diff --git a/scan.c b/scan.c
index 4dcdf0e14f6027ef4a931adf9e54e56ec2f17b72..c784159d85d9e6f1edd14d72433b1e7ed278ea9a 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -2011,13 +2011,14 @@ static void print_wifi_wps(const uint8_t type, uint8_t len, const uint8_t *data,
                        break;
                }
                case 0x1057: {
-                       __u8 val = data[4];
+                       __u8 val;
                        tab_on_first(&first);
                        if (sublen < 1) {
                                printf("\t * AP setup locked: (invalid length %d)\n",
                                       sublen);
                                break;
                        }
+                       val = data[4];
                        printf("\t * AP setup locked: 0x%.2x\n", val);
                        break;
                }