staging/pepe2k, branch v19.07.3

OpenWrt v19.07.3: adjust config defaults

2020-05-16T18:39:58Z

Signed-off-by: Hauke Mehrtens

generic: platform/mikrotik: fix LZOR support

2020-05-16T18:32:20Z

31e99fe3da which introduced this code was unfortunately untested. This commit fixes a number of issues and works around the fact that in this particular scheme, the LZO payload may be padded at the end which will trigger a harmless lzo decompression error. This commit also disambiguates the debug printks. Tested-by: Robert Marko Signed-off-by: Thibaut VARÈNE Fixes: 31e99fe3da ("generic: platform/mikrotik: support LZOR encoding") (cherry picked from commit 2ea481193c1654c9cb42aa0331cdbc4570783e26)

libjson-c: backport security fixes

2020-05-13T09:45:15Z

This backports upstream fixes for the out of bounds write vulnerability in json-c. It was reported and patches in this upstream PR: https://github.com/json-c/json-c/pull/592 Addresses CVE-2020-12762 Signed-off-by: Robert Marko Signed-off-by: Luka Perkov [bump PKG_RELEASE, rebase patches on top of json-c 0.12] Signed-off-by: Jo-Philipp Wich (backported from commit bc0288b76816578f5aeccb2abd679f82bfc5738e)

ar71xx: remove hard-coded folder name from Mikrotik RB upgrade

2020-05-12T15:48:02Z

So far, specifying "BOARD_NAME := routerboard" is required by the upgrade code of Mikrotik NAND devices, as "sysupgrade-routerboard" is hardcoded in platform_do_upgrade_mikrotik_rb(). This patch replaces the latter with a grep for the name like it is already done in nand_upgrade_tar() in /lib/upgrade/nand.sh. This should enable upgrades from ar71xx to ath79 without setting BOARD_NAME for the latter. Signed-off-by: Adrian Schmutzler (backported from commit 281785d74fcc70153c0741be36ee1f9d05e74f6f)

fstools: blockd: fix segfault triggered by non-autofs mounts

2020-05-12T11:24:23Z

Program received signal SIGSEGV, Segmentation fault. main_autofs (argv=, argc=) at fstools-2020-05-06-eec16e2f/block.c:1193 1193: if (!m->autofs && (mp = find_mount_point(pr->dev))) { Fixes: 3b9e4d6d4c4f ("fstools: update to the latest version") Signed-off-by: Daniel Golle (cherry picked from commit b181294b02499e41b6b6fa24163f59c9ee4988ed)

ar71xx: mikrotik: mach-rbspi.c remove wlan id

2020-05-12T10:43:38Z

Following on the previous commit, this patch removes useless id argument from rbspi_wlan_init(). Signed-off-by: Thibaut VARÈNE

ar71xx: mikrotik: bypass id check in __rb_get_wlan_data()

2020-05-12T10:43:38Z

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. Since ath10k caldata is no longer pulled from this implementation, this commit also disables the publication in sysfs to avoid wasting memory. 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

ar71xx: mikrotik: ath10k: use new sysfs driver

2020-05-12T10:43:38Z

Fetch ath10k calibration data from backported mikrotik sysfs driver which supports the newer "LZOR" encoding. Signed-off-by: Thibaut VARÈNE

generic: platform/mikrotik: support LZOR encoding

2020-05-12T10:43:38Z

Some newer MikroTik RouterBOARD devices use a new encoding scheme for their WLAN calibration data. This patch provides support for decoding this new scheme. Signed-off-by: Thibaut VARÈNE

ar71xx: enable mikrotik platform driver

2020-05-12T10:43:38Z

Signed-off-by: Thibaut VARÈNE