From 99467dab23c4af816958fdd98218ca613308b402 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Feb 2019 18:54:23 -0600 Subject: poky: refresh thud: b904775c2b..7c76c5d78b Update poky to thud HEAD. Adam Trhon (1): icecc-env: don't raise error when icecc not installed Alexander Kanavin (1): openssl10: update to 1.0.2q Armin Kuster (1): perl: add testdepends for ssh Bruce Ashfield (2): linux-yocto/4.18: update to v4.18.26 linux-yocto/4.18: update to v4.18.27 Changqing Li (1): checklayer: generate locked-sigs.inc under builddir Dan Dedrick (2): devtool: remove duplicate overrides devtool: improve git repo checks before check_commits logic Daniel Ammann (1): ref-manual: Typo found and fixed. Douglas Royds (2): openssl ptest: Strip build host paths from configdata.pm openssl: Strip perl version from installed ptest configdata.pm file Dustin Bain (1): busybox: update to 1.29.3 Jan Kiszka (1): oe-git-proxy: Avoid resolving NO_PROXY against local files Jens Rehsack (1): avahi: avoid depending on skipped package Jonas Bonn (1): keymaps: tighten package write dependency Kai Kang (1): selftest/wic: update test case test_qemu Khem Raj (3): openssl10: Fix mutliple include assumptions for bn.h in opensslconf.h send-error-report: Use https instead of http protocol multilib_header_wrapper.h: Use #pragma once Leonardo Augusto (1): scripts/lib/wic/engine: Fix cp's target path for ext* filesystems Liu Haitao (1): iw: fix parsing of WEP keys Mingli Yu (1): logrotate.py: restore /etc/logrotate.d/wtmp Otavio Salvador (1): linux-firmware: Bump to 710963f revision Ovidiu Panait (1): ghostscript: Fix CVE-2019-6116 Peter Kjellerstedt (1): libaio: Extend to native Richard Purdie (23): package: Add pkg_postinst_ontarget to PACKAGEVARS oeqa/runtime/ptest: Avoid traceback for tests with no section oeqa/utils/logparser: Simplify ptest log parsing code oeqa/logparser: Further simplification/clarification oeqa/logparser: Reform the ptest results parser oeqa/utils/logparser: Add in support for duration, exitcode and logs by section oeqa/logparser: Improve results handling oeqa/logparser: Various misc cleanups oeqa/runtime/ptest: Ensure OOM errors are logged scripts/contrib/build-perf-test-wrapper.sh: Improve interaction with autobuilder automation scripts/contrib/build-perf-test.sh: Remove it oe-build-perf-report: Allow branch without hostname oe-build-perf-report: Allow commits from different branches oe-build-perf-report: Improve branch comparision handling oe-build-perf-report: Fix missing buildstats comparisions wic/engine: Fix missing parted autobuilder failures lib/buildstats: Improve error message scripts/oe-git-archive: Separate out functionality to library function oe-build-perf-report/gitarchive: Move common useful functions to library bitbake: runqueue: Fix dependency loop analysis 'hangs' bitbake: runqueue: Filter out multiconfig dependencies from BB_TASKDEPDATA bitbake: siggen: Fix multiconfig corner case bitbake: cooker: Tweak multiconfig dependency resolution Robert Yang (5): bluez5: Fix a race issue for tools yocto-check-layer-wrapper: Fix path for oe-init-build-env checklayer: Avoid adding the layer if it is already present runqemu: Let qemuparams override default settings runqemu: Make QB_MEM easier to set Ross Burton (3): e2fsprogs: fix file system generation with large files linux-firmware: recommend split up packages linux-firmware: split out liquidio firmware Scott Rifenbark (2): poky.ent: Updated "meta-intel" version to "10.1" overview-manual, mega-manual: Updated Package Feeds diagram Serhey Popovych (1): openssl: Skip assembler optimized code for powerpc64 with musl William Bourque (1): wic/engine.py: Load paths from PATH environment variable Xulin Sun (1): openssl: fix multilib file install conflicts Zheng Ruoqin (1): mdadm: add init and service scripts Change-Id: Ib14c2fb69d25d84aa3d4bf0a6715bba57d1eb900 Signed-off-by: Andrew Geissler --- .../iw/0001-connect-fix-parsing-of-WEP-keys.patch | 194 +++++++++++++++++++++ poky/meta/recipes-connectivity/iw/iw_4.14.bb | 1 + 2 files changed, 195 insertions(+) create mode 100644 poky/meta/recipes-connectivity/iw/iw/0001-connect-fix-parsing-of-WEP-keys.patch (limited to 'poky/meta/recipes-connectivity/iw') diff --git a/poky/meta/recipes-connectivity/iw/iw/0001-connect-fix-parsing-of-WEP-keys.patch b/poky/meta/recipes-connectivity/iw/iw/0001-connect-fix-parsing-of-WEP-keys.patch new file mode 100644 index 000000000..8cf8f7ab3 --- /dev/null +++ b/poky/meta/recipes-connectivity/iw/iw/0001-connect-fix-parsing-of-WEP-keys.patch @@ -0,0 +1,194 @@ +From 2a6be4166fd718be0694fe8a6e3f1013c125dee2 Mon Sep 17 00:00:00 2001 +From: Emmanuel Grumbach +Date: Tue, 12 Jun 2018 09:01:56 +0300 +Subject: [PATCH] connect: fix parsing of WEP keys + +The introduction of MFP options added a bug that causes a +segmentation fault when parsing WEP keys. +Fix that. + +Signed-off-by: Emmanuel Grumbach +Signed-off-by: Johannes Berg + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git/commit/?id=0e39f109c4b8155697a12ef090b59cdb304c8c44] +Signed-off-by: Liu Haitao +--- + ap.c | 2 +- + connect.c | 7 ++----- + ibss.c | 2 +- + iw.h | 3 ++- + util.c | 36 ++++++++++++++++++------------------ + 5 files changed, 24 insertions(+), 26 deletions(-) + +diff --git a/ap.c b/ap.c +index 4bab5b9..dcce402 100644 +--- a/ap.c ++++ b/ap.c +@@ -116,7 +116,7 @@ static int handle_start_ap(struct nl80211_state *state, + argv++; + argc--; + +- return parse_keys(msg, argv, argc); ++ return parse_keys(msg, &argv, &argc); + nla_put_failure: + return -ENOSPC; + } +diff --git a/connect.c b/connect.c +index 339fc73..4a847a1 100644 +--- a/connect.c ++++ b/connect.c +@@ -54,13 +54,10 @@ static int iw_conn(struct nl80211_state *state, + argv++; + argc--; + +- ret = parse_keys(msg, argv, argc); ++ ret = parse_keys(msg, &argv, &argc); + if (ret) + return ret; + +- argc -= 4; +- argv += 4; +- + if (!argc) + return 0; + +@@ -228,7 +225,7 @@ static int iw_auth(struct nl80211_state *state, + argv++; + argc--; + +- return parse_keys(msg, argv, argc); ++ return parse_keys(msg, &argv, &argc); + nla_put_failure: + return -ENOSPC; + } +diff --git a/ibss.c b/ibss.c +index 84f1e95..d77fc92 100644 +--- a/ibss.c ++++ b/ibss.c +@@ -115,7 +115,7 @@ static int join_ibss(struct nl80211_state *state, + argv++; + argc--; + +- return parse_keys(msg, argv, argc); ++ return parse_keys(msg, &argv, &argc); + nla_put_failure: + return -ENOSPC; + } +diff --git a/iw.h b/iw.h +index ee7ca20..8767ed3 100644 +--- a/iw.h ++++ b/iw.h +@@ -180,7 +180,8 @@ int parse_hex_mask(char *hexmask, unsigned char **result, size_t *result_len, + unsigned char **mask); + unsigned char *parse_hex(char *hex, size_t *outlen); + +-int parse_keys(struct nl_msg *msg, char **argv, int argc); ++ ++int parse_keys(struct nl_msg *msg, char **argv[], int *argc); + int parse_freqchan(struct chandef *chandef, bool chan, int argc, char **argv, int *parsed); + enum nl80211_chan_width str_to_bw(const char *str); + int put_chandef(struct nl_msg *msg, struct chandef *chandef); +diff --git a/util.c b/util.c +index 6e0ddff..122c019 100644 +--- a/util.c ++++ b/util.c +@@ -417,23 +417,23 @@ static int parse_cipher_suite(const char *cipher_str) + return -EINVAL; + } + +-int parse_keys(struct nl_msg *msg, char **argv, int argc) ++int parse_keys(struct nl_msg *msg, char **argv[], int *argc) + { + struct nlattr *keys; + int i = 0; + bool have_default = false; +- char *arg = *argv; ++ char *arg = **argv; + char keybuf[13]; + int pos = 0; + +- if (!argc) ++ if (!*argc) + return 1; + + if (!memcmp(&arg[pos], "psk", 3)) { + char psk_keybuf[32]; + int cipher_suite, akm_suite; + +- if (argc < 4) ++ if (*argc < 4) + goto explain; + + pos+=3; +@@ -451,9 +451,9 @@ int parse_keys(struct nl_msg *msg, char **argv, int argc) + NLA_PUT(msg, NL80211_ATTR_PMK, 32, psk_keybuf); + NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE, NL80211_AUTHTYPE_OPEN_SYSTEM); + +- argv++; +- argc--; +- arg = *argv; ++ *argv += 1; ++ *argc -= 1; ++ arg = **argv; + + akm_suite = parse_akm_suite(arg); + if (akm_suite < 0) +@@ -461,9 +461,9 @@ int parse_keys(struct nl_msg *msg, char **argv, int argc) + + NLA_PUT_U32(msg, NL80211_ATTR_AKM_SUITES, akm_suite); + +- argv++; +- argc--; +- arg = *argv; ++ *argv += 1; ++ *argc -= 1; ++ arg = **argv; + + cipher_suite = parse_cipher_suite(arg); + if (cipher_suite < 0) +@@ -471,9 +471,9 @@ int parse_keys(struct nl_msg *msg, char **argv, int argc) + + NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE, cipher_suite); + +- argv++; +- argc--; +- arg = *argv; ++ *argv += 1; ++ *argc -= 1; ++ arg = **argv; + + cipher_suite = parse_cipher_suite(arg); + if (cipher_suite < 0) +@@ -495,7 +495,7 @@ int parse_keys(struct nl_msg *msg, char **argv, int argc) + struct nlattr *key = nla_nest_start(msg, ++i); + char *keydata; + +- arg = *argv; ++ arg = **argv; + pos = 0; + + if (!key) +@@ -537,15 +537,15 @@ int parse_keys(struct nl_msg *msg, char **argv, int argc) + + NLA_PUT(msg, NL80211_KEY_DATA, keylen, keydata); + +- argv++; +- argc--; ++ *argv += 1; ++ *argc -= 1; + + /* one key should be TX key */ +- if (!have_default && !argc) ++ if (!have_default && !*argc) + NLA_PUT_FLAG(msg, NL80211_KEY_DEFAULT); + + nla_nest_end(msg, key); +- } while (argc); ++ } while (*argc); + + nla_nest_end(msg, keys); + +-- +2.17.1 + diff --git a/poky/meta/recipes-connectivity/iw/iw_4.14.bb b/poky/meta/recipes-connectivity/iw/iw_4.14.bb index e1b17de4c..f414a4b1d 100644 --- a/poky/meta/recipes-connectivity/iw/iw_4.14.bb +++ b/poky/meta/recipes-connectivity/iw/iw_4.14.bb @@ -12,6 +12,7 @@ DEPENDS = "libnl" SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ file://separate-objdir.patch \ + file://0001-connect-fix-parsing-of-WEP-keys.patch \ " SRC_URI[md5sum] = "2067516ca9940fdb8c091ee3250da374" -- cgit v1.2.3