- Linux-stable-mirror - lists.linaro.org

FAILED: patch "[PATCH] HID: debug: fix the ring buffer implementation" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 13054abbaa4f1fd4e6f3b4b63439ec033b4c8035 Mon Sep 17 00:00:00 2001 From: Vladis Dronov <vdronov(a)redhat.com> Date: Tue, 29 Jan 2019 11:58:35 +0100 Subject: [PATCH] HID: debug: fix the ring buffer implementation Ring buffer implementation in hid_debug_event() and hid_debug_events_read() is strange allowing lost or corrupted data. After commit 717adfdaf147 ("HID: debug: check length before copy_to_user()") it is possible to enter an infinite loop in hid_debug_events_read() by providing 0 as count, this locks up a system. Fix this by rewriting the ring buffer implementation with kfifo and simplify the code. This fixes CVE-2019-3819. v2: fix an execution logic and add a comment v3: use __set_current_state() instead of set_current_state() Link: https://bugzilla.redhat.com/show_bug.cgi?id=1669187 Cc: stable(a)vger.kernel.org # v4.18+ Fixes: cd667ce24796 ("HID: use debugfs for events/reports dumping") Fixes: 717adfdaf147 ("HID: debug: check length before copy_to_user()") Signed-off-by: Vladis Dronov <vdronov(a)redhat.com> Reviewed-by: Oleg Nesterov <oleg(a)redhat.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com> diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index c530476edba6..ac9fda1b5a72 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -30,6 +30,7 @@ #include <linux/debugfs.h> #include <linux/seq_file.h> +#include <linux/kfifo.h> #include <linux/sched/signal.h> #include <linux/export.h> #include <linux/slab.h> @@ -661,17 +662,12 @@ EXPORT_SYMBOL_GPL(hid_dump_device); /* enqueue string to 'events' ring buffer */ void hid_debug_event(struct hid_device *hdev, char *buf) { - unsigned i; struct hid_debug_list *list; unsigned long flags; spin_lock_irqsave(&hdev->debug_list_lock, flags); - list_for_each_entry(list, &hdev->debug_list, node) { - for (i = 0; buf[i]; i++) - list->hid_debug_buf[(list->tail + i) % HID_DEBUG_BUFSIZE] = - buf[i]; - list->tail = (list->tail + i) % HID_DEBUG_BUFSIZE; - } + list_for_each_entry(list, &hdev->debug_list, node) + kfifo_in(&list->hid_debug_fifo, buf, strlen(buf)); spin_unlock_irqrestore(&hdev->debug_list_lock, flags); wake_up_interruptible(&hdev->debug_wait); @@ -722,8 +718,7 @@ void hid_dump_input(struct hid_device *hdev, struct hid_usage *usage, __s32 valu hid_debug_event(hdev, buf); kfree(buf); - wake_up_interruptible(&hdev->debug_wait); - + wake_up_interruptible(&hdev->debug_wait); } EXPORT_SYMBOL_GPL(hid_dump_input); @@ -1083,8 +1078,8 @@ static int hid_debug_events_open(struct inode *inode, struct file *file) goto out; } - if (!(list->hid_debug_buf = kzalloc(HID_DEBUG_BUFSIZE, GFP_KERNEL))) { - err = -ENOMEM; + err = kfifo_alloc(&list->hid_debug_fifo, HID_DEBUG_FIFOSIZE, GFP_KERNEL); + if (err) { kfree(list); goto out; } @@ -1104,77 +1099,57 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos) { struct hid_debug_list *list = file->private_data; - int ret = 0, len; + int ret = 0, copied; DECLARE_WAITQUEUE(wait, current); mutex_lock(&list->read_mutex); - while (ret == 0) { - if (list->head == list->tail) { - add_wait_queue(&list->hdev->debug_wait, &wait); - set_current_state(TASK_INTERRUPTIBLE); - - while (list->head == list->tail) { - if (file->f_flags & O_NONBLOCK) { - ret = -EAGAIN; - break; - } - if (signal_pending(current)) { - ret = -ERESTARTSYS; - break; - } + if (kfifo_is_empty(&list->hid_debug_fifo)) { + add_wait_queue(&list->hdev->debug_wait, &wait); + set_current_state(TASK_INTERRUPTIBLE); + + while (kfifo_is_empty(&list->hid_debug_fifo)) { + if (file->f_flags & O_NONBLOCK) { + ret = -EAGAIN; + break; + } - if (!list->hdev || !list->hdev->debug) { - ret = -EIO; - set_current_state(TASK_RUNNING); - goto out; - } + if (signal_pending(current)) { + ret = -ERESTARTSYS; + break; + } - /* allow O_NONBLOCK from other threads */ - mutex_unlock(&list->read_mutex); - schedule(); - mutex_lock(&list->read_mutex); - set_current_state(TASK_INTERRUPTIBLE); + /* if list->hdev is NULL we cannot remove_wait_queue(). + * if list->hdev->debug is 0 then hid_debug_unregister() + * was already called and list->hdev is being destroyed. + * if we add remove_wait_queue() here we can hit a race. + */ + if (!list->hdev || !list->hdev->debug) { + ret = -EIO; + set_current_state(TASK_RUNNING); + goto out; } - set_current_state(TASK_RUNNING); - remove_wait_queue(&list->hdev->debug_wait, &wait); + /* allow O_NONBLOCK from other threads */ + mutex_unlock(&list->read_mutex); + schedule(); + mutex_lock(&list->read_mutex); + set_current_state(TASK_INTERRUPTIBLE); } - if (ret) - goto out; + __set_current_state(TASK_RUNNING); + remove_wait_queue(&list->hdev->debug_wait, &wait); - /* pass the ringbuffer contents to userspace */ -copy_rest: - if (list->tail == list->head) + if (ret) goto out; - if (list->tail > list->head) { - len = list->tail - list->head; - if (len > count) - len = count; - - if (copy_to_user(buffer + ret, &list->hid_debug_buf[list->head], len)) { - ret = -EFAULT; - goto out; - } - ret += len; - list->head += len; - } else { - len = HID_DEBUG_BUFSIZE - list->head; - if (len > count) - len = count; - - if (copy_to_user(buffer, &list->hid_debug_buf[list->head], len)) { - ret = -EFAULT; - goto out; - } - list->head = 0; - ret += len; - count -= len; - if (count > 0) - goto copy_rest; - } - } + + /* pass the fifo content to userspace, locking is not needed with only + * one concurrent reader and one concurrent writer + */ + ret = kfifo_to_user(&list->hid_debug_fifo, buffer, count, &copied); + if (ret) + goto out; + ret = copied; out: mutex_unlock(&list->read_mutex); return ret; @@ -1185,7 +1160,7 @@ static __poll_t hid_debug_events_poll(struct file *file, poll_table *wait) struct hid_debug_list *list = file->private_data; poll_wait(file, &list->hdev->debug_wait, wait); - if (list->head != list->tail) + if (!kfifo_is_empty(&list->hid_debug_fifo)) return EPOLLIN | EPOLLRDNORM; if (!list->hdev->debug) return EPOLLERR | EPOLLHUP; @@ -1200,7 +1175,7 @@ static int hid_debug_events_release(struct inode *inode, struct file *file) spin_lock_irqsave(&list->hdev->debug_list_lock, flags); list_del(&list->node); spin_unlock_irqrestore(&list->hdev->debug_list_lock, flags); - kfree(list->hid_debug_buf); + kfifo_free(&list->hid_debug_fifo); kfree(list); return 0; @@ -1246,4 +1221,3 @@ void hid_debug_exit(void) { debugfs_remove_recursive(hid_debug_root); } - diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h index 8663f216c563..2d6100edf204 100644 --- a/include/linux/hid-debug.h +++ b/include/linux/hid-debug.h @@ -24,7 +24,10 @@ #ifdef CONFIG_DEBUG_FS +#include <linux/kfifo.h> + #define HID_DEBUG_BUFSIZE 512 +#define HID_DEBUG_FIFOSIZE 512 void hid_dump_input(struct hid_device *, struct hid_usage *, __s32); void hid_dump_report(struct hid_device *, int , u8 *, int); @@ -37,11 +40,8 @@ void hid_debug_init(void); void hid_debug_exit(void); void hid_debug_event(struct hid_device *, char *); - struct hid_debug_list { - char *hid_debug_buf; - int head; - int tail; + DECLARE_KFIFO_PTR(hid_debug_fifo, char); struct fasync_struct *fasync; struct hid_device *hdev; struct list_head node; @@ -64,4 +64,3 @@ struct hid_debug_list { #endif #endif -

6 years, 8 months

1
0
0 0

[PATCH V2] drm/vkms: Fix license inconsistent

by Rodrigo Siqueira

Fixes license inconsistent related to the VKMS driver and remove the redundant boilerplate comment. Fixes: 854502fa0a38 ("drm/vkms: Add basic CRTC initialization") Cc: stable(a)vger.kernel.org Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo(a)gmail.com> --- Changes in V2: - Add "Cc: stable(a)vger.kernel.org" tag drivers/gpu/drm/vkms/vkms_crc.c | 3 ++- drivers/gpu/drm/vkms/vkms_crtc.c | 8 +------- drivers/gpu/drm/vkms/vkms_drv.c | 7 +------ drivers/gpu/drm/vkms/vkms_drv.h | 2 ++ drivers/gpu/drm/vkms/vkms_gem.c | 8 +------- drivers/gpu/drm/vkms/vkms_output.c | 8 +------- drivers/gpu/drm/vkms/vkms_plane.c | 8 +------- 7 files changed, 9 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c index 9d9e8146db90..d7b409a3c0f8 100644 --- a/drivers/gpu/drm/vkms/vkms_crc.c +++ b/drivers/gpu/drm/vkms/vkms_crc.c @@ -1,4 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ + #include "vkms_drv.h" #include <linux/crc32.h> #include <drm/drm_atomic.h> diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 5a095610726b..6ddaa1610807 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -1,10 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +// SPDX-License-Identifier: GPL-2.0+ #include "vkms_drv.h" #include <drm/drm_atomic_helper.h> diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index b13f99a5c849..738dd6206d85 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -1,9 +1,4 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +// SPDX-License-Identifier: GPL-2.0+ /** * DOC: vkms (Virtual Kernel Modesetting) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index e4469cd3d254..81f1cfbeb936 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + #ifndef _VKMS_DRV_H_ #define _VKMS_DRV_H_ diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c index 80311daed47a..138b0bb325cf 100644 --- a/drivers/gpu/drm/vkms/vkms_gem.c +++ b/drivers/gpu/drm/vkms/vkms_gem.c @@ -1,10 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +// SPDX-License-Identifier: GPL-2.0+ #include <linux/shmem_fs.h> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index c5b16efed51a..3b162b25312e 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -1,10 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +// SPDX-License-Identifier: GPL-2.0+ #include "vkms_drv.h" #include <drm/drm_atomic_helper.h> diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 418817600ad1..0e67d2d42f0c 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -1,10 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ +// SPDX-License-Identifier: GPL-2.0+ #include "vkms_drv.h" #include <drm/drm_plane_helper.h> -- 2.20.1 -- Rodrigo Siqueira https://siqueira.tech Graduate Student Department of Computer Science University of São Paulo

6 years, 8 months

2
2
0 0

FAILED: patch "[PATCH] xfs: eof trim writeback mapping as soon as it is cached" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From aa6ee4ab69293969867ab09b57546d226ace3d7a Mon Sep 17 00:00:00 2001 From: Brian Foster <bfoster(a)redhat.com> Date: Fri, 1 Feb 2019 09:36:36 -0800 Subject: [PATCH] xfs: eof trim writeback mapping as soon as it is cached The cached writeback mapping is EOF trimmed to try and avoid races between post-eof block management and writeback that result in sending cached data to a stale location. The cached mapping is currently trimmed on the validation check, which leaves a race window between the time the mapping is cached and when it is trimmed against the current inode size. For example, if a new mapping is cached by delalloc conversion on a blocksize == page size fs, we could cycle various locks, perform memory allocations, etc. in the writeback codepath before the associated mapping is eventually trimmed to i_size. This leaves enough time for a post-eof truncate and file append before the cached mapping is trimmed. The former event essentially invalidates a range of the cached mapping and the latter bumps the inode size such the trim on the next writepage event won't trim all of the invalid blocks. fstest generic/464 reproduces this scenario occasionally and causes a lost writeback and stale delalloc blocks warning on inode inactivation. To work around this problem, trim the cached writeback mapping as soon as it is cached in addition to on subsequent validation checks. This is a minor tweak to tighten the race window as much as possible until a proper invalidation mechanism is available. Fixes: 40214d128e07 ("xfs: trim writepage mapping to within eof") Cc: <stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Brian Foster <bfoster(a)redhat.com> Reviewed-by: Allison Henderson <allison.henderson(a)oracle.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 338b9d9984e0..d9048bcea49c 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -449,6 +449,7 @@ xfs_map_blocks( } wpc->imap = imap; + xfs_trim_extent_eof(&wpc->imap, ip); trace_xfs_map_blocks_found(ip, offset, count, wpc->io_type, &imap); return 0; allocate_blocks: @@ -459,6 +460,7 @@ xfs_map_blocks( ASSERT(whichfork == XFS_COW_FORK || cow_fsb == NULLFILEOFF || imap.br_startoff + imap.br_blockcount <= cow_fsb); wpc->imap = imap; + xfs_trim_extent_eof(&wpc->imap, ip); trace_xfs_map_blocks_alloc(ip, offset, count, wpc->io_type, &imap); return 0; }

6 years, 8 months

1
0
0 0

FAILED: patch "[PATCH] xfs: eof trim writeback mapping as soon as it is cached" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From aa6ee4ab69293969867ab09b57546d226ace3d7a Mon Sep 17 00:00:00 2001 From: Brian Foster <bfoster(a)redhat.com> Date: Fri, 1 Feb 2019 09:36:36 -0800 Subject: [PATCH] xfs: eof trim writeback mapping as soon as it is cached The cached writeback mapping is EOF trimmed to try and avoid races between post-eof block management and writeback that result in sending cached data to a stale location. The cached mapping is currently trimmed on the validation check, which leaves a race window between the time the mapping is cached and when it is trimmed against the current inode size. For example, if a new mapping is cached by delalloc conversion on a blocksize == page size fs, we could cycle various locks, perform memory allocations, etc. in the writeback codepath before the associated mapping is eventually trimmed to i_size. This leaves enough time for a post-eof truncate and file append before the cached mapping is trimmed. The former event essentially invalidates a range of the cached mapping and the latter bumps the inode size such the trim on the next writepage event won't trim all of the invalid blocks. fstest generic/464 reproduces this scenario occasionally and causes a lost writeback and stale delalloc blocks warning on inode inactivation. To work around this problem, trim the cached writeback mapping as soon as it is cached in addition to on subsequent validation checks. This is a minor tweak to tighten the race window as much as possible until a proper invalidation mechanism is available. Fixes: 40214d128e07 ("xfs: trim writepage mapping to within eof") Cc: <stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Brian Foster <bfoster(a)redhat.com> Reviewed-by: Allison Henderson <allison.henderson(a)oracle.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 338b9d9984e0..d9048bcea49c 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -449,6 +449,7 @@ xfs_map_blocks( } wpc->imap = imap; + xfs_trim_extent_eof(&wpc->imap, ip); trace_xfs_map_blocks_found(ip, offset, count, wpc->io_type, &imap); return 0; allocate_blocks: @@ -459,6 +460,7 @@ xfs_map_blocks( ASSERT(whichfork == XFS_COW_FORK || cow_fsb == NULLFILEOFF || imap.br_startoff + imap.br_blockcount <= cow_fsb); wpc->imap = imap; + xfs_trim_extent_eof(&wpc->imap, ip); trace_xfs_map_blocks_alloc(ip, offset, count, wpc->io_type, &imap); return 0; }

6 years, 8 months

1
0
0 0

[PATCHES] Networking

by David Miller

Please queue up the following networking bug fixes for v4.19 and v4.20 -stable, respectively. Thanks!

6 years, 8 months

2
1
0 0

Stable queue: queue-4.20

by CKI

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: fb978c0292e7 Linux 4.20.7 The results of these automated tests are provided below. Overall result: PASSED Patch merge: OK Compile: OK Kernel tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: fb978c0292e7 Linux 4.20.7 We then merged the following patches with `git am`: drm-bufs-fix-spectre-v1-vulnerability.patch drm-v3d-fix-a-use-after-free-race-accessing-the-sche.patch staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch drm-vgem-fix-vgem_init-to-get-drm-device-available.patch pinctrl-bcm2835-use-raw-spinlock-for-rt-compatibilit.patch clk-sunxi-ng-h6-set-video-plls-limits.patch asoc-intel-mrfld-fix-uninitialized-variable-access.patch gpiolib-fix-possible-use-after-free-on-label.patch drm-sun4i-initialize-registers-in-tcon-top-driver.patch ath10k-fixup-extended-per-sta-tx-statistics.patch genirq-affinity-spread-irqs-to-all-available-numa-no.patch gpu-ipu-v3-image-convert-prevent-race-between-run-an.patch drm-amd-display-fix-potential-nullptr-error.patch nds32-fix-gcc-8.0-compiler-option-incompatible.patch wil6210-fix-reset-flow-for-talyn-mb.patch wil6210-fix-memory-leak-in-wil_find_tx_bcast_2.patch ath10k-assign-n_cipher_suites-for-wcn3990.patch ath9k-dynack-use-authentication-messages-for-late-ac.patch scsi-lpfc-correct-lcb-rjt-handling.patch scsi-mpt3sas-call-sas_remove_host-before-removing-th.patch scsi-lpfc-fix-logo-plogi-handling-when-triggerd-by-a.patch arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch clk-boston-fix-possible-memory-leak-in-clk_boston_se.patch dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch x86-pci-fix-broadcom-cnb20le-unintended-sign-extensi.patch powerpc-pseries-add-of_node_put-in-dlpar_detach_node.patch bpftool-improve-handling-of-enoent-on-map-dumps.patch s390-qeth-utilize-virtual-mac-for-layer2-osd-devices.patch crypto-aes_ti-disable-interrupts-while-accessing-s-b.patch drm-vc4-x_scaling-1-should-never-be-set-to-vc4_scali.patch serial-fsl_lpuart-clear-parity-enable-bit-when-disab.patch ptp-check-gettime64-return-code-in-ptp_sys_offset-io.patch mips-boston-disable-eg20t-prefetch.patch dpaa2-ptp-defer-probe-when-portal-allocation-failed.patch iwlwifi-fw-do-not-set-sgi-bits-for-he-connection.patch staging-iio-ad2s90-make-probe-handle-spi_setup-failu.patch fpga-altera-cvp-fix-registration-for-cvp-incapable-d.patch tools-hv-kvp-fix-a-warning-of-buffer-overflow-with-g.patch fpga-altera-cvp-fix-bad-io-access-on-x86_64.patch vbox-fix-link-error-with-gcc-og.patch platform-chrome-don-t-report-ec_mkbp_event_sensor_fi.patch i40e-suppress-bogus-error-message.patch i40e-prevent-overlapping-tx_timeout-recover.patch scsi-hisi_sas-change-the-time-of-sas-ssp-connection.patch staging-iio-ad7780-update-voltage-on-read.patch usbnet-smsc95xx-fix-rx-packet-alignment.patch drm-rockchip-fix-for-mailbox-read-size.patch arm-omap2-hwmod-fix-some-section-annotations.patch drm-amd-display-fix-gamma-not-being-applied-correctl.patch drm-amd-display-calculate-stream-phy_pix_clk-before-.patch bpf-libbpf-retry-map-creation-without-the-name.patch net-mlx5-eq-use-the-right-place-to-store-read-irq-af.patch modpost-validate-symbol-names-also-in-find_elf_symbo.patch perf-tools-add-hygon-dhyana-support.patch scsi-cxgb4i-fix-thermal-configuration-dependencies.patch soc-tegra-don-t-leak-device-tree-node-reference.patch media-rc-ensure-close-is-called-on-rc_unregister_dev.patch media-video-i2c-avoid-accessing-released-memory-area.patch media-mtk-vcodec-release-device-nodes-in-mtk_vcodec_.patch staging-erofs-fix-the-definition-of-dbg_bugon.patch staging-erofs-fix-race-when-the-managed-cache-is-ena.patch x86-resctrl-fixup-the-user-visible-strings.patch media-vivid-fill-in-media_device-bus_info.patch rdma-core-sync-unregistration-with-netlink-commands.patch drm-rcar-du-fix-external-clock-error-checks.patch asoc-sunxi-sun50i-codec-analog-add-support-for-cpvdd.patch clk-meson-meson8b-do-not-use-cpu_div3-for-cpu_scale_.patch clk-meson-meson8b-fix-the-width-of-the-cpu_scale_div.patch clk-meson-meson8b-mark-the-cpu-clock-as-clk_is_criti.patch ptp-fix-pass-zero-to-err_ptr-in-ptp_clock_register.patch dmaengine-xilinx_dma-remove-__aligned-attribute-on-z.patch powerpc-32-add-.data.lubsan_data-.data.lubsan_type-s.patch iio-adc-meson-saradc-check-for-devm_kasprintf-failur.patch iio-adc-meson-saradc-fix-internal-clock-names.patch iio-accel-kxcjk1013-add-kiox010a-acpi-hardware-id.patch media-adv-tc358743-ths8200-fill-in-min-width-height-.patch acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch staging-pi433-fix-potential-null-dereference.patch f2fs-avoid-gc-causing-encrypted-file-corrupted.patch f2fs-move-dir-data-flush-to-write-checkpoint-process.patch f2fs-avoid-build-warn-of-fall_through.patch f2fs-fix-race-between-write_checkpoint-and-write_beg.patch f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch arm64-io-ensure-calls-to-delay-routines-are-ordered-.patch net-aquantia-return-err-if-set-mpi_deinit-state-fail.patch sunvdc-do-not-spin-in-an-infinite-loop-when-vio_ldc_.patch soc-bcm-brcmstb-don-t-leak-device-tree-node-referenc.patch nfsd4-fix-crash-on-writing-v4_end_grace-before-nfsd-.patch drm-clear-state-acquire_ctx-before-leaving-drm_atomi.patch perf-arm_spe-handle-devm_kasprintf-failure.patch arm64-io-ensure-value-passed-to-__iormb-is-held-in-a.patch thermal-do-not-clear-passive-state-during-system-sle.patch thermal-fix-locking-in-cooling-device-sysfs-update-c.patch firmware-efi-add-null-pointer-checks-in-efivars-api-.patch s390-zcrypt-improve-special-ap-message-cmd-handling.patch mt76x0-dfs-fix-ibi_r11-configuration-on-non-radar-ch.patch arm64-ftrace-don-t-adjust-the-lr-value.patch drm-v3d-fix-prime-imports-of-buffers-from-other-driv.patch arm-dts-mmp2-fix-twsi2.patch arm-mmp-mmp2-dt-enable-the-clock.patch arm-dts-aspeed-add-missing-memory-unit-address.patch spi-fix-spi-at91-usart.c-build-errors-when-pinctrl-i.patch x86-fpu-add-might_fault-to-user_insn.patch media-i2c-tda1997x-select-config_hdmi.patch media-davinci-vpbe-fix-error-handling-in-vpbe_initia.patch platform-x86-fix-config-space-access-for-intel_atomi.patch smack-fix-access-permissions-for-keyring.patch xtensa-xtfpga.dtsi-fix-dtc-warnings-about-spi.patch usb-dwc3-correct-the-logic-for-checking-trb-full-in-.patch dmaengine-sprd-support-dma-link-list-cyclic-callback.patch usb-dwc2-disable-power-down-feature-on-samsung-socs.patch usb-hub-delay-hub-autosuspend-if-usb3-port-is-still-.patch timekeeping-use-proper-seqcount-initializer.patch usb-mtu3-fix-the-issue-about-setfeature-u1-u2_enable.patch clk-sunxi-ng-a33-set-clk_set_rate_parent-for-all-aud.patch media-imx274-select-regmap_i2c.patch mac80211-fix-deauth-tx-when-we-disconnect.patch pinctrl-nuvoton-check-for-devm_kasprintf-failure.patch drm-amdgpu-powerplay-fix-clock-stretcher-limits-on-p.patch tipc-fix-node-keep-alive-interval-calculation.patch arm64-dts-rockchip-fix-rk3399-rockpro64-regulator-gp.patch driver-core-move-async_synchronize_full-call.patch kobject-return-error-code-if-writing-sys-.-uevent-fa.patch ib-hfi1-unreserve-a-reserved-request-when-it-is-comp.patch usb-dwc3-trace-add-missing-break-statement-to-make-c.patch gpio-mt7621-report-failure-of-devm_kasprintf.patch gpio-mt7621-pass-mediatek_gpio_bank_probe-failure-up.patch pinctrl-sx150x-handle-failure-case-of-devm_kstrdup.patch iommu-amd-fix-amd_iommu-force_isolation.patch media-v4l2-device-link-subdevices-to-their-parent-de.patch arm-omap1-ams-delta-fix-audio-permanently-muted.patch arm-dts-fix-omap4430-sdp-ethernet-startup.patch mips-bpf-fix-encoding-bug-for-mm_srlv32_op.patch media-coda-fix-h.264-deblocking-filter-controls.patch arm64-dts-meson-fix-irq-trigger-type-for-macirq.patch arm-dts-fix-up-the-d-link-dir-685-mtd-partition-info.patch tracing-have-trace_stack-nr_entries-compare-not-be-s.patch watchdog-renesas_wdt-don-t-set-divider-while-watchdo.patch arm-dts-imx51-zii-rdu1-do-not-specify-power-gpio-for.patch usb-dwc3-gadget-disable-csp-for-stream-out-ep.patch iommu-arm-smmu-v3-avoid-memory-corruption-from-hisil.patch iommu-arm-smmu-add-support-for-qcom-smmu-v2-variant.patch iommu-arm-smmu-v3-use-explicit-mb-when-moving-cons-p.patch sata_rcar-fix-deferred-probing.patch clk-imx6sl-ensure-mmdc-ch0-handshake-is-bypassed.patch platform-x86-mlx-platform-fix-tachometer-registers.patch cpuidle-big.little-fix-refcount-leak.patch opp-use-opp_table-regulators-to-verify-no-regulator-.patch tee-optee-avoid-possible-double-list_del.patch drm-msm-dsi-fix-dsi-clock-names-in-dsi-10nm-pll-driv.patch drm-msm-dpu-only-check-flush-register-against-pendin.patch lightnvm-pblk-fix-resubmission-of-overwritten-write-.patch lightnvm-pblk-add-lock-protection-to-list-operations.patch i2c-axxia-check-for-error-conditions-first.patch lightnvm-fix-uninitialized-return-value-in-nvm_get_c.patch phy-sun4i-usb-add-support-for-missing-usb-phy-index.patch mlxsw-spectrum_acl-limit-priority-value.patch udf-fix-bug-on-corrupted-inode.patch switchtec-fix-switchtec_ioctl_event_idx_all-flags-ov.patch selftests-bpf-use-__bpf_constant_htons-in-test_prog..patch arm-pxa-avoid-section-mismatch-warning.patch asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch arm-mmp-fix-timer_init-calls.patch fix-dma-buf-udmabuf-selftest.patch clk-qcom-leave-mmss-noc-on-for-8998.patch f2fs-fix-to-reorder-set_page_dirty-and-wait_on_page_.patch ipv6-fix-handling-of-lla-with-vrf-and-sockets-bound-.patch tools-bpftool-fix-wmissing-declaration-warnings.patch kvm-ppc-book3s-only-report-kvm_cap_spapr_tce_vfio-on.patch mmc-bcm2835-recover-from-mmc_send_ext_csd.patch mmc-bcm2835-reset-host-on-timeout.patch mmc-meson-mx-sdio-check-devm_kasprintf-for-failure.patch memstick-prevent-memstick-host-from-getting-runtime-.patch mmc-sdhci-of-esdhc-fix-timeout-checks.patch mmc-sdhci-omap-fix-timeout-checks.patch mmc-sdhci-xenon-fix-timeout-checks.patch mmc-jz4740-get-cd-wp-gpios-from-descriptors.patch usb-renesas_usbhs-add-support-for-rz-g2e.patch btrfs-harden-agaist-duplicate-fsid-on-scanned-device.patch btrfs-reada-reorder-dev-replace-locks-before-radix-t.patch serial-sh-sci-fix-locking-in-sci_submit_rx.patch serial-sh-sci-resume-pio-in-sci_rx_interrupt-on-dma-.patch tty-serial-samsung-properly-set-flags-in-autocts-mod.patch perf-stat-fix-csv-mode-column-output-for-non-cgroup-.patch perf-test-fix-perf_event_attr-test-failure.patch perf-dso-fix-unchecked-usage-of-strncpy.patch perf-header-fix-unchecked-usage-of-strncpy.patch btrfs-use-tagged-writepage-to-mitigate-livelock-of-s.patch perf-probe-fix-unchecked-usage-of-strncpy.patch i2c-sh_mobile-add-support-for-r8a774c0-rz-g2e.patch bnxt_en-disable-msix-before-re-reserving-nqs-cmpl-ri.patch kvm-s390-unregister-debug-feature-on-failing-arch-in.patch tools-power-x86-intel_pstate_tracer-fix-non-root-exe.patch pinctrl-rza1-handle-devm_kasprintf-failure-cases.patch mac80211-properly-handle-skb-with-radiotap-only.patch livepatch-check-kzalloc-return-values.patch arm64-kvm-skip-mmio-insn-after-emulation.patch usb-musb-dsps-fix-otg-state-machine.patch usb-musb-dsps-fix-runtime-pm-for-peripheral-mode.patch perf-header-fix-up-argument-to-ctime.patch perf-tools-cast-off_t-to-s64-to-avoid-warning-on-bio.patch percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch net-hns3-fix-error-handling-int-the-hns3_get_vector_.patch net-hns3-fix-incomplete-uninitialization-of-irq-in-t.patch drm-amd-display-add-retry-to-read-ddc_clock-pin.patch drm-amd-display-wait-edp-hpd-to-high-in-detect_sink.patch bluetooth-hci_bcm-handle-deferred-probing-for-the-cl.patch drm-amd-display-fix-ycbcr420-blank-color.patch powerpc-uaccess-fix-warning-error-with-access_ok.patch mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch xfrm6_tunnel-fix-spi-check-in-__xfrm6_tunnel_alloc_s.patch mlxsw-spectrum-properly-cleanup-lag-uppers-when-remo.patch scsi-smartpqi-correct-host-serial-num-for-ssa.patch scsi-smartpqi-correct-volume-status.patch scsi-smartpqi-increase-fw-status-register-read-timeo.patch cw1200-fix-concurrency-use-after-free-bugs-in-cw1200.patch net-hns3-add-max-vector-number-check-for-pf.patch net-hns3-fix-the-descriptor-index-when-get-rss-type.patch net-hns3-don-t-restore-rules-when-flow-director-is-d.patch powerpc-perf-fix-thresholding-counter-data-for-unkno.patch iwlwifi-mvm-fix-setting-he-ppe-fw-config.patch powerpc-powernv-ioda-allocate-indirect-tce-levels-of.patch mlx5-update-timecounter-at-least-twice-per-counter-o.patch drbd-narrow-rcu_read_lock-in-drbd_sync_handshake.patch drbd-disconnect-if-the-wrong-uuids-are-attached-on-a.patch drbd-skip-spurious-timeout-ping-timeo-when-failing-p.patch drbd-avoid-clang-warning-about-pointless-switch-stat.patch ath10k-fix-kernel-panic-due-to-use-after-free.patch ath10k-fix-tx_stats-memory-leak.patch drm-amd-display-validate-extended-dongle-caps.patch video-clps711x-fb-release-disp-device-node-in-probe.patch md-fix-raid10-hang-issue-caused-by-barrier.patch fbdev-fbmem-behave-better-with-small-rotated-display.patch i40e-define-proper-net_device-neigh_priv_len.patch ice-do-not-enable-napi-on-q_vectors-that-have-no-rin.patch igb-fix-an-issue-that-pme-is-not-enabled-during-runt.patch acpi-apei-clear-ghes-block_status-before-panic.patch fbdev-fbcon-fix-unregister-crash-when-more-than-one-.patch bpf-sk_msg-zap-ingress-queue-on-psock-down.patch powerpc-mm-fix-reporting-of-kernel-execute-faults-on.patch bpf-sk_msg-fix-socket-data_ready-events.patch pinctrl-meson-meson8-fix-the-gpio-function-for-the-g.patch pinctrl-meson-meson8b-fix-the-gpio-function-for-the-.patch kvm-x86-svm-report-msr_ia32_mcg_ext_ctl-as-unsupport.patch powerpc-fadump-do-not-allow-hot-remove-memory-from-f.patch selftests-kvm-report-failed-stage-when-exit-reason-i.patch kvm-change-offset-in-kvm_write_guest_offset_cached-t.patch nfs-nfs_compare_mount_options-always-compare-auth-fl.patch perf-build-don-t-unconditionally-link-the-libbfd-fea.patch hwmon-lm80-fix-a-missing-check-of-the-status-of-smbu.patch hwmon-lm80-fix-a-missing-check-of-bus-read-in-lm80-p.patch seq_buf-make-seq_buf_puts-null-terminate-the-buffer.patch crypto-ux500-use-proper-enum-in-cryp_set_dma_transfe.patch crypto-ux500-use-proper-enum-in-hash_set_dma_transfe.patch mips-ralink-select-config_cpu_mipsr2_irq_vi-on-mt762.patch cifs-check-ntwrk_buf_start-for-null-before-dereferen.patch f2fs-fix-use-after-free-issue-when-accessing-sbi-sta.patch um-avoid-marking-pages-with-changed-protection.patch niu-fix-missing-checks-of-niu_pci_eeprom_read.patch f2fs-fix-sbi-extent_list-corruption-issue.patch cgroup-fix-parsing-empty-mount-option-string.patch perf-python-do-not-force-closing-original-perf-descr.patch scripts-decode_stacktrace-only-strip-base-path-when-.patch arch-sh-boards-mach-kfr2r09-setup.c-fix-struct-mtd_o.patch ocfs2-don-t-clear-bh-uptodate-for-block-read.patch ocfs2-improve-ocfs2-makefile.patch mm-page_alloc.c-don-t-call-kasan_free_pages-at-defer.patch zram-fix-lockdep-warning-of-free-block-handling.patch isdn-hisax-hfc_pci-fix-a-possible-concurrency-use-af.patch gdrom-fix-a-memory-leak-bug.patch fsl-fman-use-gfp_atomic-in-memac-tgec-_add_hash_mac_.patch block-swim3-fix-ebusy-error-when-re-opening-device-a.patch thermal-bcm2835-enable-hwmon-explicitly.patch kdb-don-t-back-trace-on-a-cpu-that-didn-t-round-up.patch thermal-tsens-qcom-do-not-create-duplicate-regmap-de.patch pci-imx-enable-msi-from-downstream-components.patch block-swim3-fix-regression-on-powerbook-g3.patch thermal-generic-adc-fix-adc-to-temp-interpolation.patch hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch arm64-sve-ptrace-fix-sve_pt_regs_offset-definition.patch fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch kernel-hung_task.c-force-console-verbose-before-pani.patch fs-epoll-drop-ovflist-branch-prediction.patch exec-load_script-don-t-blindly-truncate-shebang-stri.patch kernel-kcov.c-mark-write_comp_data-as-notrace.patch scripts-gdb-fix-lx-version-string-output.patch xprtrdma-don-t-wake-pending-tasks-until-disconnect-i.patch Compile testing --------------- We compiled the kernel for 4 architectures: s390x: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/s390x/84aa777a1df117393c5b9767e9d1… powerpc64le: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/ppc64le/31730c6b890b1cacfa9e66c028… aarch64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/aarch64/8b198f5bf4cbc0f66dbef8976f… x86_64: make options: make INSTALL_MOD_STRIP=1 -j64 targz-pkg -j64 configuration: https://artifacts.cki-project.org/builds/x86_64/f58bd1eb5d906a347d21ddde002… Hardware testing ---------------- We booted each kernel and ran the following tests: s390: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… NFS Connectathon - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… powerpc: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… NFS Connectathon - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… arm64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… NFS Connectathon - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… x86_64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… Loopdev Sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… NFS Connectathon - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Ethernet drivers sanity - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

6 years, 8 months

1
0
0 0

[PATCH 2/2] parport_pc: fix find_superio io compare code, should use equal test.

by Sudip Mukherjee

From: QiaoChong <qiaochong(a)loongson.cn> In the original code before 181bf1e815a2 the loop was continuing until it finds the first matching superios[i].io and p->base. But after 181bf1e815a2 the logic changed and the loop now returns the pointer to the first mismatched array element which is then used in get_superio_dma() and get_superio_irq() and thus returning the wrong value. Fix the condition so that it now returns the correct pointer. Fixes: 181bf1e815a2 ("parport_pc: clean up the modified while loops using for") Cc: Alan Cox <alan(a)linux.intel.com> Cc: stable(a)vger.kernel.org Signed-off-by: QiaoChong <qiaochong(a)loongson.cn> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> [rewrite the commit message] --- drivers/parport/parport_pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 9c8249f74479..6296dbb83d47 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c @@ -1377,7 +1377,7 @@ static struct superio_struct *find_superio(struct parport *p) { int i; for (i = 0; i < NR_SUPERIOS; i++) - if (superios[i].io != p->base) + if (superios[i].io == p->base) return &superios[i]; return NULL; } -- 2.11.0

6 years, 8 months

1
0
0 0

[PATCH AUTOSEL 3.18 1/4] ARM: dts: da850-evm: Correct the sound card name

by Sasha Levin

From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> [ Upstream commit 7fca69d4e43fa1ae9cb4f652772c132dc5a659c6 ] To avoid the following error: asoc-simple-card sound: ASoC: Failed to create card debugfs directory Which is because the card name contains '/' character, which can not be used in file or directory names. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/boot/dts/da850-evm.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 4f935ad9f27b..505ea30c9cb2 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -146,7 +146,7 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,name = "DA850/OMAP-L138 EVM"; + simple-audio-card,name = "DA850-OMAPL138 EVM"; simple-audio-card,widgets = "Line", "Line In", "Line", "Line Out"; -- 2.19.1

6 years, 8 months

1
3
0 0

[PATCH AUTOSEL 4.4 1/4] ARM: dts: da850-evm: Correct the sound card name

by Sasha Levin

From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> [ Upstream commit 7fca69d4e43fa1ae9cb4f652772c132dc5a659c6 ] To avoid the following error: asoc-simple-card sound: ASoC: Failed to create card debugfs directory Which is because the card name contains '/' character, which can not be used in file or directory names. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/boot/dts/da850-evm.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 6881757b03e8..67369f284b91 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -147,7 +147,7 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,name = "DA850/OMAP-L138 EVM"; + simple-audio-card,name = "DA850-OMAPL138 EVM"; simple-audio-card,widgets = "Line", "Line In", "Line", "Line Out"; -- 2.19.1

6 years, 8 months

1
3
0 0

[PATCH AUTOSEL 4.9 01/12] ACPI: NUMA: Use correct type for printing addresses on i386-PAE

by Sasha Levin

From: Chao Fan <fanc.fnst(a)cn.fujitsu.com> [ Upstream commit b9ced18acf68dffebe6888c7ec765a2b1db7a039 ] The addresses of NUMA nodes are not printed correctly on i386-PAE which is misleading. Here is a debian9-32bit with PAE in a QEMU guest having more than 4G of memory: qemu-system-i386 \ -hda /var/lib/libvirt/images/debian32.qcow2 \ -m 5G \ -enable-kvm \ -smp 10 \ -numa node,mem=512M,nodeid=0,cpus=0 \ -numa node,mem=512M,nodeid=1,cpus=1 \ -numa node,mem=512M,nodeid=2,cpus=2 \ -numa node,mem=512M,nodeid=3,cpus=3 \ -numa node,mem=512M,nodeid=4,cpus=4 \ -numa node,mem=512M,nodeid=5,cpus=5 \ -numa node,mem=512M,nodeid=6,cpus=6 \ -numa node,mem=512M,nodeid=7,cpus=7 \ -numa node,mem=512M,nodeid=8,cpus=8 \ -numa node,mem=512M,nodeid=9,cpus=9 \ -serial stdio Because of the wrong value type, it prints as below: [ 0.021049] ACPI: SRAT Memory (0x0 length 0xa0000) in proximity domain 0 enabled [ 0.021740] ACPI: SRAT Memory (0x100000 length 0x1ff00000) in proximity domain 0 enabled [ 0.022425] ACPI: SRAT Memory (0x20000000 length 0x20000000) in proximity domain 1 enabled [ 0.023092] ACPI: SRAT Memory (0x40000000 length 0x20000000) in proximity domain 2 enabled [ 0.023764] ACPI: SRAT Memory (0x60000000 length 0x20000000) in proximity domain 3 enabled [ 0.024431] ACPI: SRAT Memory (0x80000000 length 0x20000000) in proximity domain 4 enabled [ 0.025104] ACPI: SRAT Memory (0xa0000000 length 0x20000000) in proximity domain 5 enabled [ 0.025791] ACPI: SRAT Memory (0x0 length 0x20000000) in proximity domain 6 enabled [ 0.026412] ACPI: SRAT Memory (0x20000000 length 0x20000000) in proximity domain 7 enabled [ 0.027118] ACPI: SRAT Memory (0x40000000 length 0x20000000) in proximity domain 8 enabled [ 0.027802] ACPI: SRAT Memory (0x60000000 length 0x20000000) in proximity domain 9 enabled The upper half of the start address of the NUMA domains between 6 and 9 inclusive was cut, so the printed values are incorrect. Fix the value type, to get the correct values in the log as follows: [ 0.023698] ACPI: SRAT Memory (0x0 length 0xa0000) in proximity domain 0 enabled [ 0.024325] ACPI: SRAT Memory (0x100000 length 0x1ff00000) in proximity domain 0 enabled [ 0.024981] ACPI: SRAT Memory (0x20000000 length 0x20000000) in proximity domain 1 enabled [ 0.025659] ACPI: SRAT Memory (0x40000000 length 0x20000000) in proximity domain 2 enabled [ 0.026317] ACPI: SRAT Memory (0x60000000 length 0x20000000) in proximity domain 3 enabled [ 0.026980] ACPI: SRAT Memory (0x80000000 length 0x20000000) in proximity domain 4 enabled [ 0.027635] ACPI: SRAT Memory (0xa0000000 length 0x20000000) in proximity domain 5 enabled [ 0.028311] ACPI: SRAT Memory (0x100000000 length 0x20000000) in proximity domain 6 enabled [ 0.028985] ACPI: SRAT Memory (0x120000000 length 0x20000000) in proximity domain 7 enabled [ 0.029667] ACPI: SRAT Memory (0x140000000 length 0x20000000) in proximity domain 8 enabled [ 0.030334] ACPI: SRAT Memory (0x160000000 length 0x20000000) in proximity domain 9 enabled Signed-off-by: Chao Fan <fanc.fnst(a)cn.fujitsu.com> [ rjw: Subject & changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/acpi/numa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 17b518cb787c..0ea065c6725a 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -147,9 +147,9 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) { struct acpi_srat_mem_affinity *p = (struct acpi_srat_mem_affinity *)header; - pr_debug("SRAT Memory (0x%lx length 0x%lx) in proximity domain %d %s%s%s\n", - (unsigned long)p->base_address, - (unsigned long)p->length, + pr_debug("SRAT Memory (0x%llx length 0x%llx) in proximity domain %d %s%s%s\n", + (unsigned long long)p->base_address, + (unsigned long long)p->length, p->proximity_domain, (p->flags & ACPI_SRAT_MEM_ENABLED) ? "enabled" : "disabled", -- 2.19.1

6 years, 8 months

1
11
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror