MIPS: ath79: fix ar933x uart parity mode
Subsystems (6)
Sasha Levin
maintainerPATCH 6/9 scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
In reply to Sasha LevinFrom: Maurizio Lombardi <[email protected]>
[ Upstream commit 5dd6c49339126c2c8df2179041373222362d6e49 ]
If the CHAP_A value is not supported, the chap_server_open() function should free the auth_protocol pointer and set it to NULL, or we will leave a dangling pointer around.
[ 66.010905] Unsupported CHAP_A value [ 66.011660] Security negotiation failed. [ 66.012443] iSCSI Login negotiation failed. [ 68.413924] general protection fault: 0000 [#1] SMP PTI [ 68.414962] CPU: 0 PID: 1562 Comm: targetcli Kdump: loaded Not tainted 4.18.0-80.el8.x86_64 #1 [ 68.416589] Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 [ 68.417677] RIP: 0010:__kmalloc_track_caller+0xc2/0x210
--- drivers/target/iscsi/iscsi_target_auth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/target/iscsi/iscsi_target_auth.c +8 -8
@@ -89,6 +89,12 @@ static int chap_check_algorithm(const char *a_str)return CHAP_DIGEST_UNKNOWN ; } +static void chap_close (struct iscsi_conn *conn) +{ +kfree (conn->auth_protocol); + conn->auth_protocol =NULL ; +} + static struct iscsi_chap *chap_server_open( struct iscsi_conn *conn, struct iscsi_node_auth *auth,
@@ -126,7 +132,7 @@ static struct iscsi_chap *chap_server_open(case CHAP_DIGEST_UNKNOWN :default :pr_err ("Unsupported CHAP_A value\n" ); -kfree (conn->auth_protocol); +chap_close (conn);return NULL ; }
@@ -141,19 +147,13 @@ static struct iscsi_chap *chap_server_open(* Generate Challenge. */ if (chap_gen_challenge (conn,1 , aic_str, aic_len) <0 ) { -kfree (conn->auth_protocol); +chap_close (conn);return NULL ; }return chap; } -static void chap_close (struct iscsi_conn *conn) -{ -kfree (conn->auth_protocol); - conn->auth_protocol =NULL ; -} - static int chap_server_compute_md5( struct iscsi_conn *conn, struct iscsi_node_auth *auth,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 1/9 MIPS: ath79: fix ar933x uart parity mode
From: Stefan Hellermann <[email protected]>
[ Upstream commit db13a5ba2732755cf13320f3987b77cf2a71e790 ]
While trying to get the uart with parity working I found setting even parity enabled odd parity insted. Fix the register settings to match the datasheet of AR9331.
A similar patch was created by 8devices, but not sent upstream.
https://github.com/8devices/openwrt-8devices/commit/77c5586ade3bb72cda010afad3f209ed0c98ea7c
--- arch/mips/include/asm/mach-ath79/ar933x_uart.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-ath79/ar933x_uart.h +2 -2
@@ -27,8 +27,8 @@#define AR933X_UART_CS_PARITY_S 0#define AR933X_UART_CS_PARITY_M 0x3#define AR933X_UART_CS_PARITY_NONE 0 -#define AR933X_UART_CS_PARITY_ODD 1 -#define AR933X_UART_CS_PARITY_EVEN 2 +#define AR933X_UART_CS_PARITY_ODD 2 +#define AR933X_UART_CS_PARITY_EVEN 3#define AR933X_UART_CS_IF_MODE_S 2#define AR933X_UART_CS_IF_MODE_M 0x3#define AR933X_UART_CS_IF_MODE_NONE 0
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/9 MIPS: fix build on non-linux hosts
From: Kevin Darbyshire-Bryant <[email protected]>
[ Upstream commit 1196364f21ffe5d1e6d83cafd6a2edb89404a3ae ]
calc_vmlinuz_load_addr.c requires SZ_64K to be defined for alignment purposes. It included "../../../../include/linux/sizes.h" to define that size, however "sizes.h" tries to include <linux/const.h> which assumes linux system headers. These may not exist eg. the following error was encountered when building Linux for OpenWrt under macOS:
In file included from arch/mips/boot/compressed/calc_vmlinuz_load_addr.c:16:arch/mips/boot/compressed/../../../../include/linux/sizes.h:11:10: fatal error: 'linux/const.h' file not found
^~~~~~~~~~
Change makefile to force building on local linux headers instead of system headers. Also change eye-watering relative reference in include file spec.
Thanks to Jo-Philip Wich & Petr Štetiar for assistance in tracking this down & fixing.
--- arch/mips/boot/compressed/Makefile | 2 ++ arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
arch/mips/boot/compressed/Makefile +2 -0
@@ -78,6 +78,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE $(call if_changed,objcopy) +HOSTCFLAGS_calc_vmlinuz_load_addr.o += $(LINUXINCLUDE) + # Calculate the load address of the compressed kernel image hostprogs-y := calc_vmlinuz_load_addr
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c +1 -1
@@ -13,7 +13,7 @@#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include "../../../../include/linux/sizes.h" +#include <linux/sizes.h> int main (int argc,char *argv[]) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/9 drm/etnaviv: add missing failure path to destroy suballoc
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit be132e1375c1fffe48801296279079f8a59a9ed3 ]
When something goes wrong in the GPU init after the cmdbuf suballocator has been constructed, we fail to destroy it properly. This causes havok later when the GPU is unbound due to a module unload or similar.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +5 -2
@@ -760,7 +760,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)if (IS_ERR (gpu->cmdbuf_suballoc)) {dev_err (gpu->dev,"Failed to create cmdbuf suballocator\n" ); ret =PTR_ERR (gpu->cmdbuf_suballoc); - goto fail; + goto destroy_iommu; }/* Create buffer: */
@@ -768,7 +768,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) PAGE_SIZE);if (ret) {dev_err (gpu->dev,"could not create command buffer\n" ); - goto destroy_iommu; + goto destroy_suballoc; } if (gpu->mmu->version == ETNAVIV_IOMMU_V1 &&
@@ -800,6 +800,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) free_buffer:etnaviv_cmdbuf_free (&gpu->buffer); gpu->buffer.suballoc =NULL ; +destroy_suballoc: +etnaviv_cmdbuf_suballoc_destroy (gpu->cmdbuf_suballoc); + gpu->cmdbuf_suballoc =NULL ; destroy_iommu:etnaviv_iommu_destroy (gpu->mmu); gpu->mmu =NULL ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 3/9 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit aa69fb62bea15126e744af2e02acc0d6cf3ed4da ]
After r363059 and r363928 in LLVM, a build using ld.lld as the linker with CONFIG_RANDOMIZE_BASE enabled fails like so:
ld.lld: error: relocation R_AARCH64_ABS32 cannot be used against symbol __efistub_stext_offset; recompile with -fPIC
Fangrui and Peter figured out that ld.lld is incorrectly considering __efistub_stext_offset as a relative symbol because of the order in which symbols are evaluated. _text is treated as an absolute symbol and stext is a relative symbol, making __efistub_stext_offset a relative symbol.
Adding ABSOLUTE will force ld.lld to evalute this expression in the right context and does not change ld.bfd's behavior. ld.lld will need to be fixed but the developers do not see a quick or simple fix without some research (see the linked issue for further explanation). Add this simple workaround so that ld.lld can continue to link kernels.
--- arch/arm64/kernel/image.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/kernel/image.h +5 -1
@@ -73,7 +73,11 @@#ifdef CONFIG_EFI -__efistub_stext_offset = stext - _text; +/* +* Use ABSOLUTE() to avoid ld.lld treating this as a relative symbol: +* https://github.com/ClangBuiltLinux/linux/issues/561 +*/ +__efistub_stext_offset =ABSOLUTE (stext - _text);/* * The EFI stub has its own symbol namespace prefixed by __efistub_, to
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/9 KVM: x86: degrade WARN to pr_warn_ratelimited
In reply to Sasha LevinFrom: Paolo Bonzini <[email protected]>
[ Upstream commit 3f16a5c318392cbb5a0c7a3d19dff8c8ef3c38ee ]
This warning can be triggered easily by userspace, so it should certainly not cause a panic if panic_on_warn is set.
--- arch/x86/kvm/x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +3 -3
@@ -1447,7 +1447,7 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) vcpu->arch.tsc_always_catchup =1 ;return 0 ; }else { -WARN (1 ,"user requested TSC rate below hardware speed\n" ); +pr_warn_ratelimited ("user requested TSC rate below hardware speed\n" );return -1 ; } }
@@ -1457,8 +1457,8 @@ static int set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz, bool scale) user_tsc_khz, tsc_khz);if (ratio ==0 || ratio >= kvm_max_tsc_scaling_ratio) { -WARN_ONCE (1 ,"Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , - user_tsc_khz); +pr_warn_ratelimited ("Invalid TSC scaling ratio - virtual-tsc-khz=%u\n" , + user_tsc_khz);return -1 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/9 drm/imx: notify drm core before sending event during crtc disable
In reply to Sasha LevinFrom: Robert Beckett <[email protected]>
[ Upstream commit 78c68e8f5cd24bd32ba4ca1cdfb0c30cf0642685 ]
Notify drm core before sending pending events during crtc disable. This fixes the first event after disable having an old stale timestamp by having drm_crtc_vblank_off update the timestamp to now.
This was seen while debugging weston log message:
Warning: computed repaint delay is insane: -8212 msec
This occurred due to:
1. driver starts up
2. fbcon comes along and restores fbdev, enabling vblank
3. vblank_disable_fn fires via timer disabling vblank, keeping vblank seq number and time set at current value
(some time later)
4. weston starts and does a modeset
5. atomic commit disables crtc while it does the modeset
6. ipu_crtc_atomic_disable sends vblank with old seq number and time
--- drivers/gpu/drm/imx/ipuv3-crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/ipuv3-crtc.c +2 -2
@@ -98,14 +98,14 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,ipu_dc_disable (ipu);ipu_prg_disable (ipu); +drm_crtc_vblank_off (crtc); +spin_lock_irq (&crtc->dev->event_lock);if (crtc->state->event) {drm_crtc_send_vblank_event (crtc, crtc->state->event); crtc->state->event =NULL ; }spin_unlock_irq (&crtc->dev->event_lock); - -drm_crtc_vblank_off (crtc); }static void imx_drm_crtc_reset (struct drm_crtc *crtc)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 8/9 drm/imx: only send event on crtc disable if kept disabled
In reply to Sasha LevinFrom: Robert Beckett <[email protected]>
[ Upstream commit 5aeab2bfc9ffa72d3ca73416635cb3785dfc076f ]
The event will be sent as part of the vblank enable during the modeset if the crtc is not being kept disabled.
--- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/imx/ipuv3-crtc.c +1 -1
@@ -101,7 +101,7 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,drm_crtc_vblank_off (crtc);spin_lock_irq (&crtc->dev->event_lock); -if (crtc->state->event) { +if (crtc->state->event && !crtc->state->active) {drm_crtc_send_vblank_event (crtc, crtc->state->event); crtc->state->event =NULL ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 9/9 dmaengine: imx-sdma: fix use-after-free on probe error path
In reply to Sasha LevinFrom: Sven Van Asbroeck <[email protected]>
[ Upstream commit 2b8066c3deb9140fdf258417a51479b2aeaa7622 ]
If probe() fails anywhere beyond the point where sdma_get_firmware() is called, then a kernel oops may occur.
Problematic sequence of events:
1. probe() calls sdma_get_firmware(), which schedules the firmware callback to run when firmware becomes available, using the sdma instance structure as the context
2. probe() encounters an error, which deallocates the sdma instance structure
3. firmware becomes available, firmware callback is called with deallocated sdma instance structure
4. use after free - kernel oops !
Solution: only attempt to load firmware when we're certain that probe() will succeed. This guarantees that the firmware callback's context will remain valid.
Note that the remove() path is unaffected by this issue: the firmware loader will increment the driver module's use count, ensuring that the module cannot be unloaded while the firmware callback is pending or running.
--- drivers/dma/imx-sdma.c | 48 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-)
drivers/dma/imx-sdma.c +27 -21
@@ -2039,27 +2039,6 @@ static int sdma_probe(struct platform_device *pdev)if (pdata && pdata->script_addrs)sdma_add_scripts (sdma, pdata->script_addrs); -if (pdata) { - ret =sdma_get_firmware (sdma, pdata->fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); - }else { -/* -* Because that device tree does not encode ROM script address, -* the RAM script in firmware is mandatory for device tree -* probe, otherwise it fails. -*/ - ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , - &fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware name\n" ); -else { - ret =sdma_get_firmware (sdma, fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); - } - } - sdma->dma_device.dev = &pdev->dev; sdma->dma_device.device_alloc_chan_resources = sdma_alloc_chan_resources;
@@ -2103,6 +2082,33 @@ static int sdma_probe(struct platform_device *pdev)of_node_put (spba_bus); } +/* +* Kick off firmware loading as the very last step: +* attempt to load firmware only if we're not on the error path, because +* the firmware callback requires a fully functional and allocated sdma +* instance. +*/ +if (pdata) { + ret =sdma_get_firmware (sdma, pdata->fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); + }else { +/* +* Because that device tree does not encode ROM script address, +* the RAM script in firmware is mandatory for device tree +* probe, otherwise it fails. +*/ + ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , + &fw_name); +if (ret) { +dev_warn (&pdev->dev,"failed to get firmware name\n" ); + }else { + ret =sdma_get_firmware (sdma, fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); + } + } +return 0 ; err_register:
Signature · 1 line
2.20.1