From d24e43a7f622a8033f3703027fb19a617ae7aa02 Mon Sep 17 00:00:00 2001 From: Tan Zien Date: Sat, 4 Apr 2020 12:02:40 +0800 Subject: [PATCH 1/6] kernel: Fix miss config and module for mlx driver Missing config symbols could lead to build failures on kernel 4.14/4.19. Signed-off-by: Tan Zien [rephrase commit message - reorder symbols] Signed-off-by: David Bauer --- package/kernel/linux/modules/netdevices.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 34503f1e83..28f7648efe 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1095,12 +1095,15 @@ define KernelPackage/mlx4-core SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Mellanox ConnectX(R) mlx4 core Network Driver DEPENDS:=@PCI_SUPPORT +kmod-ptp - FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko + FILES:= \ + $(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko \ + $(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko KCONFIG:= CONFIG_MLX4_EN \ + CONFIG_MLX4_EN_DCB=n \ CONFIG_MLX4_CORE=y \ CONFIG_MLX4_CORE_GEN2=y \ CONFIG_MLX4_DEBUG=n - AUTOLOAD:=$(call AutoProbe,mlx4_core) + AUTOLOAD:=$(call AutoProbe,mlx4_core mlx4_en) endef define KernelPackage/mlx4-core/description @@ -1116,7 +1119,11 @@ define KernelPackage/mlx5-core FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko KCONFIG:= CONFIG_MLX5_CORE \ CONFIG_MLX5_CORE_EN=y \ - CONFIG_MLX5_EN_RXNFC=y + CONFIG_MLX5_EN_RXNFC=y \ + CONFIG_MLX5_FPGA=n \ + CONFIG_MLX5_MPFS=n \ + CONFIG_MLX5_EN_ARFS=n \ + CONFIG_MLX5_CORE_IPOIB=n AUTOLOAD:=$(call AutoProbe,mlx5_core) endef From f0f35fdac19b4d3e40aa03928cbbac15a83837bf Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sat, 4 Apr 2020 21:23:50 +0800 Subject: [PATCH 2/6] Revert "generic: 5.4: Add 4B_OPCODES flag to w25q256" This reverts commit d7f21940bcaf70ba404d354c7fa6519c1717d00a. Winbond W25Q256FV and W25Q256JV both uses 0xef4019 as JEDEC ID, but only the latter has proper 4B_OPCODES support. W25Q256FV has all 4B read instructions but it lacks a 4B page program instruction, causing the entire flash to be read-only. Signed-off-by: Chuanhong Guo --- ...i-nor-Add-4B_OPCODES-flag-to-w25q256.patch | 27 ------------------- ...w-NOR-driver-to-write-fewer-bytes-th.patch | 2 +- ...25p80-mx-disable-software-protection.patch | 2 +- ...or-fix-Spansion-regressions-aliased-.patch | 4 +-- ...ort-limiting-4K-sectors-support-base.patch | 6 ++--- .../479-mtd-spi-nor-add-xtx-xt25f128b.patch | 2 +- 6 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 target/linux/generic/backport-5.4/464-v5.6-mtd-spi-nor-Add-4B_OPCODES-flag-to-w25q256.patch diff --git a/target/linux/generic/backport-5.4/464-v5.6-mtd-spi-nor-Add-4B_OPCODES-flag-to-w25q256.patch b/target/linux/generic/backport-5.4/464-v5.6-mtd-spi-nor-Add-4B_OPCODES-flag-to-w25q256.patch deleted file mode 100644 index 7b7e15aa6b..0000000000 --- a/target/linux/generic/backport-5.4/464-v5.6-mtd-spi-nor-Add-4B_OPCODES-flag-to-w25q256.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 10050a02f7d508fa88f70fcfceefbacd13488ca7 Mon Sep 17 00:00:00 2001 -From: Robert Marko -Date: Mon, 23 Dec 2019 17:05:49 +0200 -Subject: [PATCH] mtd: spi-nor: Add 4B_OPCODES flag to w25q256 - -The w25q256 supports 4-byte opcodes so lets add the flag. -Tested on OpenWrt under 4.19.82 kernel on 8devices Habanero. - -Signed-off-by: Robert Marko -Signed-off-by: Tudor Ambarus ---- - drivers/mtd/spi-nor/spi-nor.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2480,7 +2480,9 @@ static const struct flash_info spi_nor_i - { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, - { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, - { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, -- { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, -+ { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, -+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | -+ SPI_NOR_4B_OPCODES) }, - { "w25q256jvm", INFO(0xef7019, 0, 64 * 1024, 512, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024, diff --git a/target/linux/generic/pending-5.4/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch b/target/linux/generic/pending-5.4/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch index fe2d7a6b23..a84af43a29 100644 --- a/target/linux/generic/pending-5.4/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch +++ b/target/linux/generic/pending-5.4/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2706,7 +2706,7 @@ static int spi_nor_write(struct mtd_info +@@ -2704,7 +2704,7 @@ static int spi_nor_write(struct mtd_info write_enable(nor); ret = spi_nor_write_data(nor, addr, page_remain, buf + i); diff --git a/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch index a71175f9e3..24d2d4567d 100644 --- a/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch +++ b/target/linux/generic/pending-5.4/465-m25p80-mx-disable-software-protection.patch @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -4886,6 +4886,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -4884,6 +4884,7 @@ int spi_nor_scan(struct spi_nor *nor, co */ if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL || JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || diff --git a/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch index 8b8cfd0cec..c5db43b5e6 100644 --- a/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch +++ b/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch @@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -4399,6 +4399,7 @@ static void st_micron_set_default_init(s +@@ -4397,6 +4397,7 @@ static void st_micron_set_default_init(s static void winbond_set_default_init(struct spi_nor *nor) { @@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer nor->params.set_4byte = winbond_set_4byte; } -@@ -4888,6 +4889,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -4886,6 +4887,7 @@ int spi_nor_scan(struct spi_nor *nor, co JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX || JEDEC_MFR(nor->info) == SNOR_MFR_SST || diff --git a/target/linux/generic/pending-5.4/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch b/target/linux/generic/pending-5.4/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch index e9207bd6aa..d3e587ff97 100644 --- a/target/linux/generic/pending-5.4/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch +++ b/target/linux/generic/pending-5.4/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch @@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau depends on OF && (ARM || ARM64 || COMPILE_TEST) --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -4466,6 +4466,7 @@ static void spi_nor_info_init_params(str +@@ -4464,6 +4464,7 @@ static void spi_nor_info_init_params(str struct spi_nor_erase_map *map = ¶ms->erase_map; const struct flash_info *info = nor->info; struct device_node *np = spi_nor_get_flash_node(nor); @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau u8 i, erase_mask; /* Initialize legacy flash parameters and settings. */ -@@ -4529,6 +4530,21 @@ static void spi_nor_info_init_params(str +@@ -4527,6 +4528,21 @@ static void spi_nor_info_init_params(str */ erase_mask = 0; i = 0; @@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau if (info->flags & SECT_4K_PMC) { erase_mask |= BIT(i); spi_nor_set_erase_type(&map->erase_type[i], 4096u, -@@ -4540,6 +4556,7 @@ static void spi_nor_info_init_params(str +@@ -4538,6 +4554,7 @@ static void spi_nor_info_init_params(str SPINOR_OP_BE_4K); i++; } diff --git a/target/linux/generic/pending-5.4/479-mtd-spi-nor-add-xtx-xt25f128b.patch b/target/linux/generic/pending-5.4/479-mtd-spi-nor-add-xtx-xt25f128b.patch index 39e02604fe..0c58f29d5b 100644 --- a/target/linux/generic/pending-5.4/479-mtd-spi-nor-add-xtx-xt25f128b.patch +++ b/target/linux/generic/pending-5.4/479-mtd-spi-nor-add-xtx-xt25f128b.patch @@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2506,6 +2506,9 @@ static const struct flash_info spi_nor_i +@@ -2504,6 +2504,9 @@ static const struct flash_info spi_nor_i /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, From 22ae8bd50ef6d056b25a96ce6c77de0b0d53c1a1 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 5 Apr 2020 09:14:43 +0100 Subject: [PATCH 3/6] umdns: update to the version 2020-04-05 ab7a39a umdns: fix unused error 45c4953 dns: explicitly endian-convert all fields in header and question Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/umdns/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/services/umdns/Makefile b/package/network/services/umdns/Makefile index 7dbbea322a..39d2cb7d1d 100644 --- a/package/network/services/umdns/Makefile +++ b/package/network/services/umdns/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umdns -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2018-01-02 -PKG_SOURCE_VERSION:=78974417e182a3de8f78b7d73366ec0c98396b6c -PKG_MIRROR_HASH:=a60f9eb9428ac3256cd7c3c6d4207c116cedf4d212b82e2f86c1bf7c7898fcbb +PKG_SOURCE_DATE:=2020-04-05 +PKG_SOURCE_VERSION:=ab7a39a5b5a0ff74601dd4e82145ca554c1e2ac6 +PKG_MIRROR_HASH:=135de61439d823f3631fdcf735bc7a94355ba1d7bb0a2e3a0530a75898e322ef PKG_MAINTAINER:=John Crispin PKG_LICENSE:=LGPL-2.1 From 1c6143e4a0a7cfd9721d74b0194aabd9a5a6cff4 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 4 Apr 2020 12:42:13 +0100 Subject: [PATCH 4/6] hostapd: Move hostapd variants to WirelessAPD menu It seemed very confusing when trying to select the different variants of hostapd which are somewhat scattered about under the menu 'Network'. Moving all hostapd variants under a common submenu helps avoid confusion. Inspired-by: Kevin Mahoney [Fixup badly formatted patch, change menu name] Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/hostapd/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index f6e089ddb3..7472f5904e 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -130,6 +130,7 @@ DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny define Package/hostapd/Default SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=IEEE 802.1x Authenticator URL:=http://hostap.epitest.fi/ DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus @@ -191,6 +192,7 @@ endef define Package/wpad/Default SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=IEEE 802.1x Authenticator/Supplicant DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus URL:=http://hostap.epitest.fi/ @@ -280,6 +282,7 @@ Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description) define Package/wpa-supplicant/Default SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=WPA Supplicant URL:=http://hostap.epitest.fi/wpa_supplicant/ DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus @@ -352,11 +355,13 @@ define Package/hostapd-common TITLE:=hostapd/wpa_supplicant common support files SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD endef define Package/hostapd-utils SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=IEEE 802.1x Authenticator (utils) URL:=http://hostap.epitest.fi/ DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) @@ -370,6 +375,7 @@ endef define Package/wpa-cli SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) TITLE:=WPA Supplicant command line control utility endef @@ -377,6 +383,7 @@ endef define Package/eapol-test TITLE:=802.1x authentication test utility SECTION:=net + SUBMENU:=WirelessAPD CATEGORY:=Network VARIANT:=supplicant-full-internal DEPENDS:=$(DRV_DEPENDS) +libubus @@ -386,6 +393,7 @@ define Package/eapol-test-openssl TITLE:=802.1x authentication test utility SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD VARIANT:=supplicant-full-openssl CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS)) DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl @@ -396,6 +404,7 @@ define Package/eapol-test-wolfssl TITLE:=802.1x authentication test utility SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD VARIANT:=supplicant-full-wolfssl CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS))) DEPENDS:=$(DRV_DEPENDS) +libubus +libwolfssl From 82df192a010418fac9c4db440490290f55f7e157 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 30 Sep 2019 10:41:28 +0100 Subject: [PATCH 5/6] dropbear: backport add ip address to exit without auth messages 201e359 Handle early exit when addrstring isn't set fa4c464 Improve address logging on early exit messages (#83) Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/dropbear/Makefile | 2 +- .../010-backport-change-address-logging.patch | 119 ++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 package/network/services/dropbear/patches/010-backport-change-address-logging.patch diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 59b4f54954..b30229300c 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2019.78 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ diff --git a/package/network/services/dropbear/patches/010-backport-change-address-logging.patch b/package/network/services/dropbear/patches/010-backport-change-address-logging.patch new file mode 100644 index 0000000000..2b99f81ad5 --- /dev/null +++ b/package/network/services/dropbear/patches/010-backport-change-address-logging.patch @@ -0,0 +1,119 @@ +From c153b3612b7c9f24a0f5af43618a646545ed6e22 Mon Sep 17 00:00:00 2001 +From: Kevin Darbyshire-Bryant +Date: Mon, 30 Sep 2019 12:42:13 +0100 +Subject: [PATCH] Improve address logging on early exit messages + +Change 'Early exit' and 'Exit before auth' messages to include the IP +address & port as part of the message. + +This allows log scanning utilities such as 'fail2ban' to obtain the +offending IP address as part of the failure event instead of extracting +the PID from the message and then scanning the log again for match +'child connection from' messages + +Signed-off-by: Kevin Darbyshire-Bryant +--- + svr-auth.c | 18 +++++++----------- + svr-session.c | 20 ++++++++++++++------ + 2 files changed, 21 insertions(+), 17 deletions(-) + +--- a/svr-auth.c ++++ b/svr-auth.c +@@ -241,8 +241,7 @@ static int checkusername(const char *use + } + + if (strlen(username) != userlen) { +- dropbear_exit("Attempted username with a null byte from %s", +- svr_ses.addrstring); ++ dropbear_exit("Attempted username with a null byte"); + } + + if (ses.authstate.username == NULL) { +@@ -252,8 +251,7 @@ static int checkusername(const char *use + } else { + /* check username hasn't changed */ + if (strcmp(username, ses.authstate.username) != 0) { +- dropbear_exit("Client trying multiple usernames from %s", +- svr_ses.addrstring); ++ dropbear_exit("Client trying multiple usernames"); + } + } + +@@ -268,8 +266,7 @@ static int checkusername(const char *use + if (!ses.authstate.pw_name) { + TRACE(("leave checkusername: user '%s' doesn't exist", username)) + dropbear_log(LOG_WARNING, +- "Login attempt for nonexistent user from %s", +- svr_ses.addrstring); ++ "Login attempt for nonexistent user"); + ses.authstate.checkusername_failed = 1; + return DROPBEAR_FAILURE; + } +@@ -279,9 +276,8 @@ static int checkusername(const char *use + if (!(DROPBEAR_SVR_MULTIUSER && uid == 0) && uid != ses.authstate.pw_uid) { + TRACE(("running as nonroot, only server uid is allowed")) + dropbear_log(LOG_WARNING, +- "Login attempt with wrong user %s from %s", +- ses.authstate.pw_name, +- svr_ses.addrstring); ++ "Login attempt with wrong user %s", ++ ses.authstate.pw_name); + ses.authstate.checkusername_failed = 1; + return DROPBEAR_FAILURE; + } +@@ -440,8 +436,8 @@ void send_msg_userauth_failure(int parti + } else { + userstr = ses.authstate.pw_name; + } +- dropbear_exit("Max auth tries reached - user '%s' from %s", +- userstr, svr_ses.addrstring); ++ dropbear_exit("Max auth tries reached - user '%s'", ++ userstr); + } + + TRACE(("leave send_msg_userauth_failure")) +--- a/svr-session.c ++++ b/svr-session.c +@@ -149,28 +149,36 @@ void svr_session(int sock, int childpipe + void svr_dropbear_exit(int exitcode, const char* format, va_list param) { + char exitmsg[150]; + char fullmsg[300]; ++ char fromaddr[60]; + int i; + + /* Render the formatted exit message */ + vsnprintf(exitmsg, sizeof(exitmsg), format, param); + ++ /* svr_ses.addrstring may not be set for some early exits, or for ++ the listener process */ ++ fromaddr[0] = '\0'; ++ if (svr_ses.addrstring) { ++ snprintf(fromaddr, sizeof(fromaddr), " from <%s>", svr_ses.addrstring); ++ } ++ + /* Add the prefix depending on session/auth state */ + if (!ses.init_done) { + /* before session init */ +- snprintf(fullmsg, sizeof(fullmsg), "Early exit: %s", exitmsg); ++ snprintf(fullmsg, sizeof(fullmsg), "Early exit%s: %s", fromaddr, exitmsg); + } else if (ses.authstate.authdone) { + /* user has authenticated */ + snprintf(fullmsg, sizeof(fullmsg), +- "Exit (%s): %s", +- ses.authstate.pw_name, exitmsg); ++ "Exit (%s)%s: %s", ++ ses.authstate.pw_name, fromaddr, exitmsg); + } else if (ses.authstate.pw_name) { + /* we have a potential user */ + snprintf(fullmsg, sizeof(fullmsg), +- "Exit before auth (user '%s', %u fails): %s", +- ses.authstate.pw_name, ses.authstate.failcount, exitmsg); ++ "Exit before auth%s: (user '%s', %u fails): %s", ++ fromaddr, ses.authstate.pw_name, ses.authstate.failcount, exitmsg); + } else { + /* before userauth */ +- snprintf(fullmsg, sizeof(fullmsg), "Exit before auth: %s", exitmsg); ++ snprintf(fullmsg, sizeof(fullmsg), "Exit before auth%s: %s", fromaddr, exitmsg); + } + + dropbear_log(LOG_INFO, "%s", fullmsg); From 95bd6a04b56aaac9270774011c747d0875389dc5 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sun, 5 Apr 2020 15:52:49 +0800 Subject: [PATCH 6/6] ramips: fix path for dma-ralink and mtk-hsdma These two drivers were available in drivers/staging in 5.4. Fix driver paths for them. Signed-off-by: Chuanhong Guo --- target/linux/ramips/modules.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk index 1ce914439c..6fd3b51c45 100644 --- a/target/linux/ramips/modules.mk +++ b/target/linux/ramips/modules.mk @@ -84,7 +84,8 @@ define KernelPackage/dma-ralink CONFIG_DMA_RALINK FILES:= \ $(LINUX_DIR)/drivers/dma/virt-dma.ko \ - $(LINUX_DIR)/drivers/dma/ralink-gdma.ko + $(LINUX_DIR)/drivers/dma/ralink-gdma.ko@lt5.4 \ + $(LINUX_DIR)/drivers/staging/ralink-gdma/ralink-gdma.ko@ge5.4 AUTOLOAD:=$(call AutoLoad,52,ralink-gdma) endef @@ -104,7 +105,8 @@ define KernelPackage/hsdma-mtk CONFIG_MTK_HSDMA FILES:= \ $(LINUX_DIR)/drivers/dma/virt-dma.ko \ - $(LINUX_DIR)/drivers/dma/mtk-hsdma.ko + $(LINUX_DIR)/drivers/dma/mtk-hsdma.ko@lt5.4 \ + $(LINUX_DIR)/drivers/staging/mt7621-dma/mtk-hsdma.ko@ge5.4 AUTOLOAD:=$(call AutoLoad,53,mtk-hsdma) endef