kernel: mtd: parser: cmdline: Fix parsing of part-names with colons Some devices (especially QCA ones) are already using hardcoded partition names with colons in it. The OpenMesh A62 for example provides following mtd relevant information via cmdline: root=31:11 mtdparts=spi0.0:256k(0:SBL1),128k(0:MIBIB),384k(0:QSEE),64k(0:CDT),64k(0:DDRPARAMS),64k(0:APPSBLENV),512k(0:APPSBL),64k(0:ART),64k(custom),64k(0:KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive) rootfsname=rootfs rootwait The change to split only on the last colon between mtd-id and partitions will cause newpart to see following string for the first partition: KEYS),0x002b0000(kernel),0x00c80000(rootfs),15552k(inactive) Such a partition list cannot be parsed and thus the device fails to boot. Avoid this behavior by making sure that the start of the first part-name ("(") will also be the last byte the mtd-id split algorithm is using for its colon search. Fixes: 5d01d0560893 ("kernel: Update kernel 4.14 to version 4.14.202") Fixes: edda06c7b41d ("kernel: Update kernel 4.9 to version 4.9.240") Signed-off-by: Sven Eckelmann <sven@narfation.org> (backported from commit 223eec7e81f8506592fc89cf79a2f14360f5c57b)
mac80211: Fix brcmfmac compile on layerscape/armv8_64b DMI_PRODUCT_SKU is only available with kernel >= 4.18. Fixes: 2cd234d96bd7 ("mac80211: brcmfmac: backport important fixes from kernel 5.2") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
layerscape: update kernel patch to fix build The target heavily modifies caamalg.c, so changes introduced in kernel commit 7b930def8ef6 ("crypto: caam - limit output IV to CBC to work around CTR mode DMA issue") have broken build. This adjusts the upstream changes to match the rest of our local patch. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
kernel: Update kernel 4.9 to version 4.9.243 Compile and runtime tested on lantiq/xrx200. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
kernel: Update kernel 4.14 to version 4.14.206 Compile and runtime tested on x86/64. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
uci: Backport security fixes This packports two security fixes from master. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit f9005d4f80dee3dcc257d4613cbc46668faad094)
oxnas: fix qc_prep return in sata driver after kernel 4.14.200 This fixes a regression after a kernel change in 4.14.200 [1] that led to build failure on oxnas/ox820: drivers/ata/sata_oxnas.c:2238:13: error: initialization of 'enum ata_completion_errors (*)(struct ata_queued_cmd *)' from incompatible pointer type 'void (*)(struct ata_queued_cmd *)' [-Werror=incompatible-pointer-types] .qc_prep = sata_oxnas_qc_prep, ^~~~~~~~~~~~~~~~~~ drivers/ata/sata_oxnas.c:2238:13: note: (near initialization for 'sata_oxnas_ops.qc_prep') Our local driver is changed the same way as prototyped in the kernel patch, i.e. return type is changed and AC_ERR_OK return value is added. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=306a1c5b5683c1d37565e575386139a64bdbec6f Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit f6ca57e4f40528a8a0103c9f0e9647a2e11d10c3)
ar71xx: mikrotik: bypass id check in __rb_get_wlan_data() The id parameter in __rb_get_wlan_data() was incorrectly used on the assumption that id "0" would always be tied to ath9k with RLE encoding and positive id (in fact, only id "1" was valid) would always be tied to ("external") ath10k with LZO encoding. Newer hardware revisions of supported devices prove this assumption to be invalid, with ath9k caldata being now wrapped in MAGIC_ERD and LZO compressed, so disable this check to allow newer hardware to correctly decode caldata for ath9k. Note: this patch assumes that ath9k caldata is never stored with the new "LZOR" encoding scheme found on some ath10k devices. Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> (cherry picked from commit 1c6990fe6d198718850b6a37998416cac69f6f53) [keep publishing ath10k caldata in sysfs: it's the way it's done on 18.06] Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org> Tested-by: Baptiste Jonglez <git@bitsofnetworks.org> [Mikrotik RB941-2nD r3]
kernel: Update kernel 4.14 to version 4.14.202 Compile and runtime tested on x86/64. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
kernel: Update kernel 4.9 to version 4.9.240 Compile and runtime tested on ar71xx/generic. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
firewall: options: fix parsing of boolean attributes Boolean attributes were parsed the same way as string attributes, so a value of { "bool_attr": "true" } would be parsed correctly, but { "bool_attr": true } (without quotes) was parsed as false. Fixes FS#3284 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 7f676b5ed6a2bcd6786a0fcb6a6db3ddfeedf795)
scripts: getver.sh: fix version based on stable branch When building from a local branch based off the "openwrt-18.06" branch, version computation is wrong, for instance: r6907+1154-7e15e21766 The number of local commits (1154 in this case) is wrong because it is computed against master. As a result, it wrongly counts *all* commits since the beginning of the openwrt-18.06 branch as local commits. The fix is to compare to the openwrt-18.06 branch instead, which gives the expected result such as: r8060+1-1238a22316 Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org> [shorten commit title] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
mbedtls: update to 2.16.8 This release of Mbed TLS provides bug fixes and minor enhancements. This release includes fixes for security issues and the most notable of them are described in more detail in the security advisories. * Local side channel attack on RSA and static Diffie-Hellman * Local side channel attack on classical CBC decryption in (D)TLS * When checking X.509 CRLs, a certificate was only considered as revoked if its revocationDate was in the past according to the local clock if available. Full release announcement: https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.8 Signed-off-by: Magnus Kroken <mkroken@gmail.com> (cherry picked from commit 66893063abf56b7d8c21eceed56e5d27859eaaea)
lua: lnum: fix strtoul based number parsing Lua's LNUM patch currently doesn't parse properly certain numbers as it's visible from the following simple tests. On x86_64 host (stock Lua 5.1.5, expected output): $ /usr/bin/lua -e 'print(0x80000000); print(0x80000000000); print(0x100000000)' 2147483648 8796093022208 4294967296 On x86_64 host: $ staging_dir/hostpkg/bin/lua -e 'print(0x80000000); print(0x80000000000); print(0x100000000)' -2147483648 0 0 On x86_64 target: $ lua -e 'print(0x80000000); print(0x80000000000); print(0x100000000)' -2147483648 0 0 On ath79 target: $ lua -e 'print(0x80000000); print(0x80000000000); print(0x100000000)' -2147483648 8796093022208 4294967296 It's caused by two issues fixed in this patch, first issue is caused by unhadled strtoul overflow and second one is caused by the cast of unsigned to signed Lua integer when parsing from hex literal. Run tested on: * Zidoo Z9S with RTD1296 CPU (aarch64_cortex-a53) * qemu/x86_64 * qemu/armvirt_64 * ath79 Signed-off-by: Liangbin Lian <jjm2473@gmail.com> [commit subject/message touches, fixed From to match SOB, fixed another unhandled case in luaO_str2i, host Lua, package bump] Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 4bb9af48ca36605424c57b6af27dd5e5c827395f)
kernel: Update kernel 4.9 to version 4.9.237 Compile and runtime tested on lantiq/xrx200 + ar71xx/generic. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
kernel: Update kernel 4.14 to version 4.14.199 Compile and runtime tested on x86/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>