4.9.311-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 115/218 tty: hvc: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 53819a0d97aace1425bb042829e3446952a9e8a9 ]
__setup() handlers should return 1 to indicate that the boot option has been handled or 0 to indicate that it was not handled. Add a pr_warn() message if the option value is invalid and then always return 1.
--- drivers/tty/hvc/hvc_iucv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/tty/hvc/hvc_iucv.c +3 -1
@@ -1469,7 +1469,9 @@ static int __init hvc_iucv_init(void)*/ static int __init hvc_iucv_config (char *val) { -return kstrtoul (val,10 , &hvc_iucv_devices); +if (kstrtoul (val,10 , &hvc_iucv_devices)) +pr_warn ("hvc_iucv= invalid parameter value '%s'\n" , val); +return 1 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 133/218 video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
In reply to Greg Kroah-HartmanFrom: Tim Gardner <[email protected]>
[ Upstream commit 37a1a2e6eeeb101285cd34e12e48a881524701aa ]
Coverity complains of a possible buffer overflow. However, given the 'static' scope of nvidia_setup_i2c_bus() it looks like that can't happen after examiniing the call sites.
CID 19036 (#1 of 1): Copy into fixed size buffer (STRING_OVERFLOW)
1. fixed_size_dest: You might overrun the 48-character fixed-size string chan->adapter.name by copying name without checking the length.
2. parameter_as_source: Note: This defect has an elevated risk because the source argument is a parameter of the current function.
89 strcpy(chan->adapter.name, name);
Fix this warning by using strscpy() which will silence the warning and prevent any future buffer overflows should the names used to identify the channel become much longer.
--- drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/nvidia/nv_i2c.c +1 -1
@@ -86,7 +86,7 @@ static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name, {int rc; -strcpy (chan->adapter.name, name); +strscpy (chan->adapter.name, name,sizeof (chan->adapter.name)); chan->adapter.owner =THIS_MODULE ; chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 185/218 virtio_console: eliminate anonymous module_init & module_exit
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit fefb8a2a941338d871e2d83fbd65fbfa068857bd ]
Eliminate anonymous module_init() and module_exit(), which can lead to confusion or ambiguity when reading System.map, crashes/oops/bugs, or an initcall_debug log.
Give each of these init and exit functions unique driver-specific names to eliminate the anonymous names.
Example 1: (System.map)
ffffffff832fc78c t init
ffffffff832fc79e t init
ffffffff832fc8f8 t init
Example 2: (initcall_debug log)
calling init+0x0/0x12 @ 1
initcall init+0x0/0x12 returned 0 after 15 usecs
calling init+0x0/0x60 @ 1
initcall init+0x0/0x60 returned 0 after 2 usecs
calling init+0x0/0x9a @ 1
initcall init+0x0/0x9a returned 0 after 74 usecs
--- drivers/char/virtio_console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/char/virtio_console.c +4 -4
@@ -2284,7 +2284,7 @@ static struct virtio_driver virtio_rproc_serial = { .remove = virtcons_remove, }; -static int __init init (void ) +static int __init virtio_console_init (void ) {int err;
@@ -2321,7 +2321,7 @@ static int __init init(void)return err; } -static void __exit fini(void) +static void __exit virtio_console_fini(void) {reclaim_dma_bufs ();
@@ -2331,8 +2331,8 @@ static void __exit fini(void)class_destroy (pdrvdata.class);debugfs_remove_recursive (pdrvdata.debugfs_dir); } -module_init (init); -module_exit (fini); +module_init (virtio_console_init); +module_exit (virtio_console_fini);MODULE_DESCRIPTION ("Virtio console driver" );MODULE_LICENSE ("GPL" );
Signature · 8 lines
2.35.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Greg Kroah-Hartman
maintainerPATCH 164/218 ARM: 9187/1: JIVE: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 8b2360c7157b462c4870d447d1e65d30ef31f9aa ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from jive_mtdset().
--- arch/arm/mach-s3c24xx/mach-jive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-s3c24xx/mach-jive.c +3 -3
@@ -240,11 +240,11 @@ static int __init jive_mtdset(char *options)unsigned long set;if (options ==NULL || options[0 ] =='\0' ) -return 0 ; +return 1 ;if (kstrtoul (options,10 , &set)) {printk (KERN_ERR "failed to parse mtdset=%s\n" , options); -return 0 ; +return 1 ; }switch (set) {
@@ -259,7 +259,7 @@ static int __init jive_mtdset(char *options) "using default.", set); } -return 0 ; +return 1 ; }/* parse the mtdset= option given to the kernel command line */
Signature · 9 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 26/218 drivers: hamradio: 6pack: fix UAF bug caused by mod_timer()
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
commit efe4186e6a1b54bf38b9e05450d43b0da1fd7739 upstream.
When a 6pack device is detaching, the sixpack_close() will act to cleanup necessary resources. Although del_timer_sync() in sixpack_close() won't return if there is an active timer, one could use mod_timer() in sp_xmit_on_air() to wake up timer again by calling userspace syscall such as ax25_sendmsg(), ax25_connect() and ax25_ioctl().
This unexpected waked handler, sp_xmit_on_air(), realizes nothing about the undergoing cleanup and may still call pty_write() to use driver layer resources that have already been released.
One of the possible race conditions is shown below:
(USE) | (FREE)
ax25_sendmsg() |
ax25_queue_xmit() |
... |
sp_xmit() |
sp_encaps() | sixpack_close()
sp_xmit_on_air() | del_timer_sync(&sp->tx_t)
mod_timer(&sp->tx_t,...) | ...
| unregister_netdev()
| ...
(wait a while) | tty_release()
| tty_release_struct()
| release_tty()
sp_xmit_on_air() | tty_kref_put(tty_struct) //FREE
pty_write(tty_struct) //USE | ...The corresponding fail log is shown below:
===============================================================
BUG: KASAN: use-after-free in __run_timers.part.0+0x170/0x470 Write of size 8 at addr ffff88800a652ab8 by task swapper/2/0 ... Call Trace: ... queue_work_on+0x3f/0x50 pty_write+0xcd/0xe0pty_write+0xcd/0xe0 sp_xmit_on_air+0xb2/0x1f0 call_timer_fn+0x28/0x150 __run_timers.part.0+0x3c2/0x470 run_timer_softirq+0x3b/0x80 __do_softirq+0xf1/0x380 ...
This patch reorders the del_timer_sync() after the unregister_netdev() to avoid UAF bugs. Because the unregister_netdev() is well synchronized, it flushs out any pending queues, waits the refcount of net_device decreases to zero and removes net_device from kernel. There is not any running routines after executing unregister_netdev(). Therefore, we could not arouse timer from userspace again.
--- drivers/net/hamradio/6pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/hamradio/6pack.c +2 -2
@@ -685,14 +685,14 @@ static void sixpack_close(struct tty_str*/ netif_stop_queue (sp->dev); +unregister_netdev (sp->dev); +del_timer_sync (&sp->tx_t);del_timer_sync (&sp->resync_t);/* Free all 6pack frame buffers. */ kfree (sp->rbuff);kfree (sp->xbuff); - -unregister_netdev (sp->dev); }/* Perform I/O control on an active 6pack channel. */
Greg Kroah-Hartman
maintainerPATCH 15/218 SUNRPC: avoid race between mod_timer() and del_timer_sync()
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
commit 3848e96edf4788f772d83990022fa7023a233d83 upstream.
xprt_destory() claims XPRT_LOCKED and then calls del_timer_sync(). Both xprt_unlock_connect() and xprt_release() call
->release_xprt()
which drops XPRT_LOCKED and *then* xprt_schedule_autodisconnect() which calls mod_timer().
This may result in mod_timer() being called *after* del_timer_sync(). When this happens, the timer may fire long after the xprt has been freed, and run_timer_softirq() will probably crash.
The pairing of ->release_xprt() and xprt_schedule_autodisconnect() is always called under ->transport_lock. So if we take ->transport_lock to call del_timer_sync(), we can be sure that mod_timer() will run first (if it runs at all).
--- net/sunrpc/xprt.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/sunrpc/xprt.c +7 -0
@@ -1446,7 +1446,14 @@ static void xprt_destroy(struct rpc_xprt/* Exclude transport connect/disconnect handlers */ wait_on_bit_lock (&xprt->state,XPRT_LOCKED ,TASK_UNINTERRUPTIBLE ); +/* +* xprt_schedule_autodisconnect() can run after XPRT_LOCKED +* is cleared. We use ->transport_lock to ensure the mod_timer() +* can only run *before* del_time_sync(), never after. +*/ +spin_lock (&xprt->transport_lock);del_timer_sync (&xprt->timer); +spin_unlock (&xprt->transport_lock);rpc_xprt_debugfs_unregister (xprt);rpc_destroy_wait_queue (&xprt->binding);
Greg Kroah-Hartman
maintainerPATCH 29/218 ARM: dts: exynos: fix UART3 pins configuration in Exynos5250
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 372d7027fed43c8570018e124cf78b89523a1f8e upstream.
The gpa1-4 pin was put twice in UART3 pin configuration of Exynos5250, instead of proper pin gpa1-5.
--- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/exynos5250-pinctrl.dtsi +1 -1
@@ -257,7 +257,7 @@ }; uart3_data: uart3-data { - samsung,pins = "gpa1-4", "gpa1-4"; + samsung,pins = "gpa1-4", "gpa1-5"; samsung,pin-function = <EXYNOS_PIN_FUNC_2>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
Greg Kroah-Hartman
maintainerPATCH 7/218 block: Add a helper to validate the block size
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
commit 570b1cac477643cbf01a45fa5d018430a1fddbce upstream.
There are some duplicated codes to validate the block size in block drivers. This limitation actually comes from block layer, so this patch tries to add a new block layer helper for that.
--- include/linux/blkdev.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/blkdev.h +8 -0
@@ -49,6 +49,14 @@ struct pr_ops;typedef void (rq_end_io_fn )(struct request *,int ); +static inline int blk_validate_block_size (unsigned int bsize) +{ +if (bsize <512 || bsize >PAGE_SIZE || !is_power_of_2 (bsize)) +return -EINVAL ; + +return 0 ; +} +#define BLK_RL_SYNCFULL (1U << 0)#define BLK_RL_ASYNCFULL (1U << 1)
Greg Kroah-Hartman
maintainerPATCH 19/218 jffs2: fix memory leak in jffs2_do_mount_fs
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit d051cef784de4d54835f6b6836d98a8f6935772c upstream.
If jffs2_build_filesystem() in jffs2_do_mount_fs() returns an error, we can observe the following kmemleak report:
--------------------------------------------
unreferenced object 0xffff88811b25a640 (size 64):
comm "mount", pid 691, jiffies 4294957728 (age 71.952s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffffa493be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffa5423a06>] jffs2_sum_init+0x86/0x130
[<ffffffffa5400e58>] jffs2_do_mount_fs+0x798/0xac0
[<ffffffffa540acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffa540c00a>] jffs2_fill_super+0x2ea/0x4c0
[...]unreferenced object 0xffff88812c760000 (size 65536):
comm "mount", pid 691, jiffies 4294957728 (age 71.952s) hex dump (first 32 bytes):
bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................
backtrace:
[<ffffffffa493a449>] __kmalloc+0x6b9/0x910
[<ffffffffa5423a57>] jffs2_sum_init+0xd7/0x130
[<ffffffffa5400e58>] jffs2_do_mount_fs+0x798/0xac0
[<ffffffffa540acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffa540c00a>] jffs2_fill_super+0x2ea/0x4c0
[...]
--------------------------------------------This is because the resources allocated in jffs2_sum_init() are not released. Call jffs2_sum_exit() to release these resources to solve the problem.
--- fs/jffs2/build.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jffs2/build.c +3 -1
@@ -415,13 +415,15 @@ int jffs2_do_mount_fs(struct jffs2_sb_injffs2_free_ino_caches (c);jffs2_free_raw_node_refs (c); ret = -EIO ; - goto out_free; + goto out_sum_exit; }jffs2_calc_trigger_levels (c);return 0 ; + out_sum_exit: +jffs2_sum_exit (c); out_free:kvfree (c->blocks);
Greg Kroah-Hartman
maintainerPATCH 3/218 netdevice: add the case if dev is NULL
In reply to Greg Kroah-HartmanFrom: Yajun Deng <[email protected]>
commit b37a466837393af72fe8bcb8f1436410f3f173f3 upstream.
Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't need to care whether dev is NULL or not.
--- include/linux/netdevice.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/netdevice.h +4 -2
@@ -3410,7 +3410,8 @@ void netdev_run_todo(void);*/ static inline void dev_put (struct net_device *dev) { -this_cpu_dec (*dev->pcpu_refcnt); +if (dev) +this_cpu_dec (*dev->pcpu_refcnt); }/**
@@ -3421,7 +3422,8 @@ static inline void dev_put(struct net_de*/ static inline void dev_hold (struct net_device *dev) { -this_cpu_inc (*dev->pcpu_refcnt); +if (dev) +this_cpu_inc (*dev->pcpu_refcnt); }/* Carrier loss detection, dial on demand. The functions netif_carrier_on
Greg Kroah-Hartman
maintainerPATCH 6/218 af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
In reply to Greg Kroah-HartmanFrom: Haimin Zhang <[email protected]>
[ Upstream commit 9a564bccb78a76740ea9d75a259942df8143d02c ]
Add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register to initialize the buffer of supp_skb to fix a kernel-info-leak issue.
1) Function pfkey_register calls compose_sadb_supported to request a sk_buff. 2) compose_sadb_supported calls alloc_sbk to allocate a sk_buff, but it doesn't zero it. 3) If auth_len is greater 0, then compose_sadb_supported treats the memory as a struct sadb_supported and begins to initialize. But it just initializes the field sadb_supported_len and field sadb_supported_exttype without field sadb_supported_reserved.
--- net/key/af_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/key/af_key.c +1 -1
@@ -1726,7 +1726,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sadxfrm_probe_algs (); - supp_skb =compose_sadb_supported (hdr,GFP_KERNEL ); + supp_skb =compose_sadb_supported (hdr,GFP_KERNEL | __GFP_ZERO);if (!supp_skb) {if (hdr->sadb_msg_satype !=SADB_SATYPE_UNSPEC ) pfk->registered &= ~(1 <<hdr->sadb_msg_satype);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 1/218 USB: serial: pl2303: add IBM device IDs
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
commit e1d15646565b284e9ef2433234d6cfdaf66695f1 upstream.
IBM manufactures a PL2303 device for UPS communications. Add the vendor and product IDs so that the PL2303 driver binds to the device.
--- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 3 +++ 2 files changed, 4 insertions(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -105,6 +105,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) }, { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, { USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) }, { } /* Terminating entry */ };
drivers/usb/serial/pl2303.h +3 -0
@@ -33,6 +33,9 @@#define ATEN_PRODUCT_UC485 0x2021#define ATEN_PRODUCT_ID2 0x2118 +#define IBM_VENDOR_ID 0x04b3 +#define IBM_PRODUCT_ID 0x4016 +#define IODATA_VENDOR_ID 0x04bb#define IODATA_PRODUCT_ID 0x0a03#define IODATA_PRODUCT_ID_RSAQ5 0x0a0e
Greg Kroah-Hartman
maintainerPATCH 14/218 ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit ee1fee900537b5d9560e9f937402de5ddc8412f3 upstream.
Setting PTRACE_O_SUSPEND_SECCOMP is supposed to be a highly privileged operation because it allows the tracee to completely bypass all seccomp filters on kernels with CONFIG_CHECKPOINT_RESTORE=y. It is only supposed to be settable by a process with global CAP_SYS_ADMIN, and only if that process is not subject to any seccomp filters at all.
However, while these permission checks were done on the PTRACE_SETOPTIONS path, they were missing on the PTRACE_SEIZE path, which also sets user-specified ptrace flags.
Move the permissions checks out into a helper function and let both ptrace_attach() and ptrace_setoptions() call it.
--- kernel/ptrace.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-)
kernel/ptrace.c +32 -15
@@ -371,6 +371,26 @@ bool ptrace_may_access(struct task_strucreturn !err; } +static int check_ptrace_options (unsigned long data) +{ +if (data & ~(unsigned long )PTRACE_O_MASK ) +return -EINVAL ; + +if (unlikely (data &PTRACE_O_SUSPEND_SECCOMP )) { +if (!IS_ENABLED (CONFIG_CHECKPOINT_RESTORE ) || + !IS_ENABLED (CONFIG_SECCOMP )) +return -EINVAL ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (seccomp_mode (¤t->seccomp) !=SECCOMP_MODE_DISABLED || + current->ptrace &PT_SUSPEND_SECCOMP ) +return -EPERM ; + } +return 0 ; +} +static int ptrace_attach (struct task_struct *task,long request,unsigned long addr,unsigned long flags)
@@ -382,8 +402,16 @@ static int ptrace_attach(struct task_strif (seize) {if (addr !=0 ) goto out; +/* +* This duplicates the check in check_ptrace_options() because +* ptrace_attach() and ptrace_setoptions() have historically +* used different error codes for unknown ptrace options. +*/ if (flags & ~(unsigned long )PTRACE_O_MASK ) goto out; + retval =check_ptrace_options (flags); +if (retval) +return retval; flags =PT_PTRACED |PT_SEIZED | (flags <<PT_OPT_FLAG_SHIFT ); }else { flags =PT_PTRACED ;
@@ -656,22 +684,11 @@ int ptrace_writedata(struct task_structstatic int ptrace_setoptions (struct task_struct *child,unsigned long data) {unsigned flags; +int ret; -if (data & ~(unsigned long )PTRACE_O_MASK ) -return -EINVAL ; - -if (unlikely (data &PTRACE_O_SUSPEND_SECCOMP )) { -if (!IS_ENABLED (CONFIG_CHECKPOINT_RESTORE ) || - !IS_ENABLED (CONFIG_SECCOMP )) -return -EINVAL ; - -if (!capable (CAP_SYS_ADMIN )) -return -EPERM ; - -if (seccomp_mode (¤t->seccomp) !=SECCOMP_MODE_DISABLED || - current->ptrace &PT_SUSPEND_SECCOMP ) -return -EPERM ; - } + ret =check_ptrace_options (data); +if (ret) +return ret;/* Avoid intermediate state when all opts are cleared */ flags = child->ptrace;
Greg Kroah-Hartman
maintainerPATCH 25/218 ALSA: cs4236: fix an incorrect NULL check on list iterator
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
commit 0112f822f8a6d8039c94e0bc9b264d7ffc5d4704 upstream.
The bug is here:
err = snd_card_cs423x_pnp(dev, card->private_data, pdev, cdev);
The list iterator value 'cdev' will *always* be set and non-NULL by list_for_each_entry(), so it is incorrect to assume that the iterator value will be NULL if the list is empty or no element is found.
To fix the bug, use a new variable 'iter' as the list iterator, while use the original variable 'cdev' as a dedicated pointer to point to the found element. And snd_card_cs423x_pnp() itself has NULL check for cdev.
--- sound/isa/cs423x/cs4236.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/isa/cs423x/cs4236.c +5 -3
@@ -557,7 +557,7 @@ static int snd_cs423x_pnpbios_detect(strstatic int dev;int err;struct snd_card *card; -struct pnp_dev *cdev; +struct pnp_dev *cdev, *iter;char cid[PNP_ID_LEN ];if (pnp_device_is_isapnp (pdev))
@@ -573,9 +573,11 @@ static int snd_cs423x_pnpbios_detect(strstrcpy (cid, pdev->id[0 ].id); cid[5 ] ='1' ; cdev =NULL ; -list_for_each_entry (cdev, &(pdev->protocol->devices), protocol_list) { -if (!strcmp (cdev->id[0 ].id, cid)) +list_for_each_entry (iter, &(pdev->protocol->devices), protocol_list) { +if (!strcmp (iter->id[0 ].id, cid)) { + cdev = iter;break ; + } } err =snd_cs423x_card_new (&pdev->dev, dev, &card);if (err <0 )
Greg Kroah-Hartman
maintainerPATCH 27/218 video: fbdev: sm712fb: Fix crash in smtcfb_read()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit bd771cf5c4254511cc4abb88f3dab3bd58bdf8e8 upstream.
Zheyu Ma reported this crash in the sm712fb driver when reading three bytes from the framebuffer:
BUG: unable to handle page fault for address: ffffc90001ffffff RIP: 0010:smtcfb_read+0x230/0x3e0 Call Trace: vfs_read+0x198/0xa00 ? do_sys_openat2+0x27d/0x350 ? __fget_light+0x54/0x340 ksys_read+0xce/0x190 do_syscall_64+0x43/0x90
Fix it by removing the open-coded endianess fixup-code and by moving the pointer post decrement out the fb_readl() function.
--- drivers/video/fbdev/sm712fb.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/video/fbdev/sm712fb.c +7 -18
@@ -1046,7 +1046,7 @@ static ssize_t smtcfb_read(struct fb_infif (count + p > total_size) count = total_size - p; - buffer =kmalloc ((count >PAGE_SIZE ) ?PAGE_SIZE : count,GFP_KERNEL ); + buffer =kmalloc (PAGE_SIZE ,GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -1058,25 +1058,14 @@ static ssize_t smtcfb_read(struct fb_infwhile (count) { c = (count >PAGE_SIZE ) ?PAGE_SIZE : count; dst = buffer; -for (i = c >>2 ; i--;) { - *dst =fb_readl (src++); - *dst =big_swap (*dst); +for (i = (c +3 ) >>2 ; i--;) { +u32 val; + + val =fb_readl (src); + *dst =big_swap (val); + src++; dst++; } -if (c &3 ) { -u8 *dst8 = (u8 *)dst; -u8 __iomem *src8 = (u8 __iomem *)src; - -for (i = c &3 ; i--;) { -if (i &1 ) { - *dst8++ =fb_readb (++src8); - }else { - *dst8++ =fb_readb (--src8); - src8 +=2 ; - } - } - src = (u32 __iomem *)src8; - }if (copy_to_user (buf, buffer, c)) { err = -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 9/218 USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 1892bf90677abcad7f06e897e308f5c3e3618dd4 upstream.
The kernel test robot found a problem with the ene_ub6250 subdriver in
usb-storage: It uses structures containing bitfields to represent hardware bits in its SD_STATUS, MS_STATUS, and SM_STATUS bytes. This is not safe; it presumes a particular bit ordering and it assumes the compiler will not insert padding, neither of which is guaranteed.
This patch fixes the problem by changing the structures to simple u8 values, with the bitfields replaced by bitmask constants.
--- drivers/usb/storage/ene_ub6250.c | 153 +++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 78 deletions(-)
drivers/usb/storage/ene_ub6250.c +75 -78
@@ -251,36 +251,33 @@ static struct us_unusual_dev ene_ub6250_#define memstick_logaddr (logadr1, logadr0) ((((u16)(logadr1)) << 8) | (logadr0)) -struct SD_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 IsMMC:1 ; -u8 HiCapacity:1 ; -u8 HiSpeed:1 ; -u8 WtP:1 ; -u8 Reserved:1 ; -}; - -struct MS_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 IsMSPro:1 ; -u8 IsMSPHG:1 ; -u8 Reserved1:1 ; -u8 WtP:1 ; -u8 Reserved2:1 ; -}; - -struct SM_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 Reserved:3 ; -u8 WtP:1 ; -u8 IsMS:1 ; -}; +/* SD_STATUS bits */ +#define SD_Insert BIT(0) +#define SD_Ready BIT(1) +#define SD_MediaChange BIT(2) +#define SD_IsMMC BIT(3) +#define SD_HiCapacity BIT(4) +#define SD_HiSpeed BIT(5) +#define SD_WtP BIT(6) +/* Bit 7 reserved */ + +/* MS_STATUS bits */ +#define MS_Insert BIT(0) +#define MS_Ready BIT(1) +#define MS_MediaChange BIT(2) +#define MS_IsMSPro BIT(3) +#define MS_IsMSPHG BIT(4) +/* Bit 5 reserved */ +#define MS_WtP BIT(6) +/* Bit 7 reserved */ + +/* SM_STATUS bits */ +#define SM_Insert BIT(0) +#define SM_Ready BIT(1) +#define SM_MediaChange BIT(2) +/* Bits 3-5 reserved */ +#define SM_WtP BIT(6) +#define SM_IsMS BIT(7)struct ms_bootblock_cis {u8 bCistplDEVICE[6 ];/* 0 */
@@ -451,9 +448,9 @@ struct ene_ub6250_info {u8 *bbuf;/* for 6250 code */ -struct SD_STATUS SD_Status; -struct MS_STATUS MS_Status; -struct SM_STATUS SM_Status; +u8 SD_Status; +u8 MS_Status; +u8 SM_Status;/* ----- SD Control Data ---------------- */ /*SD_REGISTER SD_Regs; */
@@ -588,7 +585,7 @@ static int sd_scsi_test_unit_ready(struc {struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra; -if (info->SD_Status.Insert && info->SD_Status.Ready) +if ((info->SD_Status & SD_Insert) && (info->SD_Status & SD_Ready))return USB_STOR_TRANSPORT_GOOD ;else {ene_sd_init (us);
@@ -620,7 +617,7 @@ static int sd_scsi_mode_sense(struct us_0x0b ,0x00 ,0x80 ,0x08 ,0x00 ,0x00 , 0x71, 0xc0, 0x00, 0x00, 0x02, 0x00 }; -if (info->SD_Status.WtP) +if (info->SD_Status & SD_WtP)usb_stor_set_xfer_buf (mediaWP,12 , srb);else usb_stor_set_xfer_buf (mediaNoWP,12 , srb);
@@ -639,9 +636,9 @@ static int sd_scsi_read_capacity(structstruct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;usb_stor_dbg (us,"sd_scsi_read_capacity\n" ); -if (info->SD_Status.HiCapacity) { +if (info->SD_Status & SD_HiCapacity) { bl_len =0x200 ; -if (info->SD_Status.IsMMC) +if (info->SD_Status & SD_IsMMC) bl_num = info->HC_C_SIZE-1 ;else bl_num = (info->HC_C_SIZE +1 ) *1024 -1 ;
@@ -691,7 +688,7 @@ static int sd_scsi_read(struct us_data *return USB_STOR_TRANSPORT_ERROR ; } -if (info->SD_Status.HiCapacity) +if (info->SD_Status & SD_HiCapacity) bnByte = bn;/* set up the command wrapper */
@@ -731,7 +728,7 @@ static int sd_scsi_write(struct us_datareturn USB_STOR_TRANSPORT_ERROR ; } -if (info->SD_Status.HiCapacity) +if (info->SD_Status & SD_HiCapacity) bnByte = bn;/* set up the command wrapper */
@@ -1447,7 +1444,7 @@ static int ms_scsi_test_unit_ready(strucstruct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);/* pr_info("MS_SCSI_Test_Unit_Ready\n"); */ -if (info->MS_Status.Insert && info->MS_Status.Ready) { +if ((info->MS_Status & MS_Insert) && (info->MS_Status & MS_Ready)) {return USB_STOR_TRANSPORT_GOOD ; }else {ene_ms_init (us);
@@ -1480,7 +1477,7 @@ static int ms_scsi_mode_sense(struct us_0x0b ,0x00 ,0x80 ,0x08 ,0x00 ,0x00 , 0x71, 0xc0, 0x00, 0x00, 0x02, 0x00 }; -if (info->MS_Status.WtP) +if (info->MS_Status & MS_WtP)usb_stor_set_xfer_buf (mediaWP,12 , srb);else usb_stor_set_xfer_buf (mediaNoWP,12 , srb);
@@ -1499,7 +1496,7 @@ static int ms_scsi_read_capacity(structusb_stor_dbg (us,"ms_scsi_read_capacity\n" ); bl_len =0x200 ; -if (info->MS_Status.IsMSPro) +if (info->MS_Status & MS_IsMSPro) bl_num = info->MSP_TotalBlock -1 ;else bl_num = info->MS_Lib.NumberOfLogBlock * info->MS_Lib.blockSize *2 -1 ;
@@ -1654,7 +1651,7 @@ static int ms_scsi_read(struct us_data *if (bn > info->bl_num)return USB_STOR_TRANSPORT_ERROR ; -if (info->MS_Status.IsMSPro) { +if (info->MS_Status & MS_IsMSPro) { result =ene_load_bincode (us,MSP_RW_PATTERN );if (result !=USB_STOR_XFER_GOOD ) {usb_stor_dbg (us,"Load MPS RW pattern Fail !!\n" );
@@ -1755,7 +1752,7 @@ static int ms_scsi_write(struct us_dataif (bn > info->bl_num)return USB_STOR_TRANSPORT_ERROR ; -if (info->MS_Status.IsMSPro) { +if (info->MS_Status & MS_IsMSPro) { result =ene_load_bincode (us,MSP_RW_PATTERN );if (result !=USB_STOR_XFER_GOOD ) {pr_info ("Load MSP RW pattern Fail !!\n" );
@@ -1863,12 +1860,12 @@ static int ene_get_card_status(struct us tmpreg = (u16 ) reg4b; reg4b = *(u32 *)(&buf[0x14 ]); -if (info->SD_Status.HiCapacity && !info->SD_Status.IsMMC) +if ((info->SD_Status & SD_HiCapacity) && !(info->SD_Status & SD_IsMMC)) info->HC_C_SIZE = (reg4b >>8 ) &0x3fffff ; info->SD_C_SIZE = ((tmpreg &0x03 ) <<10 ) | (u16)(reg4b >>22 ); info->SD_C_SIZE_MULT = (u8)(reg4b >>7 ) &0x07 ; -if (info->SD_Status.HiCapacity && info->SD_Status.IsMMC) +if ((info->SD_Status & SD_HiCapacity) && (info->SD_Status & SD_IsMMC)) info->HC_C_SIZE = *(u32 *)(&buf[0x100 ]);if (info->SD_READ_BL_LEN >SD_BLOCK_LEN ) {
@@ -2080,6 +2077,7 @@ static int ene_ms_init(struct us_data *uu16 MSP_BlockSize, MSP_UserAreaBlocks;struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;u8 *bbuf = info->bbuf; +unsigned int s;printk (KERN_INFO "transport --- ENE_MSInit\n" );
@@ -2104,15 +2102,16 @@ static int ene_ms_init(struct us_data *ureturn USB_STOR_TRANSPORT_ERROR ; }/* the same part to test ENE */ - info->MS_Status = *(struct MS_STATUS *) bbuf; + info->MS_Status = bbuf[0 ]; -if (info->MS_Status.Insert && info->MS_Status.Ready) { -printk (KERN_INFO "Insert = %x\n" , info->MS_Status.Insert); -printk (KERN_INFO "Ready = %x\n" , info->MS_Status.Ready); -printk (KERN_INFO "IsMSPro = %x\n" , info->MS_Status.IsMSPro); -printk (KERN_INFO "IsMSPHG = %x\n" , info->MS_Status.IsMSPHG); -printk (KERN_INFO "WtP= %x\n" , info->MS_Status.WtP); -if (info->MS_Status.IsMSPro) { + s = info->MS_Status; +if ((s & MS_Insert) && (s & MS_Ready)) { +printk (KERN_INFO "Insert = %x\n" , !!(s & MS_Insert)); +printk (KERN_INFO "Ready = %x\n" , !!(s & MS_Ready)); +printk (KERN_INFO "IsMSPro = %x\n" , !!(s & MS_IsMSPro)); +printk (KERN_INFO "IsMSPHG = %x\n" , !!(s & MS_IsMSPHG)); +printk (KERN_INFO "WtP= %x\n" , !!(s & MS_WtP)); +if (s & MS_IsMSPro) { MSP_BlockSize = (bbuf[6 ] <<8 ) | bbuf[7 ]; MSP_UserAreaBlocks = (bbuf[10 ] <<8 ) | bbuf[11 ]; info->MSP_TotalBlock = MSP_BlockSize * MSP_UserAreaBlocks;
@@ -2173,17 +2172,17 @@ static int ene_sd_init(struct us_data *ureturn USB_STOR_TRANSPORT_ERROR ; } - info->SD_Status = *(struct SD_STATUS *) bbuf; -if (info->SD_Status.Insert && info->SD_Status.Ready) { -struct SD_STATUS *s = &info->SD_Status; + info->SD_Status = bbuf[0 ]; +if ((info->SD_Status & SD_Insert) && (info->SD_Status & SD_Ready)) { +unsigned int s = info->SD_Status;ene_get_card_status (us, bbuf); -usb_stor_dbg (us,"Insert = %x\n" , s->Insert); -usb_stor_dbg (us,"Ready = %x\n" , s->Ready); -usb_stor_dbg (us,"IsMMC = %x\n" , s->IsMMC); -usb_stor_dbg (us,"HiCapacity = %x\n" , s->HiCapacity); -usb_stor_dbg (us,"HiSpeed = %x\n" , s->HiSpeed); -usb_stor_dbg (us,"WtP = %x\n" , s->WtP); +usb_stor_dbg (us,"Insert = %x\n" , !!(s & SD_Insert)); +usb_stor_dbg (us,"Ready = %x\n" , !!(s & SD_Ready)); +usb_stor_dbg (us,"IsMMC = %x\n" , !!(s & SD_IsMMC)); +usb_stor_dbg (us,"HiCapacity = %x\n" , !!(s & SD_HiCapacity)); +usb_stor_dbg (us,"HiSpeed = %x\n" , !!(s & SD_HiSpeed)); +usb_stor_dbg (us,"WtP = %x\n" , !!(s & SD_WtP)); }else {usb_stor_dbg (us,"SD Card Not Ready --- %x\n" , bbuf[0 ]);return USB_STOR_TRANSPORT_ERROR ;
@@ -2205,14 +2204,14 @@ static int ene_init(struct us_data *us) misc_reg03 = bbuf[0 ];if (misc_reg03 &0x01 ) { -if (!info->SD_Status.Ready) { +if (!(info->SD_Status & SD_Ready)) { result =ene_sd_init (us);if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; } }if (misc_reg03 &0x02 ) { -if (!info->MS_Status.Ready) { +if (!(info->MS_Status & MS_Ready)) { result =ene_ms_init (us);if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ;
@@ -2302,14 +2301,14 @@ static int ene_transport(struct scsi_cmn/*US_DEBUG(usb_stor_show_command(us, srb)); */ scsi_set_resid (srb,0 ); -if (unlikely (!(info->SD_Status.Ready || info->MS_Status.Ready))) +if (unlikely (!(info->SD_Status & SD_Ready) || (info->MS_Status & MS_Ready))) result =ene_init (us);if (result ==USB_STOR_XFER_GOOD ) { result =USB_STOR_TRANSPORT_ERROR ; -if (info->SD_Status.Ready) +if (info->SD_Status & SD_Ready) result =sd_scsi_irp (us, srb); -if (info->MS_Status.Ready) +if (info->MS_Status & MS_Ready) result =ms_scsi_irp (us, srb); }return result;
@@ -2373,7 +2372,6 @@ static int ene_ub6250_probe(struct usb_istatic int ene_ub6250_resume (struct usb_interface *iface) { -u8 tmp =0 ;struct us_data *us =usb_get_intfdata (iface);struct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);
@@ -2385,17 +2383,16 @@ static int ene_ub6250_resume(struct usb_mutex_unlock (&us->dev_mutex); info->Power_IsResum = true; -/*info->SD_Status.Ready = 0; */ - info->SD_Status = *(struct SD_STATUS *)&tmp; - info->MS_Status = *(struct MS_STATUS *)&tmp; - info->SM_Status = *(struct SM_STATUS *)&tmp; +/* info->SD_Status &= ~SD_Ready; */ + info->SD_Status =0 ; + info->MS_Status =0 ; + info->SM_Status =0 ;return 0 ; }static int ene_ub6250_reset_resume (struct usb_interface *iface) { -u8 tmp =0 ;struct us_data *us =usb_get_intfdata (iface);struct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);
@@ -2407,10 +2404,10 @@ static int ene_ub6250_reset_resume(struc* the device */ info->Power_IsResum = true; -/*info->SD_Status.Ready = 0; */ - info->SD_Status = *(struct SD_STATUS *)&tmp; - info->MS_Status = *(struct MS_STATUS *)&tmp; - info->SM_Status = *(struct SM_STATUS *)&tmp; +/* info->SD_Status &= ~SD_Ready; */ + info->SD_Status =0 ; + info->MS_Status =0 ; + info->SM_Status =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 8/218 virtio-blk: Use blk_validate_block_size() to validate block size
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
commit 57a13a5b8157d9a8606490aaa1b805bafe6c37e1 upstream.
The block layer can't support a block size larger than page size yet. And a block size that's too small or not a power of two won't work either. If a misconfigured device presents an invalid block size in configuration space, it will result in the kernel crash something like below:
[ 506.154324] BUG: kernel NULL pointer dereference, address: 0000000000000008 [ 506.160416] RIP: 0010:create_empty_buffers+0x24/0x100 [ 506.174302] Call Trace: [ 506.174651] create_page_buffers+0x4d/0x60 [ 506.175207] block_read_full_page+0x50/0x380 [ 506.175798] ? __mod_lruvec_page_state+0x60/0xa0 [ 506.176412] ? __add_to_page_cache_locked+0x1b2/0x390 [ 506.177085] ? blkdev_direct_IO+0x4a0/0x4a0 [ 506.177644] ? scan_shadow_nodes+0x30/0x30 [ 506.178206] ? lru_cache_add+0x42/0x60 [ 506.178716] do_read_cache_page+0x695/0x740 [ 506.179278] ? read_part_sector+0xe0/0xe0 [ 506.179821] read_part_sector+0x36/0xe0 [ 506.180337] adfspart_check_ICS+0x32/0x320 [ 506.180890] ? snprintf+0x45/0x70 [ 506.181350] ? read_part_sector+0xe0/0xe0 [ 506.181906] bdev_disk_changed+0x229/0x5c0 [ 506.182483] blkdev_get_whole+0x6d/0x90 [ 506.183013] blkdev_get_by_dev+0x122/0x2d0 [ 506.183562] device_add_disk+0x39e/0x3c0 [ 506.184472] virtblk_probe+0x3f8/0x79b [virtio_blk] [ 506.185461] virtio_dev_probe+0x15e/0x1d0 [virtio]
So let's use a block layer helper to validate the block size.
--- drivers/block/virtio_blk.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/block/virtio_blk.c +10 -2
@@ -692,9 +692,17 @@ static int virtblk_probe(struct virtio_d err =virtio_cread_feature (vdev,VIRTIO_BLK_F_BLK_SIZE , struct virtio_blk_config, blk_size, &blk_size); -if (!err) +if (!err) { + err =blk_validate_block_size (blk_size); +if (err) { +dev_err (&vdev->dev, +"virtio_blk: invalid block size: 0x%x\n" , + blk_size); + goto out_free_tags; + } +blk_queue_logical_block_size (q, blk_size); -else + }else blk_size =queue_logical_block_size (q);/* Use topology information if available */
Greg Kroah-Hartman
maintainerPATCH 17/218 can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit c70222752228a62135cee3409dccefd494a24646 upstream.
There is no need to call dev_kfree_skb() when usb_submit_urb() fails beacause can_put_echo_skb() deletes the original skb and can_free_echo_skb() deletes the cloned skb.
--- drivers/net/can/usb/ems_usb.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/can/usb/ems_usb.c +0 -1
@@ -834,7 +834,6 @@ static netdev_tx_t ems_usb_start_xmit(stusb_unanchor_urb (urb);usb_free_coherent (dev->udev, size, buf, urb->transfer_dma); -dev_kfree_skb (skb);atomic_dec (&dev->active_tx_urbs);
Greg Kroah-Hartman
maintainerPATCH 13/218 clk: uniphier: Fix fixed-rate initialization
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
commit ca85a66710a8a1f6b0719397225c3e9ee0abb692 upstream.
Fixed-rate clocks in UniPhier don't have any parent clocks, however, initial data "init.flags" isn't initialized, so it might be determined that there is a parent clock for fixed-rate clock.
This sets init.flags to zero as initialization.
--- drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/uniphier/clk-uniphier-fixed-rate.c +1 -0
@@ -33,6 +33,7 @@ struct clk_hw *uniphier_clk_register_fix init.name = name; init.ops = &clk_fixed_rate_ops; + init.flags =0 ; init.parent_names =NULL ; init.num_parents =0 ;
Greg Kroah-Hartman
maintainerPATCH 31/218 ARM: dts: exynos: add missing HDMI supplies on SMDK5420
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 453a24ded415f7fce0499c6b0a2c7b28f84911f2 upstream.
Add required VDD supplies to HDMI block on SMDK5420. Without them, the HDMI driver won't probe. Because of lack of schematics, use same supplies as on Arndale Octa and Odroid XU3 boards (voltage matches).
--- arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/exynos5420-smdk5420.dts +3 -0
@@ -134,6 +134,9 @@ hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_hpd_irq>; + vdd-supply = <&ldo6_reg>; + vdd_osc-supply = <&ldo7_reg>; + vdd_pll-supply = <&ldo6_reg>; }; &hsi2c_4 {
Greg Kroah-Hartman
maintainerPATCH 10/218 coresight: Fix TRCCONFIGR.QE sysfs interface
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
commit ea75a342aed5ed72c87f38fbe0df2f5df7eae374 upstream.
It's impossible to program a valid value for TRCCONFIGR.QE when TRCIDR0.QSUPP==0b10. In that case the following is true:
Q element support is implemented, and only supports Q elements without instruction counts. TRCCONFIGR.QE can only take the values 0b00 or 0b11.
Currently the low bit of QSUPP is checked to see if the low bit of QE can be written to, but as you can see when QSUPP==0b10 the low bit is cleared making it impossible to ever write the only valid value of 0b11 to QE. 0b10 would be written instead, which is a reserved QE value even for all values of QSUPP.
The fix is to allow writing the low bit of QE for any non zero value of QSUPP.
This change also ensures that the low bit is always set, even when the user attempts to only set the high bit.
--- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +6 -2
@@ -379,8 +379,12 @@ static ssize_t mode_store(struct device mode =ETM_MODE_QELEM (config->mode);/* start by clearing QE bits */ config->cfg &= ~(BIT (13 ) |BIT (14 )); -/* if supported, Q elements with instruction counts are enabled */ -if ((mode &BIT (0 )) && (drvdata->q_support &BIT (0 ))) +/* +* if supported, Q elements with instruction counts are enabled. +* Always set the low bit for any requested mode. Valid combos are +* 0b00, 0b01 and 0b11. +*/ +if (mode && drvdata->q_support) config->cfg |=BIT (13 );/* * if supported, Q elements with and without instruction
Greg Kroah-Hartman
maintainerPATCH 33/218 thermal: int340x: Increase bitmap size
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
commit 668f69a5f863b877bc3ae129efe9a80b6f055141 upstream.
The number of policies are 10, so can't be supported by the bitmap size of u8.
Even though there are no platfoms with these many policies, but for correctness increase to u32.
--- drivers/thermal/int340x_thermal/int3400_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/int340x_thermal/int3400_thermal.c +1 -1
@@ -51,7 +51,7 @@ struct int3400_thermal_priv {struct art *arts;int trt_count;struct trt *trts; -u8 uuid_bitmap; +u32 uuid_bitmap;int rel_misc_dev_res;int current_uuid_index; };
Greg Kroah-Hartman
maintainerPATCH 16/218 NFSD: prevent underflow in nfssvc_decode_writeargs()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 184416d4b98509fb4c3d8fc3d6dc1437896cc159 upstream.
Smatch complains:
fs/nfsd/nfsxdr.c:341 nfssvc_decode_writeargs() warn: no lower bound on 'args->len'
Change the type to unsigned to prevent this issue.
--- fs/nfsd/nfsproc.c | 2 +- fs/nfsd/xdr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfsproc.c +1 -1
@@ -207,7 +207,7 @@ nfsd_proc_write(struct svc_rqst *rqstp,int stable =1 ;unsigned long cnt = argp->len; -dprintk ("nfsd: WRITE %s %d bytes at %d\n" , +dprintk ("nfsd: WRITE %s %u bytes at %d\n" ,SVCFH_fmt (&argp->fh), argp->len, argp->offset);
fs/nfsd/xdr.h +1 -1
@@ -32,7 +32,7 @@ struct nfsd_readargs {struct nfsd_writeargs {svc_fh fh;__u32 offset; -int len; +__u32 len;int vlen; };
Greg Kroah-Hartman
maintainerPATCH 32/218 carl9170: fix missing bit-wise or operator for tx_params
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 02a95374b5eebdbd3b6413fd7ddec151d2ea75a1 upstream.
Currently tx_params is being re-assigned with a new value and the previous setting IEEE80211_HT_MCS_TX_RX_DIFF is being overwritten. The assignment operator is incorrect, the original intent was to bit-wise or the value in. Fix this by replacing the = operator with |= instead.
Kudos to Christian Lamparter for suggesting the correct fix.
--- drivers/net/wireless/ath/carl9170/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/main.c +1 -1
@@ -1920,7 +1920,7 @@ static int carl9170_parse_eeprom(structWARN_ON (!(tx_streams >=1 && tx_streams <=IEEE80211_HT_MCS_TX_MAX_STREAMS )); - tx_params = (tx_streams -1 ) << + tx_params |= (tx_streams -1 ) <<IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT ; carl9170_band_2GHz.ht_cap.mcs.tx_params |= tx_params;
Greg Kroah-Hartman
maintainerPATCH 30/218 ARM: dts: exynos: add missing HDMI supplies on SMDK5250
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 60a9914cb2061ba612a3f14f6ad329912b486360 upstream.
Add required VDD supplies to HDMI block on SMDK5250. Without them, the HDMI driver won't probe. Because of lack of schematics, use same supplies as on Arndale 5250 board (voltage matches).
--- arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/exynos5250-smdk5250.dts +3 -0
@@ -118,6 +118,9 @@ &hdmi { hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; + vdd-supply = <&ldo8_reg>; + vdd_osc-supply = <&ldo10_reg>; + vdd_pll-supply = <&ldo8_reg>; }; &i2c_0 {
Greg Kroah-Hartman
maintainerPATCH 24/218 Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
commit 8b188fba75195745026e11d408e4a7e94e01d701 upstream.
This reverts commit 37ef4c19b4c659926ce65a7ac709ceaefb211c40.
The touchpad present in the Dell Precision 7550 and 7750 laptops reports a HID_DG_BUTTONTYPE of type MT_BUTTONTYPE_CLICKPAD. However, the device is not a clickpad, it is a touchpad with physical buttons.
In order to fix this issue, a quirk for the device was introduced in libinput [1] [2] to disable the INPUT_PROP_BUTTONPAD property:
[Precision 7x50 Touchpad]
MatchBus=i2c
MatchUdevType=touchpad MatchDMIModalias=dmi:*svnDellInc.:pnPrecision7?50* AttrInputPropDisable=INPUT_PROP_BUTTONPAD
However, because of the change introduced in 37ef4c19b4 ("Input: clear BTN_RIGHT/MIDDLE on buttonpads") the BTN_RIGHT key bit is not mapped anymore breaking the device right click button and making impossible to workaround it in user space.
In order to avoid breakage on other present or future devices, revert the patch causing the issue.
--- drivers/input/input.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/input/input.c +0 -6
@@ -2112,12 +2112,6 @@ int input_register_device(struct input_d/* KEY_RESERVED is not supposed to be transmitted to userspace. */ __clear_bit (KEY_RESERVED , dev->keybit); -/* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ -if (test_bit (INPUT_PROP_BUTTONPAD , dev->propbit)) { -__clear_bit (BTN_RIGHT , dev->keybit); -__clear_bit (BTN_MIDDLE , dev->keybit); - } -/* Make sure that bitmasks not mentioned in dev->evbit are clean. */ input_cleanse_bitmasks (dev);
Greg Kroah-Hartman
maintainerPATCH 22/218 mempolicy: mbind_range() set_policy() after vma_merge()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 4e0906008cdb56381638aa17d9c32734eae6d37a upstream.
v2.6.34 commit 9d8cebd4bcd7 ("mm: fix mbind vma merge problem") introduced vma_merge() to mbind_range(); but unlike madvise, mlock and mprotect, it put a "continue" to next vma where its precedents go to update flags on current vma before advancing: that left vma with the wrong setting in the infamous vma_merge() case 8.
v3.10 commit 1444f92c8498 ("mm: merging memory blocks resets mempolicy") tried to fix that in vma_adjust(), without fully understanding the issue.
v3.11 commit 3964acd0dbec ("mm: mempolicy: fix mbind_range() && vma_adjust() interaction") reverted that, and went about the fix in the right way, but chose to optimize out an unnecessary mpol_dup() with a prior mpol_equal() test. But on tmpfs, that also pessimized out the vital call to its ->set_policy(), leaving the new mbind unenforced.
The user visible effect was that the pages got allocated on the local node (happened to be 0), after the mbind() caller had specifically asked for them to be allocated on node 1. There was not any page migration involved in the case reported: the pages simply got allocated on the wrong node.
Just delete that optimization now (though it could be made conditional on vma not having a set_policy). Also remove the "next" variable: it turned out to be blameless, but also pointless.
--- mm/mempolicy.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
mm/mempolicy.c +1 -7
@@ -734,7 +734,6 @@ static int vma_replace_policy(struct vm_static int mbind_range (struct mm_struct *mm,unsigned long start,unsigned long end,struct mempolicy *new_pol) { -struct vm_area_struct *next;struct vm_area_struct *prev;struct vm_area_struct *vma;int err =0 ;
@@ -750,8 +749,7 @@ static int mbind_range(struct mm_structif (start > vma->vm_start) prev = vma; -for (; vma && vma->vm_start < end; prev = vma, vma = next) { - next = vma->vm_next; +for (; vma && vma->vm_start < end; prev = vma, vma = vma->vm_next) { vmstart =max (start, vma->vm_start); vmend =min (end, vma->vm_end);
@@ -765,10 +763,6 @@ static int mbind_range(struct mm_struct new_pol, vma->vm_userfaultfd_ctx);if (prev) { vma = prev; - next = vma->vm_next; -if (mpol_equal (vma_policy (vma), new_pol)) -continue ; -/* vma_merge() joined vma && vma->next, case 8 */ goto replace; }if (vma->vm_start != vmstart) {
Greg Kroah-Hartman
maintainerPATCH 12/218 iio: inkern: make a best effort on offset calculation
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit ca85123354e1a65a22170286387b4791997fe864 upstream.
iio_convert_raw_to_processed_unlocked() assumes the offset is an integer. Make a best effort to get a valid offset value for fractional cases without breaking implicit truncations.
--- drivers/iio/inkern.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
drivers/iio/inkern.c +27 -5
@@ -591,13 +591,35 @@ EXPORT_SYMBOL_GPL(iio_read_channel_averastatic int iio_convert_raw_to_processed_unlocked (struct iio_channel *chan,int raw,int *processed,unsigned int scale) { -int scale_type, scale_val, scale_val2, offset; +int scale_type, scale_val, scale_val2; +int offset_type, offset_val, offset_val2;s64 raw64 = raw; -int ret; - ret =iio_channel_read (chan, &offset,NULL ,IIO_CHAN_INFO_OFFSET ); -if (ret >=0 ) - raw64 += offset; + offset_type =iio_channel_read (chan, &offset_val, &offset_val2, +IIO_CHAN_INFO_OFFSET ); +if (offset_type >=0 ) { +switch (offset_type) { +case IIO_VAL_INT : +break ; +case IIO_VAL_INT_PLUS_MICRO : +case IIO_VAL_INT_PLUS_NANO : +/* +* Both IIO_VAL_INT_PLUS_MICRO and IIO_VAL_INT_PLUS_NANO +* implicitely truncate the offset to it's integer form. +*/ +break ; +case IIO_VAL_FRACTIONAL : + offset_val /= offset_val2; +break ; +case IIO_VAL_FRACTIONAL_LOG2 : + offset_val >>= offset_val2; +break ; +default : +return -EINVAL ; + } + + raw64 += offset_val; + } scale_type =iio_channel_read (chan, &scale_val, &scale_val2,IIO_CHAN_INFO_SCALE );
Greg Kroah-Hartman
maintainercover 4.9.311-rc1 review
This is the start of the stable review cycle for the 4.9.311 release. There are 218 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 20 Apr 2022 12:11:14 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.311-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.311-rc1
Jason A. Donenfeld <[email protected]>
gcc-plugins: latent_entropy: use /dev/urandom
Martin Povišer <[email protected]>
i2c: pasemi: Wait for write xfers to finish
Nadav Amit <[email protected]>
smp: Fix offline cpu check in flush_smp_call_function_queue()
Nathan Chancellor <[email protected]>
ARM: davinci: da850-evm: Avoid NULL pointer dereference
Fabio M. De Francesco <[email protected]>
ALSA: pcm: Test for "silence" field in struct "pcm_format_data"
Patrick Wang <[email protected]>
mm: kmemleak: take a full lowmem check in kmemleak_*_phys()
Juergen Gross <[email protected]>
mm, page_alloc: fix build_zonerefs_node()
Duoming Zhou <[email protected]>
drivers: net: slip: fix NPD bug in sl_tx_timeout()
Alexey Galakhov <[email protected]>
scsi: mvsas: Add PCI ID of RocketRaid 2640
Leo Ruan <[email protected]>
gpu: ipu-v3: Fix dev_dbg frequency output
Randy Dunlap <[email protected]>
net: micrel: fix KS8851_MLL Kconfig
Tyrel Datwyler <[email protected]>
scsi: ibmvscsis: Increase INITIAL_SRP_LIMIT to 1024
QintaoShen <[email protected]>
drm/amdkfd: Check for potential null return of kmalloc_array()
Harshit Mogalapalli <[email protected]>
cifs: potential buffer overflow in handling symlinks
Lin Ma <[email protected]>
nfc: nci: add flush_workqueue to prevent uaf
Dinh Nguyen <[email protected]>
net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link
Guillaume Nault <[email protected]>
veth: Ensure eth header is in skb's linear part
Xin Long <[email protected]>
xfrm: policy: match with both mark and mask on user interfaces
Fangrui Song <[email protected]>
arm64: module: remove (NOLOAD) from linker script
Peter Xu <[email protected]>
mm: don't skip swap entry even if zap_details specified
Vinod Koul <[email protected]>
dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error"
Arnaldo Carvalho de Melo <[email protected]>
tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts
Guo Ren <[email protected]>
arm64: patch_text: Fixup last cpu should be master
Pawan Gupta <[email protected]>
x86/speculation: Restore speculation related MSRs during S3 resume
Pawan Gupta <[email protected]>
x86/pm: Save the MSR validity status at context setup
Miaohe Lin <[email protected]>
mm/mempolicy: fix mpol_new leak in shared_policy_replace
Paolo Bonzini <[email protected]>
mmmremap.c: avoid pointless invalidate_range_start/end on mremap(old_size=0)
Lv Yunlong <[email protected]>
drbd: Fix five use after free bugs in get_initial_state
José Expósito <[email protected]>
drm/imx: Fix memory leak in imx_pd_connector_get_modes
Chen-Yu Tsai <[email protected]>
net: stmmac: Fix unset max_speed difference between DT and non-DT platforms
Christophe JAILLET <[email protected]>
scsi: zorro7xx: Fix a resource leak in zorro7xx_remove_one()
Mauricio Faria de Oliveira <[email protected]>
mm: fix race between MADV_FREE reclaim and blkdev direct IO read
Haimin Zhang <[email protected]>
jfs: prevent NULL deref in diFree
Randy Dunlap <[email protected]>
virtio_console: eliminate anonymous module_init & module_exit
Jiri Slaby <[email protected]>
serial: samsung_tty: do not unlock port->lock for uart_write_wakeup()
NeilBrown <[email protected]>
SUNRPC/call_alloc: async tasks mustn't block waiting for memory
Lucas Denefle <[email protected]>
w1: w1_therm: fixes w1_seq for ds28ea00 sensors
Randy Dunlap <[email protected]>
init/main.c: return 1 from handled __setup() functions
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix use after free in hci_send_acl
Max Filippov <[email protected]>
xtensa: fix DTC warning unit_address_format
H. Nikolaus Schaller <[email protected]>
usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm
Jianglei Nie <[email protected]>
scsi: libfc: Fix use after free in fc_exch_abts_resp()
Alexander Lobakin <[email protected]>
MIPS: fix fortify panic when copying asm exception handlers
Michael Chan <[email protected]>
bnxt_en: Eliminate unintended link toggle during FW reset
Randy Dunlap <[email protected]>
scsi: aha152x: Fix aha152x_setup() __setup handler return value
Damien Le Moal <[email protected]>
scsi: pm8001: Fix pm8001_mpi_task_abort_resp()
Jordy Zomer <[email protected]>
dm ioctl: prevent potential spectre v1 gadget
Zhou Guanghui <[email protected]>
iommu/arm-smmu-v3: fix event handling soft lockup
Yang Guang <[email protected]>
scsi: bfa: Replace snprintf() with sysfs_emit()
Yang Guang <[email protected]>
scsi: mvsas: Replace snprintf() with sysfs_emit()
Maxim Kiselev <[email protected]>
powerpc: dts: t104xrdb: fix phy type for FMAN 4/5
Yang Guang <[email protected]>
ptp: replace snprintf with sysfs_emit
Zekun Shen <[email protected]>
ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111
Jim Mattson <[email protected]>
KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs
Randy Dunlap <[email protected]>
ARM: 9187/1: JIVE: fix return value of __setup handler
Jiasheng Jiang <[email protected]>
rtc: wm8350: Handle error for wm8350_register_irq
Vitaly Kuznetsov <[email protected]>
KVM: x86: Forbid VMM to set SYNIC/STIMER MSRs when SynIC wasn't activated
Martin Varghese <[email protected]>
openvswitch: Fixed nd target mask field in the flow dump.
Kuldeep Singh <[email protected]>
ARM: dts: spear13xx: Update SPI dma properties
Kuldeep Singh <[email protected]>
ARM: dts: spear1340: Update serial node properties
Amadeusz Sławiński <[email protected]>
ASoC: topology: Allow TLV control to be either read or write
Zhihao Cheng <[email protected]>
ubi: fastmap: Return error code if memory allocation fails in add_aeb()
Randy Dunlap <[email protected]>
mm/memcontrol: return 1 from cgroup.memory __setup() handler
Randy Dunlap <[email protected]>
mm/mmap: return 1 from stack_guard_gap __setup() handler
Rafael J. Wysocki <[email protected]>
ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
Chen-Yu Tsai <[email protected]>
pinctrl: pinconf-generic: Print arguments for bias-pull-*
Andrew Price <[email protected]>
gfs2: Make sure FITRIM minlen is rounded up to fs block size
Zhihao Cheng <[email protected]>
ubifs: setflags: Make dirtied_ino_d 8 bytes aligned
Zhihao Cheng <[email protected]>
ubifs: Add missing iput if do_tmpfile() failed in rename whiteout
David Matlack <[email protected]>
KVM: Prevent module exit until all VMs are freed
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix incorrect reporting of task management failure
Ulf Hansson <[email protected]>
mmc: host: Return an error when ->enable_sdio_irq() ops is missing
Dongliang Mu <[email protected]>
media: hdpvr: initialize dev->worker at hdpvr_register_videodev
Zheyu Ma <[email protected]>
video: fbdev: sm712fb: Fix crash in smtcfb_write()
Uwe Kleine-König <[email protected]>
ARM: mmp: Fix failure to remove sram device
Richard Leitner <[email protected]>
ARM: tegra: tamonten: Fix I2C3 pad setting
Daniel González Cabanelas <[email protected]>
media: cx88-mpeg: clear interrupt status register before streaming video
Shengjiu Wang <[email protected]>
ASoC: soc-core: skip zero num_dai component in searching dai name
Jing Yao <[email protected]>
video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
Jing Yao <[email protected]>
video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
Richard Schleich <[email protected]>
ARM: dts: bcm2837: Add the missing L1/L2 cache information
David Heidelberg <[email protected]>
ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
Yang Guang <[email protected]>
video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
George Kennedy <[email protected]>
video: fbdev: cirrusfb: check pixclock to avoid divide by zero
Evgeny Novikov <[email protected]>
video: fbdev: w100fb: Reset global state
Tim Gardner <[email protected]>
video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
Dongliang Mu <[email protected]>
ntfs: add sanity check on allocation size
Theodore Ts'o <[email protected]>
ext4: don't BUG if someone dirty pages without asking ext4 first
Minghao Chi <[email protected]>
spi: tegra20: Use of_device_get_match_data()
Dmitry Baryshkov <[email protected]>
PM: core: keep irq flags in device_pm_check_callbacks()
Darren Hart <[email protected]>
ACPI/APEI: Limit printable size of BERT table data
Rafael J. Wysocki <[email protected]>
ACPICA: Avoid walking the ACPI Namespace if it is not there
Souptick Joarder (HPE) <[email protected]>
irqchip/nvic: Release nvic_base upon failure
Casey Schaufler <[email protected]>
Fix incorrect type in assignment of ipv6 port for audit
Chaitanya Kulkarni <[email protected]>
loop: use sysfs_emit() in the sysfs xxx show()
Christian Göttsche <[email protected]>
selinux: use correct type for context length
Duoming Zhou <[email protected]>
net/x25: Fix null-ptr-deref caused by x25_disconnect
Tom Rix <[email protected]>
qlcnic: dcb: default to returning -EOPNOTSUPP
Florian Fainelli <[email protected]>
net: phy: broadcom: Fix brcm_fet_config_init()
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options
Pavel Skripkin <[email protected]>
jfs: fix divide error in dbNextAG
Randy Dunlap <[email protected]>
kgdbts: fix return value of __setup handler
Randy Dunlap <[email protected]>
kgdboc: fix return value of __setup handler
Randy Dunlap <[email protected]>
tty: hvc: fix return value of __setup handler
Miaoqian Lin <[email protected]>
pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe
Miaoqian Lin <[email protected]>
pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe
Miaoqian Lin <[email protected]>
pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init
Alexey Khoroshilov <[email protected]>
NFS: remove unneeded check in decode_devicenotify_args()
Miaoqian Lin <[email protected]>
clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver
Jonathan Neuschäfer <[email protected]>
clk: clps711x: Terminate clk_div_table with sentinel element
Jonathan Neuschäfer <[email protected]>
clk: loongson1: Terminate clk_div_table with sentinel element
Miaoqian Lin <[email protected]>
remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region
Taniya Das <[email protected]>
clk: qcom: clk-rcg2: Update the frac table for pixel clock
Jiasheng Jiang <[email protected]>
iio: adc: Add check for devm_request_threaded_irq
Uwe Kleine-König <[email protected]>
pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add()
Jiri Slaby <[email protected]>
mxser: fix xmit_buf leak in activate when LSR == 0xff
Miaoqian Lin <[email protected]>
mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
Peter Rosin <[email protected]>
i2c: mux: demux-pinctrl: do not deactivate a master that is not active
Petr Machata <[email protected]>
af_netlink: Fix shift out of bounds in group mask calculation
Dan Carpenter <[email protected]>
USB: storage: ums-realtek: fix error code in rts51x_read_mem()
Randy Dunlap <[email protected]>
MIPS: RB532: fix return value of __setup handler
Jiasheng Jiang <[email protected]>
mfd: mc13xxx: Add check for mc13xxx_irq_request
Jakob Koschel <[email protected]>
powerpc/sysdev: fix incorrect use to determine if list is empty
Jiasheng Jiang <[email protected]>
power: supply: wm8350-power: Add missing free in free_charger_irq
Jiasheng Jiang <[email protected]>
power: supply: wm8350-power: Handle error for wm8350_register_irq
Robert Hancock <[email protected]>
i2c: xiic: Make bus names unique
Hou Wenlong <[email protected]>
KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor()
Zhenzhong Duan <[email protected]>
KVM: x86: Fix emulation in writing cr8
Miaoqian Lin <[email protected]>
drm/tegra: Fix reference leak in tegra_dsi_ganged_probe
Zhang Yi <[email protected]>
ext2: correct max file size computing
Randy Dunlap <[email protected]>
TOMOYO: fix __setup handlers return values
Damien Le Moal <[email protected]>
scsi: pm8001: Fix abort all task initialization
Damien Le Moal <[email protected]>
scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix command initialization in pm80XX_send_read_log()
Colin Ian King <[email protected]>
iwlwifi: Fix -EIO error code that is never returned
Dmitry Torokhov <[email protected]>
HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports
Miaoqian Lin <[email protected]>
power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init
Jiasheng Jiang <[email protected]>
ray_cs: Check ioremap return value
Pavel Skripkin <[email protected]>
ath9k_htc: fix uninit value bugs
Maxime Ripard <[email protected]>
drm/edid: Don't clear formats if using deep color
Jiasheng Jiang <[email protected]>
mtd: onenand: Check for error irq
Wang Wensheng <[email protected]>
ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
Miaoqian Lin <[email protected]>
ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
Codrin Ciubotariu <[email protected]>
ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Miaoqian Lin <[email protected]>
video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
Jiasheng Jiang <[email protected]>
ASoC: fsi: Add check for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: wm8350: Handle error for wm8350_register_irq
Miaoqian Lin <[email protected]>
ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
Takashi Sakamoto <[email protected]>
ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
Jia-Ju Bai <[email protected]>
memory: emif: check the pointer temp in get_device_details()
Jiasheng Jiang <[email protected]>
memory: emif: Add check for setup_interrupts
Jiasheng Jiang <[email protected]>
ASoC: atmel_ssc_dai: Handle errors for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: mxs-saif: Handle errors for clk_enable
Randy Dunlap <[email protected]>
printk: fix return value of printk.devkmsg __setup handler
Frank Wunderlich <[email protected]>
arm64: dts: broadcom: Fix sata nodename
Kuldeep Singh <[email protected]>
arm64: dts: ns2: Fix spi-cpol and spi-cpha property
Jiasheng Jiang <[email protected]>
ALSA: spi: Add check for clk_enable()
Jiasheng Jiang <[email protected]>
ASoC: ti: davinci-i2s: Add check for clk_enable()
Dan Carpenter <[email protected]>
media: usb: go7007: s2250-board: fix leak in probe()
Miaoqian Lin <[email protected]>
soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
Pavel Kubelun <[email protected]>
ARM: dts: qcom: ipq4019: fix sleep clock
Dan Carpenter <[email protected]>
video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
Wang Hai <[email protected]>
video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
Adrian Hunter <[email protected]>
perf/x86/intel/pt: Fix address filter config for 32-bit kernel
Adrian Hunter <[email protected]>
perf/core: Fix address filter parser for multiple filters
Bharata B Rao <[email protected]>
sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa
Randy Dunlap <[email protected]>
clocksource: acpi_pm: fix return value of __setup handler
Brandon Wyman <[email protected]>
hwmon: (pmbus) Add Vin unit off handling
Dāvis Mosāns <[email protected]>
crypto: ccp - ccp_dmaengine_unregister release dma channels
Petr Vorel <[email protected]>
crypto: vmx - add missing dependencies
Randy Dunlap <[email protected]>
PM: suspend: fix return value of __setup handler
Randy Dunlap <[email protected]>
PM: hibernate: fix __setup handler error handling
Armin Wolf <[email protected]>
hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
Patrick Rudolph <[email protected]>
hwmon: (pmbus) Add mutex to regulator ops
Muhammad Usama Anjum <[email protected]>
selftests/x86: Add validity check and allow field splitting
Miaoqian Lin <[email protected]>
spi: tegra114: Add missing IRQ check in tegra_spi_probe
Tomas Paukrt <[email protected]>
crypto: mxs-dcp - Fix scatterlist processing
Herbert Xu <[email protected]>
crypto: authenc - Fix sleep in atomic context in decrypt_tail
Liguang Zhang <[email protected]>
PCI: pciehp: Clear cmd_busy bit in polling mode
Hector Martin <[email protected]>
brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio
Hector Martin <[email protected]>
brcmfmac: firmware: Allocate space for default boardrev in nvram
Johan Hovold <[email protected]>
media: davinci: vpif: fix unbalanced runtime PM get
Maciej W. Rozycki <[email protected]>
DEC: Limit PMAX memory probing to R3k systems
Dirk Müller <[email protected]>
lib/raid6/test: fix multiple definition linking error
Srinivas Pandruvada <[email protected]>
thermal: int340x: Increase bitmap size
Colin Ian King <[email protected]>
carl9170: fix missing bit-wise or operator for tx_params
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: add missing HDMI supplies on SMDK5420
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: add missing HDMI supplies on SMDK5250
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: fix UART3 pins configuration in Exynos5250
Michael Schmitz <[email protected]>
video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
Helge Deller <[email protected]>
video: fbdev: sm712fb: Fix crash in smtcfb_read()
Duoming Zhou <[email protected]>
drivers: hamradio: 6pack: fix UAF bug caused by mod_timer()
Xiaomeng Tong <[email protected]>
ALSA: cs4236: fix an incorrect NULL check on list iterator
José Expósito <[email protected]>
Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
Damien Le Moal <[email protected]>
scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands
Hugh Dickins <[email protected]>
mempolicy: mbind_range() set_policy() after vma_merge()
Alistair Popple <[email protected]>
mm/pages_alloc.c: don't create ZONE_MOVABLE beyond the end of a node
Baokun Li <[email protected]>
jffs2: fix memory leak in jffs2_scan_medium
Baokun Li <[email protected]>
jffs2: fix memory leak in jffs2_do_mount_fs
Baokun Li <[email protected]>
jffs2: fix use-after-free in jffs2_clear_xattr_subsystem
Hangyu Hua <[email protected]>
can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
Dan Carpenter <[email protected]>
NFSD: prevent underflow in nfssvc_decode_writeargs()
NeilBrown <[email protected]>
SUNRPC: avoid race between mod_timer() and del_timer_sync()
Jann Horn <[email protected]>
ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
Kunihiko Hayashi <[email protected]>
clk: uniphier: Fix fixed-rate initialization
Liam Beguin <[email protected]>
iio: inkern: make a best effort on offset calculation
Liam Beguin <[email protected]>
iio: inkern: apply consumer scale on IIO_VAL_INT cases
James Clark <[email protected]>
coresight: Fix TRCCONFIGR.QE sysfs interface
Alan Stern <[email protected]>
USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c
Xie Yongji <[email protected]>
virtio-blk: Use blk_validate_block_size() to validate block size
Xie Yongji <[email protected]>
block: Add a helper to validate the block size
Haimin Zhang <[email protected]>
af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
Zheyu Ma <[email protected]>
ethernet: sun: Free the coherent when failing in probing
Michael S. Tsirkin <[email protected]>
virtio_console: break out of buf poll on remove
Yajun Deng <[email protected]>
netdevice: add the case if dev is NULL
Johan Hovold <[email protected]>
USB: serial: simple: add Nokia phone driver
Eddie James <[email protected]>
USB: serial: pl2303: add IBM device IDs
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 + arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 + arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 +- arch/arm/boot/dts/qcom-msm8960.dtsi | 8 +- arch/arm/boot/dts/spear1340.dtsi | 6 +- arch/arm/boot/dts/spear13xx.dtsi | 6 +- arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +- arch/arm/mach-davinci/board-da850-evm.c | 4 +- arch/arm/mach-mmp/sram.c | 22 +-- arch/arm/mach-s3c24xx/mach-jive.c | 6 +- arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 49 +++++++ arch/arm64/boot/dts/broadcom/ns2-svk.dts | 8 +- arch/arm64/boot/dts/broadcom/ns2.dtsi | 2 +- arch/arm64/kernel/insn.c | 4 +- arch/arm64/kernel/module.lds | 2 +- arch/mips/dec/prom/Makefile | 2 +- arch/mips/include/asm/dec/prom.h | 15 +- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +-- arch/mips/rb532/devices.c | 6 +- arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 +- arch/powerpc/sysdev/fsl_gtm.c | 4 +- arch/x86/events/intel/pt.c | 2 +- arch/x86/kvm/emulate.c | 14 +- arch/x86/kvm/hyperv.c | 15 ++ arch/x86/kvm/lapic.c | 5 +- arch/x86/kvm/pmu_amd.c | 8 +- arch/x86/power/cpu.c | 21 ++- arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 8 +- arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 8 +- arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 4 +- crypto/authenc.c | 2 +- drivers/acpi/acpica/nswalk.c | 3 + drivers/acpi/apei/bert.c | 8 +- drivers/acpi/cppc_acpi.c | 5 + drivers/base/power/main.c | 6 +- drivers/block/drbd/drbd_int.h | 8 +- drivers/block/drbd/drbd_nl.c | 41 +++--- drivers/block/drbd/drbd_state.c | 18 +-- drivers/block/drbd/drbd_state_change.h | 8 +- drivers/block/loop.c | 10 +- drivers/block/virtio_blk.c | 12 +- drivers/char/virtio_console.c | 15 +- drivers/clk/clk-clps711x.c | 2 + drivers/clk/loongson1/clk-loongson1c.c | 1 + drivers/clk/qcom/clk-rcg2.c | 1 + drivers/clk/tegra/clk-emc.c | 1 + drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 + drivers/clocksource/acpi_pm.c | 6 +- drivers/crypto/ccp/ccp-dmaengine.c | 16 +++ drivers/crypto/mxs-dcp.c | 2 +- drivers/crypto/vmx/Kconfig | 4 + drivers/dma/sh/shdma-base.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 + drivers/gpu/drm/drm_edid.c | 8 -- drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 4 +- drivers/gpu/ipu-v3/ipu-di.c | 5 +- drivers/hid/i2c-hid/i2c-hid-core.c | 32 +++-- drivers/hwmon/pmbus/pmbus.h | 1 + drivers/hwmon/pmbus/pmbus_core.c | 18 ++- drivers/hwmon/sch56xx-common.c | 2 +- .../hwtracing/coresight/coresight-etm4x-sysfs.c | 8 +- drivers/i2c/busses/i2c-pasemi.c | 6 + drivers/i2c/busses/i2c-xiic.c | 3 +- drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +- drivers/iio/adc/twl6030-gpadc.c | 2 + drivers/iio/inkern.c | 34 ++++- drivers/input/input.c | 6 - drivers/iommu/arm-smmu-v3.c | 1 + drivers/irqchip/irq-nvic.c | 2 + drivers/md/dm-ioctl.c | 2 + drivers/media/pci/cx88/cx88-mpeg.c | 3 + drivers/media/platform/davinci/vpif.c | 1 + drivers/media/usb/go7007/s2250-board.c | 10 +- drivers/media/usb/hdpvr/hdpvr-video.c | 4 +- drivers/memory/emif.c | 8 +- drivers/mfd/asic3.c | 10 +- drivers/mfd/mc13xxx-core.c | 4 +- drivers/misc/kgdbts.c | 4 +- drivers/mmc/core/host.c | 15 +- drivers/mtd/onenand/generic.c | 7 +- drivers/mtd/ubi/fastmap.c | 28 ++-- drivers/net/can/usb/ems_usb.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/micrel/Kconfig | 1 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +- drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c | 8 -- drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h | 4 + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 13 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- drivers/net/ethernet/sun/sunhme.c | 6 +- drivers/net/hamradio/6pack.c | 4 +- drivers/net/phy/broadcom.c | 21 +++ drivers/net/slip/slip.c | 2 +- drivers/net/veth.c | 2 +- drivers/net/wireless/ath/ath5k/eeprom.c | 3 + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 + drivers/net/wireless/ath/carl9170/main.c | 2 +- .../broadcom/brcm80211/brcmfmac/firmware.c | 2 + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 48 +------ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- drivers/net/wireless/ray_cs.c | 6 + drivers/pci/hotplug/pciehp_hpc.c | 2 + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- drivers/pinctrl/pinconf-generic.c | 6 +- drivers/pinctrl/pinctrl-rockchip.c | 2 + drivers/power/supply/ab8500_fg.c | 4 +- drivers/power/supply/wm8350_power.c | 97 +++++++++++-- drivers/ptp/ptp_sysfs.c | 4 +- drivers/pwm/pwm-lpc18xx-sct.c | 20 ++- drivers/remoteproc/qcom_wcnss.c | 1 + drivers/rtc/rtc-wm8350.c | 11 +- drivers/scsi/aha152x.c | 6 +- drivers/scsi/bfa/bfad_attr.c | 26 ++-- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- drivers/scsi/libfc/fc_exch.c | 1 + drivers/scsi/libsas/sas_ata.c | 2 +- drivers/scsi/mvsas/mv_init.c | 5 +- drivers/scsi/pm8001/pm8001_hwi.c | 13 +- drivers/scsi/pm8001/pm80xx_hwi.c | 11 +- drivers/scsi/qla2xxx/qla_isr.c | 1 + drivers/scsi/zorro7xx.c | 2 + drivers/soc/ti/wkup_m3_ipc.c | 4 +- drivers/spi/spi-tegra114.c | 4 + drivers/spi/spi-tegra20-slink.c | 8 +- drivers/thermal/int340x_thermal/int3400_thermal.c | 2 +- drivers/tty/hvc/hvc_iucv.c | 4 +- drivers/tty/mxser.c | 15 +- drivers/tty/serial/kgdboc.c | 6 +- drivers/tty/serial/samsung.c | 5 +- drivers/usb/dwc3/dwc3-omap.c | 2 +- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 3 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/storage/ene_ub6250.c | 155 ++++++++++----------- drivers/usb/storage/realtek_cr.c | 2 +- drivers/video/fbdev/atafb.c | 12 +- drivers/video/fbdev/cirrusfb.c | 16 +-- drivers/video/fbdev/core/fbcvt.c | 53 +++---- drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- .../fbdev/omap2/omapfb/displays/connector-dvi.c | 1 + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 +- .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +- drivers/video/fbdev/sm712fb.c | 46 ++---- drivers/video/fbdev/smscufx.c | 3 +- drivers/video/fbdev/w100fb.c | 15 +- drivers/w1/slaves/w1_therm.c | 8 +- fs/cifs/link.c | 3 + fs/ext2/super.c | 6 +- fs/ext4/inode.c | 25 ++++ fs/gfs2/rgrp.c | 3 +- fs/jffs2/build.c | 4 +- fs/jffs2/fs.c | 2 +- fs/jffs2/scan.c | 6 +- fs/jfs/inode.c | 3 +- fs/jfs/jfs_dmap.c | 7 + fs/nfs/callback_xdr.c | 4 - fs/nfsd/nfsproc.c | 2 +- fs/nfsd/xdr.h | 2 +- fs/ntfs/inode.c | 4 + fs/ubifs/dir.c | 2 + fs/ubifs/ioctl.c | 2 +- include/linux/blkdev.h | 8 ++ include/linux/netdevice.h | 6 +- include/net/xfrm.h | 9 +- init/main.c | 6 +- kernel/events/core.c | 3 + kernel/power/hibernate.c | 2 +- kernel/power/suspend_test.c | 8 +- kernel/printk/printk.c | 6 +- kernel/ptrace.c | 47 +++++-- kernel/sched/debug.c | 10 -- kernel/smp.c | 2 +- lib/raid6/test/test.c | 1 - mm/kmemleak.c | 8 +- mm/memcontrol.c | 2 +- mm/memory.c | 24 +++- mm/mempolicy.c | 9 +- mm/mmap.c | 2 +- mm/mremap.c | 3 + mm/page_alloc.c | 11 +- mm/rmap.c | 35 ++++- net/bluetooth/hci_event.c | 3 +- net/key/af_key.c | 6 +- net/netfilter/nf_conntrack_proto_tcp.c | 17 ++- net/netlink/af_netlink.c | 2 + net/nfc/nci/core.c | 4 + net/openvswitch/flow_netlink.c | 4 +- net/sunrpc/sched.c | 4 +- net/sunrpc/xprt.c | 7 + net/sunrpc/xprtrdma/transport.c | 4 +- net/x25/af_x25.c | 11 +- net/xfrm/xfrm_policy.c | 24 ++-- net/xfrm/xfrm_user.c | 14 +- scripts/gcc-plugins/latent_entropy_plugin.c | 44 +++--- security/selinux/xfrm.c | 2 +- security/smack/smack_lsm.c | 2 +- security/tomoyo/load_policy.c | 4 +- sound/core/pcm_misc.c | 2 +- sound/firewire/fcp.c | 4 +- sound/isa/cs423x/cs4236.c | 8 +- sound/soc/atmel/atmel_ssc_dai.c | 5 +- sound/soc/atmel/sam9g20_wm8731.c | 1 + sound/soc/codecs/wm8350.c | 28 +++- sound/soc/davinci/davinci-i2s.c | 5 +- sound/soc/fsl/imx-es8328.c | 1 + sound/soc/mxs/mxs-saif.c | 5 +- sound/soc/mxs/mxs-sgtl5000.c | 3 + sound/soc/sh/fsi.c | 19 ++- sound/soc/soc-core.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 6 +- sound/soc/soc-topology.c | 3 +- sound/spi/at73c213.c | 27 +++- tools/build/feature/Makefile | 2 +- tools/testing/selftests/x86/check_cc.sh | 2 +- virt/kvm/kvm_main.c | 13 ++ 222 files changed, 1285 insertions(+), 729 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 28/218 video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
From: Michael Schmitz <[email protected]>
commit c8be5edbd36ceed2ff3d6b8f8e40643c3f396ea3 upstream.
The code to set the shifter STe palette registers has a long standing operator precedence bug, manifesting as colors set on a 2 bits per pixel frame buffer coming up with a distinctive blue tint.
Add parentheses around the calculation of the per-color palette data before shifting those into their respective bit field position.
This bug goes back a long way (2.4 days at the very least) so there won't be a Fixes: tag.
Tested on ARAnyM as well on Falcon030 hardware.
--- drivers/video/fbdev/atafb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/video/fbdev/atafb.c +6 -6
@@ -1713,9 +1713,9 @@ static int falcon_setcolreg(unsigned int ((blue & 0xfc00) >> 8));if (regno <16 ) { shifter_tt.color_reg[regno] = - (((red &0xe000 ) >>13 ) | ((red &0x1000 ) >>12 ) <<8 ) | - (((green &0xe000 ) >>13 ) | ((green &0x1000 ) >>12 ) <<4 ) | - ((blue &0xe000 ) >>13 ) | ((blue &0x1000 ) >>12 ); + ((((red &0xe000 ) >>13 ) | ((red &0x1000 ) >>12 )) <<8 ) | + ((((green &0xe000 ) >>13 ) | ((green &0x1000 ) >>12 )) <<4 ) | + ((blue &0xe000 ) >>13 ) | ((blue &0x1000 ) >>12 ); ((u32 *)info->pseudo_palette)[regno] = ((red &0xf800 ) | ((green &0xfc00 ) >>5 ) | ((blue &0xf800 ) >>11 ));
@@ -2001,9 +2001,9 @@ static int stste_setcolreg(unsigned int green >>=12 ;if (ATARIHW_PRESENT (EXTD_SHIFTER )) shifter_tt.color_reg[regno] = - (((red &0xe ) >>1 ) | ((red &1 ) <<3 ) <<8 ) | - (((green &0xe ) >>1 ) | ((green &1 ) <<3 ) <<4 ) | - ((blue &0xe ) >>1 ) | ((blue &1 ) <<3 ); + ((((red &0xe ) >>1 ) | ((red &1 ) <<3 )) <<8 ) | + ((((green &0xe ) >>1 ) | ((green &1 ) <<3 )) <<4 ) | + ((blue &0xe ) >>1 ) | ((blue &1 ) <<3 );else shifter_tt.color_reg[regno] = ((red & 0xe) << 7) |
Greg Kroah-Hartman
maintainerPATCH 5/218 ethernet: sun: Free the coherent when failing in probing
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit bb77bd31c281f70ec77c9c4f584950a779e05cf8 ]
When the driver fails to register net device, it should free the DMA region first, and then do other cleanup.
--- drivers/net/ethernet/sun/sunhme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/sun/sunhme.c +5 -1
@@ -3160,7 +3160,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,if (err) {printk (KERN_ERR "happymeal(PCI): Cannot register net device, " "aborting.\n" ); - goto err_out_iounmap; + goto err_out_free_coherent; }pci_set_drvdata (pdev, hp);
@@ -3193,6 +3193,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,return 0 ; +err_out_free_coherent: +dma_free_coherent (hp->dma_dev,PAGE_SIZE , + hp->happy_block, hp->hblock_dvma); + err_out_iounmap:iounmap (hp->gregs);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 4/218 virtio_console: break out of buf poll on remove
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 0e7174b9d5877130fec41fb4a16e0c2ee4958d44 ]
A common pattern for device reset is currently:vdev->config->reset(vdev);
.. cleanup ..
reset prevents new interrupts from arriving and waits for interrupt handlers to finish.
However if - as is common - the handler queues a work request which is flushed during the cleanup stage, we have code adding buffers / trying to get buffers while device is reset. Not good.
This was reproduced by running
modprobe virtio_console
modprobe -r virtio_console
in a loop.
Fix this up by calling virtio_break_device + flush before reset.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1786239
--- drivers/char/virtio_console.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/char/virtio_console.c +7 -0
@@ -2004,6 +2004,13 @@ static void virtcons_remove(struct virtio_device *vdev)list_del (&portdev->list);spin_unlock_irq (&pdrvdata_lock); +/* Device is going away, exit any polling for buffers */ +virtio_break_device (vdev); +if (use_multiport (portdev)) +flush_work (&portdev->control_work); +else +flush_work (&portdev->config_work); +/* Disable interrupts for vqs */ vdev->config->reset (vdev);/* Finish up work that's lined up */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 44/218 hwmon: (pmbus) Add mutex to regulator ops
In reply to Greg Kroah-HartmanFrom: Patrick Rudolph <[email protected]>
[ Upstream commit 686d303ee6301261b422ea51e64833d7909a2c36 ]
On PMBUS devices with multiple pages, the regulator ops need to be protected with the update mutex. This prevents accidentally changing the page in a separate thread while operating on the PMBUS_OPERATION register.
Tested on Infineon xdpe11280 while a separate thread polls for sensor data.
--- drivers/hwmon/pmbus/pmbus_core.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +13 -3
@@ -1818,10 +1818,14 @@ static int pmbus_regulator_is_enabled(struct regulator_dev *rdev) {struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client);u8 page =rdev_get_id (rdev);int ret; +mutex_lock (&data->update_lock); ret =pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +mutex_unlock (&data->update_lock); +if (ret <0 )return ret;
@@ -1832,11 +1836,17 @@ static int _pmbus_regulator_on_off(struct regulator_dev *rdev, bool enable) {struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client);u8 page =rdev_get_id (rdev); +int ret; -return pmbus_update_byte_data (client, page,PMBUS_OPERATION , -PB_OPERATION_CONTROL_ON , - enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_lock (&data->update_lock); + ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , +PB_OPERATION_CONTROL_ON , + enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_unlock (&data->update_lock); + +return ret; }static int pmbus_regulator_enable (struct regulator_dev *rdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 35/218 DEC: Limit PMAX memory probing to R3k systems
In reply to Greg Kroah-HartmanFrom: Maciej W. Rozycki <[email protected]>
commit 244eae91a94c6dab82b3232967d10eeb9dfa21c6 upstream.
Recent tightening of the opcode table in binutils so as to consistently disallow the assembly or disassembly of CP0 instructions not supported by the processor architecture chosen has caused a regression like below:
arch/mips/dec/prom/locore.S: Assembler messages:arch/mips/dec/prom/locore.S:29: Error: opcode not supported on this processor: r4600 (mips3) `rfe'
in a piece of code used to probe for memory with PMAX DECstation models, which have non-REX firmware. Those computers always have an R2000 CPU and consequently the exception handler used in memory probing uses the RFE instruction, which those processors use.
While adding 64-bit support this code was correctly excluded for 64-bit configurations, however it should have also been excluded for irrelevant 32-bit configurations. Do this now then, and only enable PMAX memory probing for R3k systems.
--- arch/mips/dec/prom/Makefile | 2 +- arch/mips/include/asm/dec/prom.h | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-)
arch/mips/dec/prom/Makefile +1 -1
@@ -5,4 +5,4 @@ lib-y += init.o memory.o cmdline.o identify.o console.o -lib-$(CONFIG_32BIT) += locore.o +lib-$(CONFIG_CPU_R3000) += locore.o
arch/mips/include/asm/dec/prom.h +5 -10
@@ -47,16 +47,11 @@*/ #define REX_PROM_MAGIC 0x30464354 -#ifdef CONFIG_64BIT - -#define prom_is_rex (magic) 1/* KN04 and KN05 are REX PROMs. */ - -#else /* !CONFIG_64BIT */ - -#define prom_is_rex (magic) ((magic) == REX_PROM_MAGIC) - -#endif /* !CONFIG_64BIT */ - +/* KN04 and KN05 are REX PROMs, so only do the check for R3k systems. */ +static inline bool prom_is_rex (u32 magic) +{ +return !IS_ENABLED (CONFIG_CPU_R3000 ) || magic ==REX_PROM_MAGIC ; +}/* * 3MIN/MAXINE PROM entry points for DS5000/1xx's, DS5000/xx's and
Greg Kroah-Hartman
maintainerPATCH 47/218 PM: suspend: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7a64ca17e4dd50d5f910769167f3553902777844 ]
If an invalid option is given for "test_suspend=<option>", the entire string is added to init's environment, so return 1 instead of 0 from the __setup handler.
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
test_suspend=invalid"
and
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
test_suspend=invalid--- kernel/power/suspend_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/power/suspend_test.c +4 -4
@@ -158,22 +158,22 @@ static int __init setup_test_suspend(char *value) value++; suspend_type =strsep (&value,"," );if (!suspend_type) -return 0 ; +return 1 ; repeat =strsep (&value,"," );if (repeat) {if (kstrtou32 (repeat,0 , &test_repeat_count_max)) -return 0 ; +return 1 ; }for (i =0 ; pm_labels[i]; i++)if (!strcmp (pm_labels[i], suspend_type)) { test_state_label = pm_labels[i]; -return 0 ; +return 1 ; }printk (warn_bad_state, suspend_type); -return 0 ; +return 1 ; }__setup ("test_suspend" , setup_test_suspend);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 45/218 hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
In reply to Greg Kroah-HartmanFrom: Armin Wolf <[email protected]>
[ Upstream commit 647d6f09bea7dacf4cdb6d4ea7e3051883955297 ]
If the watchdog was already enabled by the BIOS after booting, the watchdog infrastructure needs to regularly send keepalives to prevent a unexpected reset.WDOG_ACTIVE only serves as an status indicator for userspace, we want to use WDOG_HW_RUNNING instead.
Since my Fujitsu Esprimo P720 does not support the watchdog, this change is compile-tested only.
--- drivers/hwmon/sch56xx-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/sch56xx-common.c +1 -1
@@ -438,7 +438,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,if (nowayout)set_bit (WDOG_NO_WAY_OUT , &data->wddev.status);if (output_enable &SCH56XX_WDOG_OUTPUT_ENABLE ) -set_bit (WDOG_ACTIVE , &data->wddev.status); +set_bit (WDOG_HW_RUNNING , &data->wddev.status);/* Since the watchdog uses a downcounter there is no register to read the BIOS set timeout from (if any was set at all) ->
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 46/218 PM: hibernate: fix __setup handler error handling
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ba7ffcd4c4da374b0f64666354eeeda7d3827131 ]
If an invalid value is used in "resumedelay=<seconds>", it is silently ignored. Add a warning message and then let the __setup handler return 1 to indicate that the kernel command line option has been handled.
--- kernel/power/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +1 -1
@@ -1185,7 +1185,7 @@ static int __init resumedelay_setup(char *str)int rc =kstrtouint (str,0 , &resume_delay);if (rc) -return rc; +pr_warn ("resumedelay: bad option string '%s'\n" , str);return 1 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 50/218 hwmon: (pmbus) Add Vin unit off handling
In reply to Greg Kroah-HartmanFrom: Brandon Wyman <[email protected]>
[ Upstream commit a5436af598779219b375c1977555c82def1c35d0 ]
If there is an input undervoltage fault, reported in STATUS_INPUT command response, there is quite likely a "Unit Off For Insufficient Input Voltage" condition as well.
Add a constant for bit 3 of STATUS_INPUT. Update the Vin limit attributes to include both bits in the mask for clearing faults.
If an input undervoltage fault occurs, causing a unit off for insufficient input voltage, but the unit is off bit is not cleared, the STATUS_WORD will not be updated to clear the input fault condition. Including the unit is off bit (bit 3) allows for the input fault condition to completely clear.
--- drivers/hwmon/pmbus/pmbus.h | 1 + drivers/hwmon/pmbus/pmbus_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus.h +1 -0
@@ -262,6 +262,7 @@ enum pmbus_regs {/* * STATUS_VOUT, STATUS_INPUT */ +#define PB_VOLTAGE_VIN_OFF BIT(3)#define PB_VOLTAGE_UV_FAULT BIT(4)#define PB_VOLTAGE_UV_WARNING BIT(5)#define PB_VOLTAGE_OV_WARNING BIT(6)
drivers/hwmon/pmbus/pmbus_core.c +1 -1
@@ -1133,7 +1133,7 @@ static const struct pmbus_limit_attr vin_limit_attrs[] = { .reg = PMBUS_VIN_UV_FAULT_LIMIT, .attr = "lcrit", .alarm = "lcrit_alarm", - .sbit = PB_VOLTAGE_UV_FAULT, + .sbit = PB_VOLTAGE_UV_FAULT | PB_VOLTAGE_VIN_OFF, }, { .reg = PMBUS_VIN_OV_WARN_LIMIT, .attr = "max",
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 51/218 clocksource: acpi_pm: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 6a861abceecb68497dd82a324fee45a5332dcece ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings.
The __setup() handler interface isn't meant to handle negative return values -- they are non-zero, so they mean "handled" (like a return value of 1 does), but that's just a quirk. So return 1 from parse_pmtmr(). Also print a warning message if kstrtouint() returns an error.
--- drivers/clocksource/acpi_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/acpi_pm.c +4 -2
@@ -230,8 +230,10 @@ static int __init parse_pmtmr(char *arg)int ret; ret =kstrtouint (arg,16 , &base); -if (ret) -return ret; +if (ret) { +pr_warn ("PMTMR: invalid 'pmtmr=' value: '%s'\n" , arg); +return 1 ; + }pr_info ("PMTMR IOPort override: 0x%04x -> 0x%04x\n" , pmtmr_ioport, base);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 49/218 crypto: ccp - ccp_dmaengine_unregister release dma channels
In reply to Greg Kroah-HartmanFrom: Dāvis Mosāns <[email protected]>
[ Upstream commit 54cce8ecb9254f971b40a72911c6da403720a2d2 ]
ccp_dmaengine_register adds dma_chan->device_node to dma_dev->channels list but ccp_dmaengine_unregister didn't remove them.
That can cause crashes in various dmaengine methods that tries to use dma_dev->channels
--- drivers/crypto/ccp/ccp-dmaengine.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/crypto/ccp/ccp-dmaengine.c +16 -0
@@ -621,6 +621,20 @@ static int ccp_terminate_all(struct dma_chan *dma_chan)return 0 ; } +static void ccp_dma_release (struct ccp_device *ccp) +{ +struct ccp_dma_chan *chan; +struct dma_chan *dma_chan; +unsigned int i; + +for (i =0 ; i < ccp->cmd_q_count; i++) { + chan = ccp->ccp_dma_chan + i; + dma_chan = &chan->dma_chan; +tasklet_kill (&chan->cleanup_tasklet); +list_del_rcu (&dma_chan->device_node); + } +} +int ccp_dmaengine_register (struct ccp_device *ccp) {struct ccp_dma_chan *chan;
@@ -715,6 +729,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp)return 0 ; err_reg: +ccp_dma_release (ccp);kmem_cache_destroy (ccp->dma_desc_cache); err_cache:
@@ -728,6 +743,7 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)struct dma_device *dma_dev = &ccp->dma_dev;dma_async_device_unregister (dma_dev); +ccp_dma_release (ccp);kmem_cache_destroy (ccp->dma_desc_cache);kmem_cache_destroy (ccp->dma_cmd_cache);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 23/218 scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit 8454563e4c2aafbfb81a383ab423ea8b9b430a25 upstream.
To detect for the DMA_NONE (no data transfer) DMA direction, sas_ata_qc_issue() tests if the command protocol is ATA_PROT_NODATA. This test does not include the ATA_CMD_NCQ_NON_DATA command as this command protocol is defined as ATA_PROT_NCQ_NODATA (equal to ATA_PROT_FLAG_NCQ) and not as ATA_PROT_NODATA.
To include both NCQ and non-NCQ commands when testing for the DMA_NONE DMA direction, use "!ata_is_data()".
--- drivers/scsi/libsas/sas_ata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libsas/sas_ata.c +1 -1
@@ -220,7 +220,7 @@ static unsigned int sas_ata_qc_issue(str task->total_xfer_len = qc->nbytes; task->num_scatter = qc->n_elem; task->data_dir = qc->dma_dir; - }else if (qc->tf.protocol ==ATA_PROT_NODATA ) { + }else if (!ata_is_data (qc->tf.protocol)) { task->data_dir =DMA_NONE ; }else {for_each_sg (qc->sg, sg, qc->n_elem, si)
Greg Kroah-Hartman
maintainerPATCH 48/218 crypto: vmx - add missing dependencies
In reply to Greg Kroah-HartmanFrom: Petr Vorel <[email protected]>
[ Upstream commit 647d41d3952d726d4ae49e853a9eff68ebad3b3f ]
vmx-crypto module depends on CRYPTO_AES, CRYPTO_CBC, CRYPTO_CTR or CRYPTO_XTS, thus add them.
These dependencies are likely to be enabled, but if CRYPTO_DEV_VMX=y && !CRYPTO_MANAGER_DISABLE_TESTS
and either of CRYPTO_AES, CRYPTO_CBC, CRYPTO_CTR or CRYPTO_XTS is built as module or disabled, alg_test() from crypto/testmgr.c complains during boot about failing to allocate the generic fallback implementations (2 == ENOENT):
[ 0.540953] Failed to allocate xts(aes) fallback: -2 [ 0.541014] alg: skcipher: failed to allocate transform for p8_aes_xts: -2 [ 0.541120] alg: self-tests for p8_aes_xts (xts(aes)) failed (rc=-2) [ 0.544440] Failed to allocate ctr(aes) fallback: -2 [ 0.544497] alg: skcipher: failed to allocate transform for p8_aes_ctr: -2 [ 0.544603] alg: self-tests for p8_aes_ctr (ctr(aes)) failed (rc=-2) [ 0.547992] Failed to allocate cbc(aes) fallback: -2 [ 0.548052] alg: skcipher: failed to allocate transform for p8_aes_cbc: -2 [ 0.548156] alg: self-tests for p8_aes_cbc (cbc(aes)) failed (rc=-2) [ 0.550745] Failed to allocate transformation for 'aes': -2 [ 0.550801] alg: cipher: Failed to load transform for p8_aes: -2 [ 0.550892] alg: self-tests for p8_aes (aes) failed (rc=-2)
--- drivers/crypto/vmx/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/vmx/Kconfig +4 -0
@@ -1,7 +1,11 @@ config CRYPTO_DEV_VMX_ENCRYPT tristate "Encryption acceleration support on P8 CPU" depends on CRYPTO_DEV_VMX + select CRYPTO_AES + select CRYPTO_CBC + select CRYPTO_CTR select CRYPTO_GHASH + select CRYPTO_XTS default m help Support for VMX cryptographic acceleration instructions on Power8 CPU.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 21/218 mm/pages_alloc.c: dont create ZONE_MOVABLE beyond the end of a node
In reply to Greg Kroah-HartmanFrom: Alistair Popple <[email protected]>
commit ddbc84f3f595cf1fc8234a191193b5d20ad43938 upstream.
ZONE_MOVABLE uses the remaining memory in each node. Its starting pfn is also aligned to MAX_ORDER_NR_PAGES. It is possible for the remaining memory in a node to be less than MAX_ORDER_NR_PAGES, meaning there is not enough room for ZONE_MOVABLE on that node.
Unfortunately this condition is not checked for. This leads to zone_movable_pfn[] getting set to a pfn greater than the last pfn in a node.
calculate_node_totalpages() then sets zone->present_pages to be greater than zone->spanned_pages which is invalid, as spanned_pages represents the maximum number of pages in a zone assuming no holes.
Subsequently it is possible free_area_init_core() will observe a zone of size zero with present pages. In this case it will skip setting up the zone, including the initialisation of free_lists[].
However populated_zone() checks zone->present_pages to see if a zone has memory available. This is used by iterators such as walk_zones_in_node(). pagetypeinfo_showfree() uses this to walk the free_list of each zone in each node, which are assumed to be initialised due to the zone not being empty.
As free_area_init_core() never initialised the free_lists[] this results in the following kernel crash when trying to read /proc/pagetypeinfo:
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC NOPTI CPU: 0 PID: 456 Comm: cat Not tainted 5.16.0 #461 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 RIP: 0010:pagetypeinfo_show+0x163/0x460 Code: 9e 82 e8 80 57 0e 00 49 8b 06 b9 01 00 00 00 4c 39 f0 75 16 e9 65 02 00 00 48 83 c1 01 48 81 f9 a0 86 01 00 0f 84 48 02 00 00 <48> 8b 00 4c 39 f0 75 e7 48 c7 c2 80 a2 e2 82 48 c7 c6 79 ef e3 82 RSP: 0018:ffffc90001c4bd10 EFLAGS: 00010003 RAX: 0000000000000000 RBX: ffff88801105f638 RCX: 0000000000000001 RDX: 0000000000000001 RSI: 000000000000068b RDI: ffff8880163dc68b RBP: ffffc90001c4bd90 R08: 0000000000000001 R09: ffff8880163dc67e R10: 656c6261766f6d6e R11: 6c6261766f6d6e55 R12: ffff88807ffb4a00 R13: ffff88807ffb49f8 R14: ffff88807ffb4580 R15: ffff88807ffb3000 FS: 00007f9c83eff5c0(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000013c8e000 CR4: 0000000000350ef0 Call Trace: seq_read_iter+0x128/0x460 proc_reg_read_iter+0x51/0x80 new_sync_read+0x113/0x1a0 vfs_read+0x136/0x1d0 ksys_read+0x70/0xf0 __x64_sys_read+0x1a/0x20 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae
Fix this by checking that the aligned zone_movable_pfn[] does not exceed the end of the node, and if it does skip creating a movable zone on this node.
--- mm/page_alloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
mm/page_alloc.c +8 -1
@@ -6267,10 +6267,17 @@ restart: out2:/* Align start of ZONE_MOVABLE on all nids to MAX_ORDER_NR_PAGES */ -for (nid =0 ; nid <MAX_NUMNODES ; nid++) +for (nid =0 ; nid <MAX_NUMNODES ; nid++) { +unsigned long start_pfn, end_pfn; + zone_movable_pfn[nid] =roundup (zone_movable_pfn[nid],MAX_ORDER_NR_PAGES ); +get_pfn_range_for_nid (nid, &start_pfn, &end_pfn); +if (zone_movable_pfn[nid] >= end_pfn) + zone_movable_pfn[nid] =0 ; + } + out:/* restore the node_state */ node_states[N_MEMORY ] = saved_node_state;
Greg Kroah-Hartman
maintainerPATCH 20/218 jffs2: fix memory leak in jffs2_scan_medium
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 9cdd3128874f5fe759e2c4e1360ab7fb96a8d1df upstream.
If an error is returned in jffs2_scan_eraseblock() and some memory has been added to the jffs2_summary *s, we can observe the following kmemleak report:
--------------------------------------------
unreferenced object 0xffff88812b889c40 (size 64):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s) hex dump (first 32 bytes):
40 48 b5 14 81 88 ff ff 01 e0 31 00 00 00 50 00 @H........1...P.
00 00 01 00 00 00 01 00 00 00 02 00 00 00 09 08 ................
backtrace:
[<ffffffffae93a3a3>] __kmalloc+0x613/0x910
[<ffffffffaf423b9c>] jffs2_sum_add_dirent_mem+0x5c/0xa0
[<ffffffffb0f3afa8>] jffs2_scan_medium.cold+0x36e5/0x4794
[<ffffffffb0f3dbe1>] jffs2_do_mount_fs.cold+0xa7/0x2267
[<ffffffffaf40acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffaf40c00a>] jffs2_fill_super+0x2ea/0x4c0
[<ffffffffb0315d64>] mtd_get_sb+0x254/0x400
[<ffffffffb0315f5f>] mtd_get_sb_by_nr+0x4f/0xd0
[<ffffffffb0316478>] get_tree_mtd+0x498/0x840
[<ffffffffaf40bd15>] jffs2_get_tree+0x25/0x30
[<ffffffffae9f358d>] vfs_get_tree+0x8d/0x2e0
[<ffffffffaea7a98f>] path_mount+0x50f/0x1e50
[<ffffffffaea7c3d7>] do_mount+0x107/0x130
[<ffffffffaea7c5c5>] __se_sys_mount+0x1c5/0x2f0
[<ffffffffaea7c917>] __x64_sys_mount+0xc7/0x160
[<ffffffffb10142f5>] do_syscall_64+0x45/0x70
unreferenced object 0xffff888114b54840 (size 32):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s)
hex dump (first 32 bytes):
c0 75 b5 14 81 88 ff ff 02 e0 02 00 00 00 02 00 .u..............
00 00 84 00 00 00 44 00 00 00 6b 6b 6b 6b 6b a5 ......D...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423b04>] jffs2_sum_add_inode_mem+0x54/0x90
[<ffffffffb0f3bd44>] jffs2_scan_medium.cold+0x4481/0x4794
[...]
unreferenced object 0xffff888114b57280 (size 32):
comm "mount", pid 692, jiffies 4294838393 (age 34.357s)
hex dump (first 32 bytes):
10 d5 6c 11 81 88 ff ff 08 e0 05 00 00 00 01 00 ..l.............
00 00 38 02 00 00 28 00 00 00 6b 6b 6b 6b 6b a5 ..8...(...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423c34>] jffs2_sum_add_xattr_mem+0x54/0x90
[<ffffffffb0f3a24f>] jffs2_scan_medium.cold+0x298c/0x4794
[...]
unreferenced object 0xffff8881116cd510 (size 16):
comm "mount", pid 692, jiffies 4294838395 (age 34.355s)
hex dump (first 16 bytes):
00 00 00 00 00 00 00 00 09 e0 60 02 00 00 6b a5 ..........`...k.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423cc4>] jffs2_sum_add_xref_mem+0x54/0x90
[<ffffffffb0f3b2e3>] jffs2_scan_medium.cold+0x3a20/0x4794
[...]
--------------------------------------------Therefore, we should call jffs2_sum_reset_collected(s) on exit to release the memory added in s. In addition, a new tag "out_buf" is added to prevent the NULL pointer reference caused by s being NULL. (thanks to Zhang Yi for this analysis)
Co-developed-with: Zhihao Cheng <[email protected]>
--- fs/jffs2/scan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/jffs2/scan.c +4 -2
@@ -136,7 +136,7 @@ int jffs2_scan_medium(struct jffs2_sb_inif (!s) {JFFS2_WARNING ("Can't allocate memory for summary\n" ); ret = -ENOMEM ; - goto out; + goto out_buf; } }
@@ -274,13 +274,15 @@ int jffs2_scan_medium(struct jffs2_sb_in } ret =0 ; out: +jffs2_sum_reset_collected (s); +kfree (s); + out_buf:if (buf_size)kfree (flashbuf);#ifndef __ECOS else mtd_unpoint(c->mtd, 0, c->mtd->size);#endif -kfree (s);return ret; }
Greg Kroah-Hartman
maintainerPATCH 2/218 USB: serial: simple: add Nokia phone driver
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c4b9c570965f75d0d55e639747f1e5ccdad2fae0 upstream.
Add a new "simple" driver for certain Nokia phones, including Nokia 130 (RM-1035) which exposes two serial ports in "charging only" mode:
Bus 001 Device 009: ID 0421:069a Nokia Mobile Phones 130 [RM-1035] (Charging only) Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 0 bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 8 idVendor 0x0421 Nokia Mobile Phones idProduct 0x069a 130 [RM-1035] (Charging only) bcdDevice 1.00 iManufacturer 1 Nokia iProduct 2 Nokia 130 (RM-1035) iSerial 0 bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0037
bNumInterfaces 2
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 500mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Device Status: 0x0000
(Bus Powered)
--- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/Kconfig +1 -0
@@ -65,6 +65,7 @@ config USB_SERIAL_SIMPLE - Libtransistor USB console - a number of Motorola phones - Motorola Tetra devices + - Nokia mobile phones - Novatel Wireless GPS receivers - Siemens USB/MPI adapter. - ViVOtech ViVOpay USB device.
drivers/usb/serial/usb-serial-simple.c +7 -0
@@ -94,6 +94,11 @@ DEVICE(moto_modem, MOTO_IDS); { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS ); +/* Nokia mobile phone driver */ +#define NOKIA_IDS () \ + { USB_DEVICE(0x0421, 0x069a) }/* Nokia 130 (RM-1035) */ +DEVICE (nokia,NOKIA_IDS ); +/* Novatel Wireless GPS driver */ #define NOVATEL_IDS () \ { USB_DEVICE(0x09d7, 0x0100) }/* NovAtel FlexPack GPS */
@@ -126,6 +131,7 @@ static struct usb_serial_driver * const &vivopay_device, &moto_modem_device, &motorola_tetra_device, + &nokia_device, &novatel_gps_device, &hp4x_device, &suunto_device,
@@ -143,6 +149,7 @@ static const struct usb_device_id id_tabVIVOPAY_IDS (),MOTO_IDS (),MOTOROLA_TETRA_IDS (), +NOKIA_IDS (),NOVATEL_IDS (),HP4X_IDS (), SUUNTO_IDS(),
Greg Kroah-Hartman
maintainerPATCH 18/218 jffs2: fix use-after-free in jffs2_clear_xattr_subsystem
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 4c7c44ee1650677fbe89d86edbad9497b7679b5c upstream.
When we mount a jffs2 image, assume that the first few blocks of the image are normal and contain at least one xattr-related inode, but the next block is abnormal. As a result, an error is returned in jffs2_scan_eraseblock(). jffs2_clear_xattr_subsystem() is then called in jffs2_build_filesystem() and then again in jffs2_do_fill_super().
Finally we can observe the following report:
==================================================================
BUG: KASAN: use-after-free in jffs2_clear_xattr_subsystem+0x95/0x6ac Read of size 8 at addr ffff8881243384e0 by task mount/719 Call Trace: dump_stack+0x115/0x16b jffs2_clear_xattr_subsystem+0x95/0x6ac jffs2_do_fill_super+0x84f/0xc30 jffs2_fill_super+0x2ea/0x4c0 mtd_get_sb+0x254/0x400 mtd_get_sb_by_nr+0x4f/0xd0 get_tree_mtd+0x498/0x840 jffs2_get_tree+0x25/0x30 vfs_get_tree+0x8d/0x2e0 path_mount+0x50f/0x1e50 do_mount+0x107/0x130 __se_sys_mount+0x1c5/0x2f0 __x64_sys_mount+0xc7/0x160 do_syscall_64+0x45/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Allocated by task 719: kasan_save_stack+0x23/0x60 __kasan_kmalloc.constprop.0+0x10b/0x120 kasan_slab_alloc+0x12/0x20 kmem_cache_alloc+0x1c0/0x870 jffs2_alloc_xattr_ref+0x2f/0xa0 jffs2_scan_medium.cold+0x3713/0x4794 jffs2_do_mount_fs.cold+0xa7/0x2253 jffs2_do_fill_super+0x383/0xc30 jffs2_fill_super+0x2ea/0x4c0 [...] Freed by task 719: kmem_cache_free+0xcc/0x7b0 jffs2_free_xattr_ref+0x78/0x98 jffs2_clear_xattr_subsystem+0xa1/0x6ac jffs2_do_mount_fs.cold+0x5e6/0x2253 jffs2_do_fill_super+0x383/0xc30 jffs2_fill_super+0x2ea/0x4c0 [...] The buggy address belongs to the object at ffff8881243384b8 which belongs to the cache jffs2_xattr_ref of size 48 The buggy address is located 40 bytes inside of 48-byte region [ffff8881243384b8, ffff8881243384e8) [...] ==================================================================
The triggering of the BUG is shown in the following stack:
-----------------------------------------------------------jffs2_fill_super
jffs2_do_fill_super
jffs2_do_mount_fs
jffs2_build_filesystem
jffs2_scan_medium
jffs2_scan_eraseblock <--- ERROR
jffs2_clear_xattr_subsystem <--- free
jffs2_clear_xattr_subsystem <--- free again
-----------------------------------------------------------
An error is returned in jffs2_do_mount_fs(). If the error is returned by jffs2_sum_init(), the jffs2_clear_xattr_subsystem() does not need to be executed. If the error is returned by jffs2_build_filesystem(), the jffs2_clear_xattr_subsystem() also does not need to be executed again. So move jffs2_clear_xattr_subsystem() from 'out_inohash' to 'out_root' to fix this UAF problem.
--- fs/jffs2/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jffs2/fs.c +1 -1
@@ -596,8 +596,8 @@ out_root:jffs2_free_ino_caches (c);jffs2_free_raw_node_refs (c);kvfree (c->blocks); - out_inohash:jffs2_clear_xattr_subsystem (c); + out_inohash:kfree (c->inocache_list); out_wbuf:jffs2_flash_cleanup (c);
Greg Kroah-Hartman
maintainerPATCH 11/218 iio: inkern: apply consumer scale on IIO_VAL_INT cases
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 1bca97ff95c732a516ebb68da72814194980e0a5 upstream.
When a consumer calls iio_read_channel_processed() and the channel has an integer scale, the scale channel scale is applied and the processed value is returned as expected.
On the other hand, if the consumer calls iio_convert_raw_to_processed() the scaling factor requested by the consumer is not applied.
This for example causes the consumer to process mV when expecting uV. Make sure to always apply the scaling factor requested by the consumer.
--- drivers/iio/inkern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/inkern.c +1 -1
@@ -606,7 +606,7 @@ static int iio_convert_raw_to_processed_switch (scale_type) {case IIO_VAL_INT : - *processed = raw64 * scale_val; + *processed = raw64 * scale_val * scale;break ;case IIO_VAL_INT_PLUS_MICRO :if (scale_val2 <0 )
Greg Kroah-Hartman
maintainerPATCH 57/218 ARM: dts: qcom: ipq4019: fix sleep clock
In reply to Greg Kroah-HartmanFrom: Pavel Kubelun <[email protected]>
[ Upstream commit 3d7e7980993d2c1ae42d3d314040fc2de6a9c45f ]
It seems like sleep_clk was copied from ipq806x.
Fix ipq40xx sleep_clk to the value QSDK defines.
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +2 -1
@@ -93,7 +93,8 @@ clocks { sleep_clk: sleep_clk { compatible = "fixed-clock"; - clock-frequency = <32768>; + clock-frequency = <32000>; + clock-output-names = "gcc_sleep_clk_src"; #clock-cells = <0>; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 52/218 sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa
In reply to Greg Kroah-HartmanFrom: Bharata B Rao <[email protected]>
[ Upstream commit 28c988c3ec29db74a1dda631b18785958d57df4f ]
The older format of /proc/pid/sched printed home node info which required the mempolicy and task lock around mpol_get(). However the format has changed since then and there is no need for sched_show_numa() any more to have mempolicy argument, asssociated mpol_get/put and task_lock/unlock. Remove them.
--- kernel/sched/debug.c | 10 ---------- 1 file changed, 10 deletions(-)
kernel/sched/debug.c +0 -10
@@ -836,25 +836,15 @@ void print_numa_stats(struct seq_file *m, int node, unsigned long tsf,static void sched_show_numa (struct task_struct *p,struct seq_file *m) {#ifdef CONFIG_NUMA_BALANCING -struct mempolicy *pol; -if (p->mm)P (mm->numa_scan_seq); -task_lock (p); - pol = p->mempolicy; -if (pol && !(pol->flags &MPOL_F_MORON )) - pol =NULL ; -mpol_get (pol); -task_unlock (p); -P (numa_pages_migrated);P (numa_preferred_nid);P (total_numa_faults);SEQ_printf (m,"current_node=%d, numa_group_id=%d\n" ,task_node (p),task_numa_group_id (p));show_numa_stats (p, m); -mpol_put (pol);#endif }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 53/218 perf/core: Fix address filter parser for multiple filters
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit d680ff24e9e14444c63945b43a37ede7cd6958f9 ]
Reset appropriate variables in the parser loop between parsing separate filters, so that they do not interfere with parsing the next filter.
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -8306,8 +8306,11 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr, }/* ready to consume more filters */ +kfree (filename); + filename =NULL ; state =IF_STATE_ACTION ; filter =NULL ; + kernel =0 ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 54/218 perf/x86/intel/pt: Fix address filter config for 32-bit kernel
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit e5524bf1047eb3b3f3f33b5f59897ba67b3ade87 ]
Change from shifting 'unsigned long' to 'u64' to prevent the config bits being lost on a 32-bit kernel.
--- arch/x86/events/intel/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/pt.c +1 -1
@@ -410,7 +410,7 @@ static u64 pt_config_filters(struct perf_event *event) pt->filters.filter[range].msr_b = filter->msr_b; } - rtit_ctl |= filter->config << pt_address_ranges[range].reg_off; + rtit_ctl |= (u64 )filter->config << pt_address_ranges[range].reg_off; }return rtit_ctl;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 55/218 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 1791f487f877a9e83d81c8677bd3e7b259e7cb27 ]
I got a null-ptr-deref report:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:fb_destroy_modelist+0x38/0x100 ... Call Trace: ufx_usb_probe.cold+0x2b5/0xac1 [smscufx] usb_probe_interface+0x1aa/0x3c0 [usbcore] really_probe+0x167/0x460
...
ret_from_fork+0x1f/0x30
If fb_alloc_cmap() fails in ufx_usb_probe(), fb_destroy_modelist() will be called to destroy modelist in the error handling path. But modelist has not been initialized yet, so it will result in null-ptr-deref.
Initialize modelist before calling fb_alloc_cmap() to fix this bug.
--- drivers/video/fbdev/smscufx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/smscufx.c +1 -2
@@ -1671,6 +1671,7 @@ static int ufx_usb_probe(struct usb_interface *interface, info->par = dev; info->pseudo_palette = dev->pseudo_palette; info->fbops = &ufx_ops; +INIT_LIST_HEAD (&info->modelist); retval =fb_alloc_cmap (&info->cmap,256 ,0 );if (retval <0 ) {
@@ -1681,8 +1682,6 @@ static int ufx_usb_probe(struct usb_interface *interface,INIT_DELAYED_WORK (&dev->free_framebuffer_work, ufx_free_framebuffer_work); -INIT_LIST_HEAD (&info->modelist); - retval =ufx_reg_read (dev,0x3000 , &id_rev);check_warn_goto_error (retval,"error %d reading 0x3000 register from device" , retval);dev_dbg (dev->gdev,"ID_REV register value 0x%08x" , id_rev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 59/218 media: usb: go7007: s2250-board: fix leak in probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 67e4550ecd6164bfbdff54c169e5bbf9ccfaf14d ]
Call i2c_unregister_device(audio) on this error path.
--- drivers/media/usb/go7007/s2250-board.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/media/usb/go7007/s2250-board.c +4 -6
@@ -512,6 +512,7 @@ static int s2250_probe(struct i2c_client *client,u8 *data;struct go7007 *go =i2c_get_adapdata (adapter);struct go7007_usb *usb = go->hpi_context; +int err = -EIO ; audio =i2c_new_dummy (adapter,TLV320_ADDRESS >>1 );if (audio ==NULL )
@@ -540,11 +541,8 @@ static int s2250_probe(struct i2c_client *client, V4L2_CID_HUE, -512, 511, 1, 0); sd->ctrl_handler = &state->hdl;if (state->hdl.error) { -int err = state->hdl.error; - -v4l2_ctrl_handler_free (&state->hdl); -kfree (state); -return err; + err = state->hdl.error; + goto fail; } state->std =V4L2_STD_NTSC ;
@@ -608,7 +606,7 @@ static int s2250_probe(struct i2c_client *client,i2c_unregister_device (audio);v4l2_ctrl_handler_free (&state->hdl);kfree (state); -return -EIO ; +return err; }static int s2250_remove (struct i2c_client *client)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 60/218 ASoC: ti: davinci-i2s: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ed7c9fef11931fc5d32a83d68017ff390bf5c280 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/davinci/davinci-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/davinci/davinci-i2s.c +4 -1
@@ -719,7 +719,9 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (dev->clk))return -ENODEV ; -clk_enable (dev->clk); + ret =clk_enable (dev->clk); +if (ret) + goto err_put_clk; dev->dev = &pdev->dev;dev_set_drvdata (&pdev->dev, dev);
@@ -741,6 +743,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)snd_soc_unregister_component (&pdev->dev); err_release_clk:clk_disable (dev->clk); +err_put_clk:clk_put (dev->clk);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 61/218 ALSA: spi: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ca1697eb09208f0168d94b88b72f57505339cbe5 ]
As the potential failure of the clk_enable(), it should be better to check it and return error if fails.
--- sound/spi/at73c213.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
sound/spi/at73c213.c +21 -6
@@ -221,7 +221,9 @@ static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_at73c213_playback_hw; chip->substream = substream; -clk_enable (chip->ssc->clk); + err =clk_enable (chip->ssc->clk); +if (err) +return err;return 0 ; }
@@ -787,7 +789,9 @@ static int snd_at73c213_chip_init(struct snd_at73c213 *chip) goto out;/* Enable DAC master clock. */ -clk_enable (chip->board->dac_clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) + goto out;/* Initialize at73c213 on SPI bus. */ retval =snd_at73c213_write_reg (chip,DAC_RST ,0x04 );
@@ -900,7 +904,9 @@ static int snd_at73c213_dev_init(struct snd_card *card, chip->card = card; chip->irq =-1 ; -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) +return retval; retval =request_irq (irq, snd_at73c213_interrupt,0 ,"at73c213" , chip);if (retval) {
@@ -1019,7 +1025,9 @@ static int snd_at73c213_remove(struct spi_device *spi)int retval;/* Stop playback. */ -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) + goto out;ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXDIS ));clk_disable (chip->ssc->clk);
@@ -1099,9 +1107,16 @@ static int snd_at73c213_resume(struct device *dev) {struct snd_card *card =dev_get_drvdata (dev);struct snd_at73c213 *chip = card->private_data; +int retval; -clk_enable (chip->board->dac_clk); -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) +return retval; + retval =clk_enable (chip->ssc->clk); +if (retval) { +clk_disable (chip->board->dac_clk); +return retval; + }ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXEN ));return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 58/218 soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c3d66a164c726cc3b072232d3b6d87575d194084 ]
platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:
int irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;Fix the check of return value to catch errors correctly.
--- drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/ti/wkup_m3_ipc.c +2 -2
@@ -405,9 +405,9 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (!irq) { +if (irq <0 ) {dev_err (&pdev->dev,"no irq resource\n" ); -return -ENXIO ; +return irq; } ret = devm_request_irq(dev, irq, wkup_m3_txev_handler,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 36/218 media: davinci: vpif: fix unbalanced runtime PM get
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 4a321de239213300a714fa0353a5f1272d381a44 upstream.
Make sure to balance the runtime PM usage counter on driver unbind.
--- drivers/media/platform/davinci/vpif.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/davinci/vpif.c +1 -0
@@ -437,6 +437,7 @@ static int vpif_probe(struct platform_destatic int vpif_remove (struct platform_device *pdev) { +pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 56/218 video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 78482af095abd9f4f29f1aa3fe575d25c6ae3028 ]
This code has two bugs:
1) "cnt" is 255 but the size of the buffer is 256 so the last byte is not used.
2) If we try to print more than 255 characters then "cnt" will be negative and that will trigger a WARN() in snprintf(). The fix for this is to use scnprintf() instead of snprintf().
We can re-write this code to be cleaner:
1) Rename "offset" to "off" because that's shorter.
2) Get rid of the "cnt" variable and just use "size - off" directly.
3) Get rid of the "read" variable and just increment "off" directly.
--- drivers/video/fbdev/core/fbcvt.c | 53 +++++++++++++------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/video/fbdev/core/fbcvt.c +21 -32
@@ -214,9 +214,11 @@ static u32 fb_cvt_aspect_ratio(struct fb_cvt_data *cvt)static void fb_cvt_print_name (struct fb_cvt_data *cvt) {u32 pixcount, pixcount_mod; -int cnt =255 , offset =0 , read =0 ; -u8 *buf =kzalloc (256 ,GFP_KERNEL ); +int size =256 ; +int off =0 ; +u8 *buf; + buf =kzalloc (size,GFP_KERNEL );if (!buf)return ;
@@ -224,43 +226,30 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt) pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) %1000000 ; pixcount_mod /=1000 ; - read =snprintf (buf+offset, cnt,"fbcvt: %dx%d@%d: CVT Name - " , - cvt->xres, cvt->yres, cvt->refresh); - offset += read; - cnt -= read; + off +=scnprintf (buf + off, size - off,"fbcvt: %dx%d@%d: CVT Name - " , + cvt->xres, cvt->yres, cvt->refresh); -if (cvt->status) -snprintf (buf+offset, cnt,"Not a CVT standard - %d.%03d Mega " -"Pixel Image\n" , pixcount, pixcount_mod); -else { -if (pixcount) { - read =snprintf (buf+offset, cnt,"%d" , pixcount); - cnt -= read; - offset += read; - } +if (cvt->status) { + off +=scnprintf (buf + off, size - off, +"Not a CVT standard - %d.%03d Mega Pixel Image\n" , + pixcount, pixcount_mod); + }else { +if (pixcount) + off +=scnprintf (buf + off, size - off,"%d" , pixcount); - read =snprintf (buf+offset, cnt,".%03dM" , pixcount_mod); - cnt -= read; - offset += read; + off +=scnprintf (buf + off, size - off,".%03dM" , pixcount_mod);if (cvt->aspect_ratio ==0 ) - read =snprintf (buf+offset, cnt,"3" ); + off +=scnprintf (buf + off, size - off,"3" );else if (cvt->aspect_ratio ==3 ) - read =snprintf (buf+offset, cnt,"4" ); + off +=scnprintf (buf + off, size - off,"4" );else if (cvt->aspect_ratio ==1 || cvt->aspect_ratio ==4 ) - read =snprintf (buf+offset, cnt,"9" ); + off +=scnprintf (buf + off, size - off,"9" );else if (cvt->aspect_ratio ==2 ) - read =snprintf (buf+offset, cnt,"A" ); -else - read =0 ; - cnt -= read; - offset += read; - -if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) { - read =snprintf (buf+offset, cnt,"-R" ); - cnt -= read; - offset += read; - } + off +=scnprintf (buf + off, size - off,"A" ); + +if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) + off +=scnprintf (buf + off, size - off,"-R" ); }printk (KERN_INFO "%s\n" , buf);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 63/218 arm64: dts: broadcom: Fix sata nodename
In reply to Greg Kroah-HartmanFrom: Frank Wunderlich <[email protected]>
[ Upstream commit 55927cb44db43a57699fa652e2437a91620385dc ]
After converting ahci-platform txt binding to yaml nodename is reported as not matching the standard:
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dt.yaml:
ahci@663f2000: $nodename:0: 'ahci@663f2000' does not match '^sata(@.*)?$'
Fix it to match binding.
--- arch/arm64/boot/dts/broadcom/ns2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/broadcom/ns2.dtsi +1 -1
@@ -514,7 +514,7 @@ }; }; - sata: ahci@663f2000 { + sata: sata@663f2000 { compatible = "brcm,iproc-ahci", "generic-ahci"; reg = <0x663f2000 0x1000>; reg-names = "ahci";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 37/218 brcmfmac: firmware: Allocate space for default boardrev in nvram
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit d19d8e3ba256f81ea4a27209dbbd1f0a00ef1903 upstream.
If boardrev is missing from the NVRAM we add a default one, but this might need more space in the output buffer than was allocated. Ensure we have enough padding for this in the buffer.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +2 -0
@@ -216,6 +216,8 @@ static int brcmf_init_nvram_parser(struc size =BRCMF_FW_MAX_NVRAM_SIZE ; else size = data_len; +/* Add space for properties we may add */ + size +=strlen (BRCMF_FW_DEFAULT_BOARDREV ) +1 ;/* Alloc for extra 0 byte + roundup by 4 + length field */ size +=1 +3 +sizeof (u32); nvp->nvram =kzalloc (size,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 62/218 arm64: dts: ns2: Fix spi-cpol and spi-cpha property
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
[ Upstream commit c953c764e505428f59ffe6afb1c73b89b5b1ac35 ]
Broadcom ns2 platform has spi-cpol and spi-cpho properties set incorrectly. As per spi-slave-peripheral-prop.yaml, these properties are of flag or boolean type and not integer type. Fix the values.
--- arch/arm64/boot/dts/broadcom/ns2-svk.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/broadcom/ns2-svk.dts +4 -4
@@ -103,8 +103,8 @@ compatible = "silabs,si3226x"; reg = <0>; spi-max-frequency = <5000000>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
@@ -127,8 +127,8 @@ at25,byte-len = <0x8000>; at25,addr-mode = <2>; at25,page-size = <64>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 64/218 printk: fix return value of printk.devkmsg __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b665eae7a788c5e2bc10f9ac3c0137aa0ad1fc97 ]
If an invalid option value is used with "printk.devkmsg=<value>", it is silently ignored.
If a valid option value is used, it is honored but the wrong return value (0) is used, indicating that the command line option had an error and was not handled. This string is not added to init's environment strings due to init/main.c::unknown_bootoption() checking for a '.' in the boot option string and then considering that string to be an "Unused module parameter".
Print a warning message if a bad option string is used. Always return 1 from the __setup handler to indicate that the command line option has been handled.
--- kernel/printk/printk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/printk/printk.c +4 -2
@@ -122,8 +122,10 @@ static int __control_devkmsg(char *str)static int __init control_devkmsg (char *str) { -if (__control_devkmsg (str) <0 ) +if (__control_devkmsg (str) <0 ) { +pr_warn ("printk.devkmsg: bad option string '%s'\n" , str);return 1 ; + }/* * Set sysctl string accordingly:
@@ -145,7 +147,7 @@ static int __init control_devkmsg(char *str)*/ devkmsg_log |=DEVKMSG_LOG_MASK_LOCK ; -return 0 ; +return 1 ; }__setup ("printk.devkmsg=" , control_devkmsg);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 68/218 memory: emif: check the pointer temp in get_device_details()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 5b5ab1bfa1898c6d52936a57c25c5ceba2cb2f87 ]
The pointer temp is allocated by devm_kzalloc(), so it should be checked for error handling.
--- drivers/memory/emif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/emif.c +1 -1
@@ -1425,7 +1425,7 @@ static struct emif_data *__init_or_module get_device_details( temp =devm_kzalloc (dev,sizeof (*pd),GFP_KERNEL ); dev_info =devm_kzalloc (dev,sizeof (*dev_info),GFP_KERNEL ); -if (!emif || !pd || !dev_info) { +if (!emif || !temp || !dev_info) {dev_err (dev,"%s:%d: allocation error\n" , __func__, __LINE__); goto error; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 72/218 ASoC: fsi: Add check for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 405afed8a728f23cfaa02f75bbc8bdd6b7322123 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/sh/fsi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
sound/soc/sh/fsi.c +16 -3
@@ -821,14 +821,27 @@ static int fsi_clk_enable(struct device *dev,return ret; } -clk_enable (clock->xck); -clk_enable (clock->ick); -clk_enable (clock->div); + ret =clk_enable (clock->xck); +if (ret) + goto err; + ret =clk_enable (clock->ick); +if (ret) + goto disable_xck; + ret =clk_enable (clock->div); +if (ret) + goto disable_ick; clock->count++; }return ret; + +disable_ick: +clk_disable (clock->ick); +disable_xck: +clk_disable (clock->xck); +err: +return ret; } static int fsi_clk_disable(struct device *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 41/218 crypto: mxs-dcp - Fix scatterlist processing
In reply to Greg Kroah-HartmanFrom: Tomas Paukrt <[email protected]>
[ Upstream commit 28e9b6d8199a3f124682b143800c2dacdc3d70dd ]
This patch fixes a bug in scatterlist processing that may cause incorrect AES block encryption/decryption.
--- drivers/crypto/mxs-dcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/mxs-dcp.c +1 -1
@@ -328,7 +328,7 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq)memset (key +AES_KEYSIZE_128 ,0 ,AES_KEYSIZE_128 ); } -for_each_sg (req->src, src,sg_nents (src), i) { +for_each_sg (req->src, src,sg_nents (req->src), i) { src_buf =sg_virt (src); len =sg_dma_len (src); tlen += len;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 75/218 ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6ae0a4d8fec551ec581d620f0eb1fe31f755551c ]
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths.
For example, when codec_np is NULL, saif_np[0] and saif_np[1] are not NULL, it will cause leaks.
of_node_put() will check if the node pointer is NULL, so we can call it directly to release the refcount of regular pointers.
--- sound/soc/mxs/mxs-sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/mxs/mxs-sgtl5000.c +3 -0
@@ -112,6 +112,9 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) codec_np =of_parse_phandle (np,"audio-codec" ,0 );if (!saif_np[0 ] || !saif_np[1 ] || !codec_np) {dev_err (&pdev->dev,"phandle missing or invalid\n" ); +of_node_put (codec_np); +of_node_put (saif_np[0 ]); +of_node_put (saif_np[1 ]);return -EINVAL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 77/218 mtd: onenand: Check for error irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 3e68f331c8c759c0daa31cc92c3449b23119a215 ]
For the possible failure of the platform_get_irq(), the returned irq could be error number and will finally cause the failure of the request_irq().
Consider that platform_get_irq() can now in certain cases return -EPROBE_DEFER, and the consequences of letting request_irq() effectively convert that into -EINVAL, even at probe time rather than later on. So it might be better to check just now.
--- drivers/mtd/onenand/generic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/onenand/generic.c +6 -1
@@ -58,7 +58,12 @@ static int generic_onenand_probe(struct platform_device *pdev) } info->onenand.mmcontrol = pdata ? pdata->mmcontrol :NULL ; - info->onenand.irq =platform_get_irq (pdev,0 ); + + err =platform_get_irq (pdev,0 ); +if (err <0 ) + goto out_iounmap; + + info->onenand.irq = err; info->mtd.dev.parent = &pdev->dev; info->mtd.priv = &info->onenand;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 98/218 MIPS: RB532: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 8755d57ba1ff910666572fab9e32890e8cc6ed3b ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from setup_kmac().
From: Igor Zhbanov <[email protected]>
--- arch/mips/rb532/devices.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/mips/rb532/devices.c +2 -4
@@ -313,11 +313,9 @@ static int __init plat_setup_devices(void)static int __init setup_kmac (char *s) {printk (KERN_INFO "korina mac = %s\n" , s); -if (!mac_pton (s, korina_dev0_data.mac)) { +if (!mac_pton (s, korina_dev0_data.mac))printk (KERN_ERR "Invalid mac\n" ); -return -EINVAL ; - } -return 0 ; +return 1 ; }__setup ("kmac=" , setup_kmac);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 93/218 i2c: xiic: Make bus names unique
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 1d366c2f9df8279df2adbb60471f86fc40a1c39e ]
This driver is for an FPGA logic core, so there can be arbitrarily many instances of the bus on a given system. Previously all of the I2C bus names were "xiic-i2c" which caused issues with lm_sensors when trying to map human-readable names to sensor inputs because it could not properly distinguish the busses, for example. Append the platform device name to the I2C bus name so it is unique between different instances.
--- drivers/i2c/busses/i2c-xiic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-xiic.c +2 -1
@@ -727,7 +727,6 @@ static const struct i2c_algorithm xiic_algorithm = {static struct i2c_adapter xiic_adapter = { .owner =THIS_MODULE , - .name =DRIVER_NAME , .class =I2C_CLASS_DEPRECATED , .algo = &xiic_algorithm, };
@@ -763,6 +762,8 @@ static int xiic_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (&i2c->adap, i2c); i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = pdev->dev.of_node; +snprintf (i2c->adap.name,sizeof (i2c->adap.name), +DRIVER_NAME " %s" , pdev->name);mutex_init (&i2c->lock);init_waitqueue_head (&i2c->wait);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 90/218 drm/tegra: Fix reference leak in tegra_dsi_ganged_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 221e3638feb8bc42143833c9a704fa89b6c366bb ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore. Add put_device() call to fix this.
--- drivers/gpu/drm/tegra/dsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dsi.c +3 -1
@@ -1475,8 +1475,10 @@ static int tegra_dsi_ganged_probe(struct tegra_dsi *dsi) dsi->slave =platform_get_drvdata (gangster);of_node_put (np); -if (!dsi->slave) +if (!dsi->slave) { +put_device (&gangster->dev);return -EPROBE_DEFER ; + } dsi->slave->master = dsi; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 92/218 KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor()
In reply to Greg Kroah-HartmanFrom: Hou Wenlong <[email protected]>
[ Upstream commit ca85f002258fdac3762c57d12d5e6e401b6a41af ]
Per Intel's SDM on the "Instruction Set Reference", when loading segment descriptor, not-present segment check should be after all type and privilege checks. But the emulator checks it first, then #NP is triggered instead of #GP if privilege fails and segment is not present. Put not-present segment check after type and privilege checks in __load_segment_descriptor().
Message-Id: <52573c01d369f506cadcf7233812427cf7db81a7.1644292363.git.houwenlong.hwl@antgroup.com>
--- arch/x86/kvm/emulate.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/x86/kvm/emulate.c +9 -5
@@ -1674,11 +1674,6 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, goto exception; } -if (!seg_desc.p) { - err_vec = (seg ==VCPU_SREG_SS ) ?SS_VECTOR :NP_VECTOR ; - goto exception; - } - dpl = seg_desc.dpl;switch (seg) {
@@ -1718,6 +1713,10 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,case VCPU_SREG_TR :if (seg_desc.s || (seg_desc.type !=1 && seg_desc.type !=9 )) goto exception; +if (!seg_desc.p) { + err_vec =NP_VECTOR ; + goto exception; + } old_desc = seg_desc; seg_desc.type |=2 ;/* busy */ ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc,
@@ -1742,6 +1741,11 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,break ; } +if (!seg_desc.p) { + err_vec = (seg ==VCPU_SREG_SS ) ?SS_VECTOR :NP_VECTOR ; + goto exception; + } +if (seg_desc.s) {/* mark segment as accessed */ if (!(seg_desc.type &1 )) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 79/218 ath9k_htc: fix uninit value bugs
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit d1e0df1c57bd30871dd1c855742a7c346dbca853 ]
Syzbot reported 2 KMSAN bugs in ath9k. All of them are caused by missing field initialization.
In htc_connect_service() svc_meta_len and pad are not initialized. Based on code it looks like in current skb there is no service data, so simply initialize svc_meta_len to 0.
htc_issue_send() does not initialize htc_frame_hdr::control array. Based on firmware code, it will initialize it by itself, so simply zero whole array to make KMSAN happy
Fail logs:
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 4-7 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 16-17 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath9k/htc_hst.c +5 -0
@@ -31,6 +31,7 @@ static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, hdr->endpoint_id = epid; hdr->flags = flags; hdr->payload_len =cpu_to_be16 (len); +memset (hdr->control,0 ,sizeof (hdr->control)); status = target->hif->send (target->hif_dev, endpoint->ul_pipeid, skb);
@@ -278,6 +279,10 @@ int htc_connect_service(struct htc_target *target, conn_msg->dl_pipeid = endpoint->dl_pipeid; conn_msg->ul_pipeid = endpoint->ul_pipeid; +/* To prevent infoleak */ + conn_msg->svc_meta_len =0 ; + conn_msg->pad =0 ; + ret =htc_issue_send (target, skb, skb->len,0 ,ENDPOINT0 );if (ret) goto err;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 88/218 TOMOYO: fix __setup handlers return values
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 39844b7e3084baecef52d1498b5fa81afa2cefa9 ]
__setup() handlers should return 1 if the parameter is handled. Returning 0 causes the entire string to be added to init's environment strings (limited to 32 strings), unnecessarily polluting it.
Using the documented strings "TOMOYO_loader=string1" and "TOMOYO_trigger=string2" causes an Unknown parameter message:
Unknown kernel command line parameters
"BOOT_IMAGE=/boot/bzImage-517rc5 TOMOYO_loader=string1 \
TOMOYO_trigger=string2", will be passed to user space.
and these strings are added to init's environment string space:
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
TOMOYO_loader=string1
TOMOYO_trigger=string2With this change, these __setup handlers act as expected, and init's environment is not polluted with these strings.
--- security/tomoyo/load_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/tomoyo/load_policy.c +2 -2
@@ -23,7 +23,7 @@ static const char *tomoyo_loader;static int __init tomoyo_loader_setup (char *str) { tomoyo_loader = str; -return 0 ; +return 1 ; }__setup ("TOMOYO_loader=" , tomoyo_loader_setup);
@@ -62,7 +62,7 @@ static const char *tomoyo_trigger;static int __init tomoyo_trigger_setup (char *str) { tomoyo_trigger = str; -return 0 ; +return 1 ; }__setup ("TOMOYO_trigger=" , tomoyo_trigger_setup);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 80/218 ray_cs: Check ioremap return value
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 7e4760713391ee46dc913194b33ae234389a174e ]
As the possible failure of the ioremap(), the 'local->sram' and other two could be NULL.
Therefore it should be better to check it in order to avoid the later dev_dbg.
--- drivers/net/wireless/ray_cs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ray_cs.c +6 -0
@@ -396,6 +396,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->sram =ioremap (link->resource[2 ]->start,resource_size (link->resource[2 ])); +if (!local->sram) + goto failed;/*** Set up 16k window for shared memory (receive buffer) ***************/ link->resource[3]->flags |=
@@ -410,6 +412,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->rmem =ioremap (link->resource[3 ]->start,resource_size (link->resource[3 ])); +if (!local->rmem) + goto failed;/*** Set up window for attribute memory ***********************************/ link->resource[4]->flags |=
@@ -424,6 +428,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->amem =ioremap (link->resource[4 ]->start,resource_size (link->resource[4 ])); +if (!local->amem) + goto failed;dev_dbg (&link->dev,"ray_config sram=%p\n" , local->sram);dev_dbg (&link->dev,"ray_config rmem=%p\n" , local->rmem);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 96/218 powerpc/sysdev: fix incorrect use to determine if list is empty
In reply to Greg Kroah-HartmanFrom: Jakob Koschel <[email protected]>
[ Upstream commit fa1321b11bd01752f5be2415e74a0e1a7c378262 ]
'gtm' will *always* be set by list_for_each_entry().
It is incorrect to assume that the iterator value will be NULL if the list is empty.
Instead of checking the pointer it should be checked if the list is empty.
--- arch/powerpc/sysdev/fsl_gtm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/sysdev/fsl_gtm.c +2 -2
@@ -90,7 +90,7 @@ static LIST_HEAD(gtms);*/ struct gtm_timer *gtm_get_timer16 (void ) { -struct gtm *gtm =NULL ; +struct gtm *gtm;int i;list_for_each_entry (gtm, >ms, list_node) {
@@ -107,7 +107,7 @@ struct gtm_timer *gtm_get_timer16(void)spin_unlock_irq (>m->lock); } -if (gtm) +if (!list_empty (>ms))return ERR_PTR (-EBUSY );return ERR_PTR (-ENODEV ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 95/218 power: supply: wm8350-power: Add missing free in free_charger_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 6dee930f6f6776d1e5a7edf542c6863b47d9f078 ]
In free_charger_irq(), there is no free for 'WM8350_IRQ_CHG_FAST_RDY'. Therefore, it should be better to add it in order to avoid the memory leak.
--- drivers/power/supply/wm8350_power.c | 1 + 1 file changed, 1 insertion(+)
drivers/power/supply/wm8350_power.c +1 -0
@@ -526,6 +526,7 @@ static void free_charger_irq(struct wm8350 *wm8350)wm8350_free_irq (wm8350,WM8350_IRQ_CHG_TO , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_END , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_START , wm8350); +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , wm8350);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 34/218 lib/raid6/test: fix multiple definition linking error
In reply to Greg Kroah-HartmanFrom: Dirk Müller <[email protected]>
commit a5359ddd052860bacf957e65fe819c63e974b3a6 upstream.
GCC 10+ defaults to -fno-common, which enforces proper declaration of external references using "extern". without this change a link would fail with:
lib/raid6/test/algos.c:28: multiple definition of `raid6_call'; lib/raid6/test/test.c:22: first defined here
the pq.h header that is included already includes an extern declaration so we can just remove the redundant one here.
--- lib/raid6/test/test.c | 1 - 1 file changed, 1 deletion(-)
lib/raid6/test/test.c +0 -1
@@ -22,7 +22,6 @@#define NDISKS 16/* Including P and Q */ const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); -struct raid6_calls raid6_call;char *dataptrs[NDISKS ]; char data[NDISKS][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
Greg Kroah-Hartman
maintainerPATCH 116/218 kgdboc: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ab818c7aa7544bf8d2dd4bdf68878b17a02eb332 ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings. So return 1 from kgdboc_option_setup().
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd kgdbts=", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd
kgdbts=--- drivers/tty/serial/kgdboc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/kgdboc.c +3 -3
@@ -304,16 +304,16 @@ static int kgdboc_option_setup(char *opt) {if (!opt) {pr_err ("config string not provided\n" ); -return -EINVAL ; +return 1 ; }if (strlen (opt) >=MAX_CONFIG_LEN ) {pr_err ("config string too long\n" ); -return -ENOSPC ; +return 1 ; }strcpy (config, opt); -return 0 ; +return 1 ; }__setup ("kgdboc=" , kgdboc_option_setup);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 89/218 ext2: correct max file size computing
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
[ Upstream commit 50b3a818991074177a56c87124c7a7bdf5fa4f67 ]
We need to calculate the max file size accurately if the total blocks that can address by block tree exceed the upper_limit. But this check is not correct now, it only compute the total data blocks but missing metadata blocks are needed. So in the case of "data blocks < upper_limit && total blocks > upper_limit", we will get wrong result. Fortunately, this case could not happen in reality, but it's confused and better to correct the computing.
bits data blocks metadatablocks upper_limit
10 16843020 66051 2147483647
11 134480396 263171 1073741823
12 1074791436 1050627 536870911 (*) 13 8594130956 4198403 268435455 (*) 14 68736258060 16785411 134217727 (*)
15 549822930956 67125251 67108863 (*)
16 4398314962956 268468227 33554431 (*)
[*] Need to calculate in depth.
--- fs/ext2/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/ext2/super.c +5 -1
@@ -743,8 +743,12 @@ static loff_t ext2_max_size(int bits) res +=1LL << (bits-2 ); res +=1LL << (2 *(bits-2 )); res +=1LL << (3 *(bits-2 )); +/* Compute how many metadata blocks are needed */ + meta_blocks =1 ; + meta_blocks +=1 + ppb; + meta_blocks +=1 + ppb + ppb * ppb;/* Does block tree limit file size? */ -if (res < upper_limit) +if (res + meta_blocks <= upper_limit) goto check_lfs; res = upper_limit;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 40/218 crypto: authenc - Fix sleep in atomic context in decrypt_tail
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 66eae850333d639fc278d6f915c6fc01499ea893 ]
The function crypto_authenc_decrypt_tail discards its flags argument and always relies on the flags from the original request when starting its sub-request.
This is clearly wrong as it may cause the SLEEPABLE flag to be set when it shouldn't.
--- crypto/authenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/authenc.c +1 -1
@@ -268,7 +268,7 @@ static int crypto_authenc_decrypt_tail(struct aead_request *req, dst =scatterwalk_ffwd (areq_ctx->dst, req->dst, req->assoclen);skcipher_request_set_tfm (skreq, ctx->enc); -skcipher_request_set_callback (skreq,aead_request_flags (req), +skcipher_request_set_callback (skreq, flags, req->base.complete, req->base.data);skcipher_request_set_crypt (skreq, src, dst, req->cryptlen - authsize, req->iv);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 39/218 PCI: pciehp: Clear cmd_busy bit in polling mode
In reply to Greg Kroah-HartmanFrom: Liguang Zhang <[email protected]>
commit 92912b175178c7e895f5e5e9f1e30ac30319162b upstream.
Writes to a Downstream Port's Slot Control register are PCIe hotplug "commands." If the Port supports Command Completed events, software must wait for a command to complete before writing to Slot Control again.
pcie_do_write_cmd() sets ctrl->cmd_busy when it writes to Slot Control. If software notification is enabled, i.e., PCI_EXP_SLTCTL_HPIE and PCI_EXP_SLTCTL_CCIE are set, ctrl->cmd_busy is cleared by pciehp_isr().
But when software notification is disabled, as it is when pcie_init() powers off an empty slot, pcie_wait_cmd() uses pcie_poll_cmd() to poll for command completion, and it neglects to clear ctrl->cmd_busy, which leads to spurious timeouts:
pcieport 0000:00:03.0: pciehp: Timeout on hotplug command 0x01c0 (issued 2264 msec ago) pcieport 0000:00:03.0: pciehp: Timeout on hotplug command 0x05c0 (issued 2288 msec ago)
Clear ctrl->cmd_busy in pcie_poll_cmd() when it detects a Command Completed event (PCI_EXP_SLTSTA_CC).
--- drivers/pci/hotplug/pciehp_hpc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/hotplug/pciehp_hpc.c +2 -0
@@ -120,6 +120,8 @@ static int pcie_poll_cmd(struct controllif (slot_status &PCI_EXP_SLTSTA_CC ) {pcie_capability_write_word (pdev,PCI_EXP_SLTSTA ,PCI_EXP_SLTSTA_CC ); + ctrl->cmd_busy =0 ; +smp_mb ();return 1 ; }if (timeout <0 )
Greg Kroah-Hartman
maintainerPATCH 42/218 spi: tegra114: Add missing IRQ check in tegra_spi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 4f92724d4b92c024e721063f520d66e11ca4b54b ]
This func misses checking for platform_get_irq()'s call and may passes the negative error codes to request_threaded_irq(), which takes unsigned IRQ #, causing it to fail with -EINVAL, overriding an original error code. Stop calling request_threaded_irq() with invalid IRQ #s.
--- drivers/spi/spi-tegra114.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/spi/spi-tegra114.c +4 -0
@@ -1098,6 +1098,10 @@ static int tegra_spi_probe(struct platform_device *pdev) tspi->phys = r->start; spi_irq =platform_get_irq (pdev,0 ); +if (spi_irq <0 ) { + ret = spi_irq; + goto exit_free_master; + } tspi->irq = spi_irq; tspi->clk =devm_clk_get (&pdev->dev,"spi" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 76/218 ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
In reply to Greg Kroah-HartmanFrom: Wang Wensheng <[email protected]>
[ Upstream commit 3b891513f95cba3944e72c1139ea706d04f3781b ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- sound/soc/fsl/imx-es8328.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/imx-es8328.c +1 -0
@@ -93,6 +93,7 @@ static int imx_es8328_probe(struct platform_device *pdev)if (int_port >MUX_PORT_MAX || int_port ==0 ) {dev_err (dev,"mux-int-port: hardware only has %d mux ports\n" ,MUX_PORT_MAX ); + ret = -EINVAL ; goto fail; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 43/218 selftests/x86: Add validity check and allow field splitting
In reply to Greg Kroah-HartmanFrom: Muhammad Usama Anjum <[email protected]>
[ Upstream commit b06e15ebd5bfb670f93c7f11a29b8299c1178bc6 ]
Add check to test if CC has a string. CC can have multiple sub-strings like "ccache gcc". Erorr pops up if it is treated as single string and double quotes are used around it. This can be fixed by removing the quotes and not treating CC as a single string.
--- tools/testing/selftests/x86/check_cc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/x86/check_cc.sh +1 -1
@@ -7,7 +7,7 @@ CC="$1" TESTPROG="$2" shift 2 -if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then +if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then echo 1 else echo 0
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 38/218 brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit 9466987f246758eb7e9071ae58005253f631271e upstream.
The alignment check was wrong (e.g. & 4 instead of & 3), and the logic was also inefficient if the length was not a multiple of 4, since it would needlessly fall back to copying the entire buffer bytewise.
We already have a perfectly good memcpy_toio function, so just call that instead of rolling our own copy logic here. brcmf_pcie_init_ringbuffers was already using it anyway.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 48 +--------------- 1 file changed, 4 insertions(+), 44 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +4 -44
@@ -22,6 +22,7 @@#include <linux/interrupt.h> #include <linux/bcma/bcma.h> #include <linux/sched.h> +#include <linux/io.h> #include <asm/unaligned.h> #include <soc.h>
@@ -407,47 +408,6 @@ brcmf_pcie_write_ram32(struct brcmf_pciestatic void -brcmf_pcie_copy_mem_todev (struct brcmf_pciedev_info *devinfo,u32 mem_offset, -void *srcaddr,u32 len) -{ -void __iomem *address = devinfo->tcm + mem_offset; -__le32 *src32; -__le16 *src16; -u8 *src8; - -if (((ulong )address &4 ) || ((ulong )srcaddr &4 ) || (len &4 )) { -if (((ulong )address &2 ) || ((ulong )srcaddr &2 ) || (len &2 )) { - src8 = (u8 *)srcaddr; -while (len) { -iowrite8 (*src8, address); - address++; - src8++; - len--; - } - }else { - len = len /2 ; - src16 = (__le16 *)srcaddr; -while (len) { -iowrite16 (le16_to_cpu (*src16), address); - address +=2 ; - src16++; - len--; - } - } - }else { - len = len /4 ; - src32 = (__le32 *)srcaddr; -while (len) { -iowrite32 (le32_to_cpu (*src32), address); - address +=4 ; - src32++; - len--; - } - } -} - - -static void brcmf_pcie_copy_dev_tomem (struct brcmf_pciedev_info *devinfo,u32 mem_offset,void *dstaddr,u32 len) {
@@ -1422,8 +1382,8 @@ static int brcmf_pcie_download_fw_nvram(return err;brcmf_dbg (PCIE ,"Download FW %s\n" , devinfo->fw_name); -brcmf_pcie_copy_mem_todev (devinfo, devinfo->ci->rambase, - (void *)fw->data, fw->size); +memcpy_toio (devinfo->tcm + devinfo->ci->rambase, + (void *)fw->data, fw->size); resetintr =get_unaligned_le32 (fw->data);release_firmware (fw);
@@ -1437,7 +1397,7 @@ static int brcmf_pcie_download_fw_nvram(brcmf_dbg (PCIE ,"Download NVRAM %s\n" , devinfo->nvram_name); address = devinfo->ci->rambase + devinfo->ci->ramsize - nvram_len; -brcmf_pcie_copy_mem_todev (devinfo, address, nvram, nvram_len); +memcpy_toio (devinfo->tcm + address, nvram, nvram_len);brcmf_fw_nvram_free (nvram); }else { brcmf_dbg(PCIE, "No matching NVRAM file found %s\n",
Greg Kroah-Hartman
maintainerPATCH 71/218 ASoC: wm8350: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit db0350da8084ad549bca16cc0486c11cc70a1f9b ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, use 'free_' in order to avoid the same code.
--- sound/soc/codecs/wm8350.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8350.c +24 -4
@@ -1536,18 +1536,38 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)wm8350_clear_bits (wm8350,WM8350_JACK_DETECT ,WM8350_JDL_ENA |WM8350_JDR_ENA ); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , wm8350_hpl_jack_handler,0 ,"Left jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , +if (ret !=0 ) + goto err; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , wm8350_hpr_jack_handler,0 ,"Right jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , +if (ret !=0 ) + goto free_jck_det_l; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , wm8350_mic_handler,0 ,"Microphone short" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , +if (ret !=0 ) + goto free_jck_det_r; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , wm8350_mic_handler,0 ,"Microphone detect" , priv); +if (ret !=0 ) + goto free_micscd;return 0 ; + +free_micscd: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , priv); +free_jck_det_r: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , priv); +free_jck_det_l: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , priv); +err: +return ret; }static int wm8350_codec_remove (struct snd_soc_codec *codec)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 70/218 ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f590797fa3c1bccdd19e55441592a23b46aef449 ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function.
Calling of_node_put() to avoid the refcount leak.
--- sound/soc/atmel/sam9g20_wm8731.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/atmel/sam9g20_wm8731.c +1 -0
@@ -226,6 +226,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) cpu_np =of_parse_phandle (np,"atmel,ssc-controller" ,0 );if (!cpu_np) {dev_err (&pdev->dev,"dai and pcm info missing\n" ); +of_node_put (codec_np);return -EINVAL ; } at91sam9g20ek_dai.cpu_of_node = cpu_np;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 73/218 video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit a58c22cfbbf62fefca090334bbd35fd132e92a23 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c +1 -0
@@ -254,6 +254,7 @@ static int dvic_probe_of(struct platform_device *pdev) adapter_node =of_parse_phandle (node,"ddc-i2c-bus" ,0 );if (adapter_node) { adapter =of_get_i2c_adapter_by_node (adapter_node); +of_node_put (adapter_node);if (adapter ==NULL ) {dev_err (&pdev->dev,"failed to parse ddc-i2c-bus\n" );omap_dss_put_device (ddata->in);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 74/218 ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4 ]
Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config() callback might not be set. Check if this callback is set before using it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-generic-dmaengine-pcm.c +3 -3
@@ -98,10 +98,10 @@ static int dmaengine_pcm_hw_params(struct snd_pcm_substream *substream,memset (&slave_config,0 ,sizeof (slave_config)); -if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) { ret =prepare_slave_config (substream, params, &slave_config);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 67/218 memory: emif: Add check for setup_interrupts
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit fd7bd80b46373887b390852f490f21b07e209498 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value of the setup_interrupts() and return error if fails.
--- drivers/memory/emif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/memory/emif.c +4 -2
@@ -1517,7 +1517,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) {struct emif_data *emif;struct resource *res; -int irq; +int irq, ret;if (pdev->dev.of_node) emif =of_get_memory_device_details (pdev->dev.of_node, &pdev->dev);
@@ -1551,7 +1551,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)emif_onetime_settings (emif);emif_debugfs_init (emif);disable_and_clear_all_interrupts (emif); -setup_interrupts (emif, irq); + ret =setup_interrupts (emif, irq); +if (ret) + goto error;/* One-time actions taken on probing the first device */ if (!emif1) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 94/218 power: supply: wm8350-power: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit b0b14b5ba11bec56fad344a4a0b2e16449cc8b94 ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, use 'free_' in order to avoid same code.
--- drivers/power/supply/wm8350_power.c | 96 ++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 14 deletions(-)
drivers/power/supply/wm8350_power.c +82 -14
@@ -410,44 +410,112 @@ static const struct power_supply_desc wm8350_usb_desc = {* Initialisation *********************************************************************/ -static void wm8350_init_charger (struct wm8350 *wm8350) +static int wm8350_init_charger (struct wm8350 *wm8350) { +int ret; +/* register our interest in charger events */ -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_HOT , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_HOT , wm8350_charger_handler,0 ,"Battery hot" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_COLD , +if (ret) + goto err; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_COLD , wm8350_charger_handler,0 ,"Battery cold" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_FAIL , +if (ret) + goto free_chg_bat_hot; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_FAIL , wm8350_charger_handler,0 ,"Battery fail" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_TO , +if (ret) + goto free_chg_bat_cold; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_TO , wm8350_charger_handler,0 ,"Charger timeout" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_END , +if (ret) + goto free_chg_bat_fail; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_END , wm8350_charger_handler,0 ,"Charge end" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_START , +if (ret) + goto free_chg_to; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_START , wm8350_charger_handler,0 ,"Charge start" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , +if (ret) + goto free_chg_end; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , wm8350_charger_handler,0 ,"Fast charge ready" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , +if (ret) + goto free_chg_start; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , wm8350_charger_handler,0 ,"Battery <3.9V" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , +if (ret) + goto free_chg_fast_rdy; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , wm8350_charger_handler,0 ,"Battery <3.1V" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , +if (ret) + goto free_chg_vbatt_lt_3p9; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , wm8350_charger_handler,0 ,"Battery <2.85V" , wm8350); +if (ret) + goto free_chg_vbatt_lt_3p1;/* and supply change events */ -wm8350_register_irq (wm8350,WM8350_IRQ_EXT_USB_FB , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_EXT_USB_FB , wm8350_charger_handler,0 ,"USB" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_EXT_WALL_FB , +if (ret) + goto free_chg_vbatt_lt_2p85; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_EXT_WALL_FB , wm8350_charger_handler,0 ,"Wall" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_EXT_BAT_FB , +if (ret) + goto free_ext_usb_fb; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_EXT_BAT_FB , wm8350_charger_handler,0 ,"Battery" , wm8350); +if (ret) + goto free_ext_wall_fb; + +return 0 ; + +free_ext_wall_fb: +wm8350_free_irq (wm8350,WM8350_IRQ_EXT_WALL_FB , wm8350); +free_ext_usb_fb: +wm8350_free_irq (wm8350,WM8350_IRQ_EXT_USB_FB , wm8350); +free_chg_vbatt_lt_2p85: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , wm8350); +free_chg_vbatt_lt_3p1: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , wm8350); +free_chg_vbatt_lt_3p9: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , wm8350); +free_chg_fast_rdy: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , wm8350); +free_chg_start: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_START , wm8350); +free_chg_end: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_END , wm8350); +free_chg_to: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_TO , wm8350); +free_chg_bat_fail: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_BAT_FAIL , wm8350); +free_chg_bat_cold: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_BAT_COLD , wm8350); +free_chg_bat_hot: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_BAT_HOT , wm8350); +err: +return ret; }static void free_charger_irq (struct wm8350 *wm8350)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 69/218 ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit bf0cd60b7e33cf221fbe1114e4acb2c828b0af0d ]
AV/C deferred transaction was supported at a commit 00a7bb81c20f ("ALSA:
firewire-lib: Add support for deferred transaction") while 'deferrable' flag can be uninitialized for non-control/notify AV/C transactions. UBSAN reports it:
kernel: ================================================================================ kernel: UBSAN: invalid-load in /build/linux-aa0B4d/linux-5.15.0/sound/firewire/fcp.c:363:9 kernel: load of value 158 is not a valid value for type '_Bool' kernel: CPU: 3 PID: 182227 Comm: irq/35-firewire Tainted: P OE 5.15.0-18-generic #18-Ubuntu kernel: Hardware name: Gigabyte Technology Co., Ltd. AX370-Gaming 5/AX370-Gaming 5, BIOS F42b 08/01/2019 kernel: Call Trace: kernel: <IRQ> kernel: show_stack+0x52/0x58 kernel: dump_stack_lvl+0x4a/0x5f kernel: dump_stack+0x10/0x12 kernel: ubsan_epilogue+0x9/0x45 kernel: __ubsan_handle_load_invalid_value.cold+0x44/0x49 kernel: fcp_response.part.0.cold+0x1a/0x2b [snd_firewire_lib] kernel: fcp_response+0x28/0x30 [snd_firewire_lib] kernel: fw_core_handle_request+0x230/0x3d0 [firewire_core] kernel: handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? transmit_complete_callback+0x9f/0x120 [firewire_core] kernel: ar_context_tasklet+0xa8/0x2e0 [firewire_ohci] kernel: tasklet_action_common.constprop.0+0xea/0xf0 kernel: tasklet_action+0x22/0x30 kernel: __do_softirq+0xd9/0x2e3 kernel: ? irq_finalize_oneshot.part.0+0xf0/0xf0 kernel: do_softirq+0x75/0xa0 kernel: </IRQ> kernel: <TASK> kernel: __local_bh_enable_ip+0x50/0x60 kernel: irq_forced_thread_fn+0x7e/0x90 kernel: irq_thread+0xba/0x190 kernel: ? irq_thread_fn+0x60/0x60 kernel: kthread+0x11e/0x140 kernel: ? irq_thread_check_affinity+0xf0/0xf0 kernel: ? set_kthread_struct+0x50/0x50 kernel: ret_from_fork+0x22/0x30 kernel: </TASK> kernel: ================================================================================
This commit fixes the bug. The bug has no disadvantage for the non- control/notify AV/C transactions since the flag has an effect for AV/C response with INTERIM (0x0f) status which is not used for the transactions in AV/C general specification.
--- sound/firewire/fcp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/firewire/fcp.c +1 -3
@@ -234,9 +234,7 @@ int fcp_avc_transaction(struct fw_unit *unit, t.response_match_bytes = response_match_bytes; t.state =STATE_PENDING ;init_waitqueue_head (&t.wait); - -if (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 ) - t.deferrable = true; + t.deferrable = (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 );spin_lock_irq (&transactions_lock);list_add_tail (&t.list, &transactions);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 65/218 ASoC: mxs-saif: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 2ecf362d220317debf5da376e0390e9f7a3f7b29 ]
As the potential failure of the clk_enable(),
it should be better to check it, like mxs_saif_trigger().
--- sound/soc/mxs/mxs-saif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/mxs/mxs-saif.c +4 -1
@@ -442,7 +442,10 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,* basic clock which should be fast enough for the internal * logic. */ -clk_enable (saif->clk); + ret =clk_enable (saif->clk); +if (ret) +return ret; + ret =clk_set_rate (saif->clk,24000000 );clk_disable (saif->clk);if (ret)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 66/218 ASoC: atmel_ssc_dai: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit f9e2ca0640e59d19af0ff285ee5591ed39069b09 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error if fals.
--- sound/soc/atmel/atmel_ssc_dai.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/atmel/atmel_ssc_dai.c +4 -1
@@ -296,7 +296,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,/* Enable PMC peripheral clock for this SSC */ pr_debug ("atmel_ssc_dai: Starting clock\n" ); -clk_enable (ssc_p->ssc->clk); + ret =clk_enable (ssc_p->ssc->clk); +if (ret) +return ret; + ssc_p->mck_rate =clk_get_rate (ssc_p->ssc->clk);/* Reset the SSC unless initialized to keep it in a clean state */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 97/218 mfd: mc13xxx: Add check for mc13xxx_irq_request
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e477e51a41cb5d6034f3c5ea85a71ad4613996b9 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value of the mc13xxx_irq_request() and return error if fails.
--- drivers/mfd/mc13xxx-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mfd/mc13xxx-core.c +3 -1
@@ -313,8 +313,10 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode, adc1 |=MC13783_ADC1_ATOX ;dev_dbg (mc13xxx->dev,"%s: request irq\n" , __func__); -mc13xxx_irq_request (mc13xxx,MC13XXX_IRQ_ADCDONE , + ret =mc13xxx_irq_request (mc13xxx,MC13XXX_IRQ_ADCDONE , mc13xxx_handler_adcdone, __func__, &adcdone_data); +if (ret) + goto out;mc13xxx_reg_write (mc13xxx,MC13XXX_ADC0 , adc0);mc13xxx_reg_write (mc13xxx,MC13XXX_ADC1 , adc1);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 91/218 KVM: x86: Fix emulation in writing cr8
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
[ Upstream commit f66af9f222f08d5b11ea41c1bd6c07a0f12daa07 ]
In emulation of writing to cr8, one of the lowest four bits in TPR[3:0] is kept.
According to Intel SDM 10.8.6.1(baremetal scenario):
"APIC.TPR[bits 7:4] = CR8[bits 3:0], APIC.TPR[bits 3:0] = 0";
and SDM 28.3(use TPR shadow):
"MOV to CR8. The instruction stores bits 3:0 of its source operand into bits 7:4 of VTPR; the remainder of VTPR (bits 3:0 and bits 31:8) are cleared.";
and AMD's APM 16.6.4:
"Task Priority Sub-class (TPS)-Bits 3 : 0. The TPS field indicates the current sub-priority to be used when arbitrating lowest-priority messages. This field is written with zero when TPR is written using the architectural CR8 register.";
so in KVM emulated scenario, clear TPR[3:0] to make a consistent behavior as in other scenarios.
This doesn't impact evaluation and delivery of pending virtual interrupts because processor does not use the processor-priority sub-class to determine which interrupts to delivery and which to inhibit.
Sub-class is used by hardware to arbitrate lowest priority interrupts, but KVM just does a round-robin style delivery.
Message-Id: <[email protected]>
--- arch/x86/kvm/lapic.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kvm/lapic.c +1 -4
@@ -1767,10 +1767,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data)void kvm_lapic_set_tpr (struct kvm_vcpu *vcpu,unsigned long cr8) { -struct kvm_lapic *apic = vcpu->arch.apic; - -apic_set_tpr (apic, ((cr8 &0x0f ) <<4 ) - | (kvm_lapic_get_reg (apic,APIC_TASKPRI ) &4 )); +apic_set_tpr (vcpu->arch.apic, (cr8 &0x0f ) <<4 ); }u64 kvm_lapic_get_cr8 (struct kvm_vcpu *vcpu)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 110/218 clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6d6ef58c2470da85a99119f74d34216c8074b9f0 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/clk/tegra/clk-emc.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/tegra/clk-emc.c +1 -0
@@ -190,6 +190,7 @@ static struct tegra_emc *emc_ensure_emc_driver(struct tegra_clk_emc *tegra) tegra->emc =platform_get_drvdata (pdev);if (!tegra->emc) { +put_device (&pdev->dev);pr_err ("%s: cannot find EMC driver\n" , __func__);return NULL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 101/218 i2c: mux: demux-pinctrl: do not deactivate a master that is not active
In reply to Greg Kroah-HartmanFrom: Peter Rosin <[email protected]>
[ Upstream commit 1a22aabf20adf89cb216f566913196128766f25b ]
Attempting to rollback the activation of the current master when the current master has not been activated is bad. priv->cur_chan and priv->cur_adap are both still zeroed out and the rollback may result in attempts to revert an of changeset that has not been applied and do result in calls to both del and put the zeroed out i2c_adapter. Maybe it crashes, or whatever, but it's bad in any case.
--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/i2c/muxes/i2c-demux-pinctrl.c +3 -2
@@ -259,7 +259,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err =device_create_file (&pdev->dev, &dev_attr_available_masters);if (err) - goto err_rollback; + goto err_rollback_activation; err =device_create_file (&pdev->dev, &dev_attr_current_master);if (err)
@@ -269,8 +269,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err_rollback_available:device_remove_file (&pdev->dev, &dev_attr_available_masters); -err_rollback: +err_rollback_activation:i2c_demux_deactivate_master (priv); +err_rollback:for (j =0 ; j < i; j++) {of_node_put (priv->chan[j].parent_np);of_changeset_destroy (&priv->chan[j].chgset);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 107/218 remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 8f90161a66bc3d6b9fe8dde4d9028d20eae1b62a ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/remoteproc/qcom_wcnss.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_wcnss.c +1 -0
@@ -472,6 +472,7 @@ static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss) } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret)return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 109/218 clk: clps711x: Terminate clk_div_table with sentinel element
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 8bed4ed5aa3431085d9d27afc35d684856460eda ]
In order that the end of a clk_div_table can be detected, it must be terminated with a sentinel element (.div = 0).
--- drivers/clk/clk-clps711x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/clk-clps711x.c +2 -0
@@ -32,11 +32,13 @@ static const struct clk_div_table spi_div_table[] = { { .val = 1, .div = 8, }, { .val = 2, .div = 2, }, { .val = 3, .div = 1, }, + {/* sentinel */ } };static const struct clk_div_table timer_div_table[] = { { .val =0 , .div =256 , }, { .val =1 , .div =1 , }, + {/* sentinel */ } }; struct clps711x_clk {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 106/218 clk: qcom: clk-rcg2: Update the frac table for pixel clock
In reply to Greg Kroah-HartmanFrom: Taniya Das <[email protected]>
[ Upstream commit b527358cb4cd58a8279c9062b0786f1fab628fdc ]
Support the new numerator and denominator for pixel clock on SM8350 and support rgb101010, RGB888 use cases on SM8450.
--- drivers/clk/qcom/clk-rcg2.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/clk-rcg2.c +1 -0
@@ -644,6 +644,7 @@ static const struct frac_entry frac_table_pixel[] = { { 2, 9 }, { 4, 9 }, { 1, 1 }, + { 2, 3 }, { } };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 81/218 power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6a4760463dbc6b603690938c468839985189ce0a ]
kobject_init_and_add() takes reference even when it fails. According to the doc of kobject_init_and_add():
If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object.
Fix memory leak by calling kobject_put().
--- drivers/power/supply/ab8500_fg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/supply/ab8500_fg.c +3 -1
@@ -2545,8 +2545,10 @@ static int ab8500_fg_sysfs_init(struct ab8500_fg *di) ret =kobject_init_and_add (&di->fg_kobject, &ab8500_fg_ktype,NULL ,"battery" ); -if (ret <0 ) +if (ret <0 ) { +kobject_put (&di->fg_kobject);dev_err (di->dev,"failed to create sysfs entry\n" ); + }return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 108/218 clk: loongson1: Terminate clk_div_table with sentinel element
In reply to Greg Kroah-HartmanFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 3eb00f89162e80083dfcaa842468b510462cfeaa ]
In order that the end of a clk_div_table can be detected, it must be terminated with a sentinel element (.div = 0).
--- drivers/clk/loongson1/clk-loongson1c.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/loongson1/clk-loongson1c.c +1 -0
@@ -40,6 +40,7 @@ static const struct clk_div_table ahb_div_table[] = { [1] = { .val = 1, .div = 4 }, [2] = { .val = 2, .div = 3 }, [3] = { .val = 3, .div = 3 }, + [4] = { /* sentinel */ } };void __init ls1x_clk_init (void )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 111/218 NFS: remove unneeded check in decode_devicenotify_args()
In reply to Greg Kroah-HartmanFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit cb8fac6d2727f79f211e745b16c9abbf4d8be652 ]
[You don't often get email from [email protected]. Learn why this is important at http://aka.ms/LearnAboutSenderIdentification.]
Overflow check in not needed anymore after we switch to kmalloc_array().
--- fs/nfs/callback_xdr.c | 4 ---- 1 file changed, 4 deletions(-)
fs/nfs/callback_xdr.c +0 -4
@@ -319,10 +319,6 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, n =ntohl (*p++);if (n <=0 ) goto out; -if (n >ULONG_MAX /sizeof (*args->devs)) { - status =htonl (NFS4ERR_BADXDR ); - goto out; - } args->devs =kmalloc_array (n,sizeof (*args->devs),GFP_KERNEL );if (!args->devs) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 99/218 USB: storage: ums-realtek: fix error code in rts51x_read_mem()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b07cabb8361dc692522538205552b1b9dab134be ]
The rts51x_read_mem() function should return negative error codes. Currently if the kmalloc() fails it returns USB_STOR_TRANSPORT_ERROR (3) which is treated as success by the callers.
--- drivers/usb/storage/realtek_cr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/realtek_cr.c +1 -1
@@ -377,7 +377,7 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len) buf =kmalloc (len,GFP_NOIO );if (buf ==NULL ) -return USB_STOR_TRANSPORT_ERROR ; +return -ENOMEM ;usb_stor_dbg (us,"addr = 0x%x, len = %d\n" , addr, len);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 102/218 mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e84ee1a75f944a0fe3c277aaa10c426603d2b0bc ]
Add the missing iounmap() before return from asic3_mfd_probe in the error handling case.
--- drivers/mfd/asic3.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/mfd/asic3.c +7 -3
@@ -915,14 +915,14 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ret =mfd_add_devices (&pdev->dev, pdev->id, &asic3_cell_ds1wm,1 , mem, asic->irq_base,NULL );if (ret <0 ) - goto out; + goto out_unmap; }if (mem_sdio && (irq >=0 )) { ret =mfd_add_devices (&pdev->dev, pdev->id, &asic3_cell_mmc,1 , mem_sdio, irq,NULL );if (ret <0 ) - goto out; + goto out_unmap; } ret =0 ;
@@ -936,8 +936,12 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ret =mfd_add_devices (&pdev->dev,0 , asic3_cell_leds,ASIC3_NUM_LEDS ,NULL ,0 ,NULL ); } +return ret; - out: +out_unmap: +if (asic->tmio_cnf) +iounmap (asic->tmio_cnf); +out:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 104/218 pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 0401f24cd238ae200a23a13925f98de3d2c883b8 ]
When a driver calls pwmchip_add() it has to be prepared to immediately get its callbacks called. So move allocation of driver data and hardware initialization before the call to pwmchip_add().
This fixes a potential NULL pointer exception and a race condition on register writes.
--- drivers/pwm/pwm-lpc18xx-sct.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/pwm/pwm-lpc18xx-sct.c +9 -11
@@ -406,12 +406,6 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev)lpc18xx_pwm_writel (lpc18xx_pwm,LPC18XX_PWM_LIMIT ,BIT (lpc18xx_pwm->period_event)); - ret =pwmchip_add (&lpc18xx_pwm->chip); -if (ret <0 ) { -dev_err (&pdev->dev,"pwmchip_add failed: %d\n" , ret); - goto disable_pwmclk; - } -for (i =0 ; i < lpc18xx_pwm->chip.npwm; i++) {struct lpc18xx_pwm_data *data;
@@ -421,14 +415,12 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev) GFP_KERNEL);if (!data) { ret = -ENOMEM ; - goto remove_pwmchip; + goto disable_pwmclk; }pwm_set_chip_data (pwm, data); } -platform_set_drvdata (pdev, lpc18xx_pwm); - val =lpc18xx_pwm_readl (lpc18xx_pwm,LPC18XX_PWM_CTRL ); val &= ~LPC18XX_PWM_BIDIR ; val &= ~LPC18XX_PWM_CTRL_HALT ;
@@ -436,10 +428,16 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev) val |=LPC18XX_PWM_PRE (0 );lpc18xx_pwm_writel (lpc18xx_pwm,LPC18XX_PWM_CTRL , val); + ret =pwmchip_add (&lpc18xx_pwm->chip); +if (ret <0 ) { +dev_err (&pdev->dev,"pwmchip_add failed: %d\n" , ret); + goto disable_pwmclk; + } + +platform_set_drvdata (pdev, lpc18xx_pwm); +return 0 ; -remove_pwmchip: -pwmchip_remove (&lpc18xx_pwm->chip); disable_pwmclk:clk_disable_unprepare (lpc18xx_pwm->pwm_clk);return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 103/218 mxser: fix xmit_buf leak in activate when LSR == 0xff
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit cd3a4907ee334b40d7aa880c7ab310b154fd5cd4 ]
When LSR is 0xff in ->activate() (rather unlike), we return an error. Provided ->shutdown() is not called when ->activate() fails, nothing actually frees the buffer in this case.
Fix this by properly freeing the buffer in a designated label. We jump there also from the "!info->type" if now too.
--- drivers/tty/mxser.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/tty/mxser.c +11 -4
@@ -860,6 +860,7 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty) struct mxser_port *info = container_of(port, struct mxser_port, port);unsigned long page;unsigned long flags; +int ret; page =__get_free_page (GFP_KERNEL );if (!page)
@@ -869,9 +870,9 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)if (!info->ioaddr || !info->type) {set_bit (TTY_IO_ERROR , &tty->flags); -free_page (page);spin_unlock_irqrestore (&info->slock, flags); -return 0 ; + ret =0 ; + goto err_free_xmit; } info->port.xmit_buf = (unsigned char *) page;
@@ -897,8 +898,10 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)if (capable (CAP_SYS_ADMIN )) {set_bit (TTY_IO_ERROR , &tty->flags);return 0 ; - }else -return -ENODEV ; + } + + ret = -ENODEV ; + goto err_free_xmit; }/*
@@ -943,6 +946,10 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)spin_unlock_irqrestore (&info->slock, flags);return 0 ; +err_free_xmit: +free_page (page); + info->port.xmit_buf =NULL ; +return ret; }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 105/218 iio: adc: Add check for devm_request_threaded_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit b30537a4cedcacf0ade2f33ebb7610178ed1e7d7 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value and return error if fails.
--- drivers/iio/adc/twl6030-gpadc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/adc/twl6030-gpadc.c +2 -0
@@ -927,6 +927,8 @@ static int twl6030_gpadc_probe(struct platform_device *pdev) ret =devm_request_threaded_irq (dev, irq,NULL , twl6030_gpadc_irq_handler,IRQF_ONESHOT ,"twl6030_gpadc" , indio_dev); +if (ret) +return ret; ret =twl6030_gpadc_enable_irq (TWL6030_GPADC_RT_SW1_EOC_MASK );if (ret <0 ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 114/218 pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 89388f8730699c259f8090ec435fb43569efe4ac ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/pinctrl/pinctrl-rockchip.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-rockchip.c +2 -0
@@ -2414,6 +2414,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) node =of_parse_phandle (np,"rockchip,grf" ,0 );if (node) { info->regmap_base =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (info->regmap_base))return PTR_ERR (info->regmap_base); }else {
@@ -2450,6 +2451,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) node =of_parse_phandle (np,"rockchip,pmu" ,0 );if (node) { info->regmap_pmu =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (info->regmap_pmu))return PTR_ERR (info->regmap_pmu); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 113/218 pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c09ac191b1f97cfa06f394dbfd7a5db07986cefc ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function. Calling of_node_put() to avoid the refcount leak.
--- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/nomadik/pinctrl-nomadik.c +3 -1
@@ -1916,8 +1916,10 @@ static int nmk_pinctrl_probe(struct platform_device *pdev) } prcm_np =of_parse_phandle (np,"prcm" ,0 ); -if (prcm_np) +if (prcm_np) { npct->prcm_base =of_iomap (prcm_np,0 ); +of_node_put (prcm_np); + }if (!npct->prcm_base) {if (version ==PINCTRL_NMK_STN8815 ) { dev_info(&pdev->dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 112/218 pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit dab4df9ca919f59e5b9dd84385eaf34d4f20dbb0 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 -0
@@ -1355,6 +1355,7 @@ int mtk_pctrl_init(struct platform_device *pdev, node =of_parse_phandle (np,"mediatek,pctl-regmap" ,0 );if (node) { pctl->regmap1 =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (pctl->regmap1))return PTR_ERR (pctl->regmap1); }else if (regmap) {
@@ -1368,6 +1369,7 @@ int mtk_pctrl_init(struct platform_device *pdev, node =of_parse_phandle (np,"mediatek,pctl-regmap" ,1 );if (node) { pctl->regmap2 =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (pctl->regmap2))return PTR_ERR (pctl->regmap2); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 100/218 af_netlink: Fix shift out of bounds in group mask calculation
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 0caf6d9922192dd1afa8dc2131abfb4df1443b9f ]
When a netlink message is received, netlink_recvmsg() fills in the address of the sender. One of the fields is the 32-bit bitfield nl_groups, which carries the multicast group on which the message was received. The least significant bit corresponds to group 1, and therefore the highest group that the field can represent is 32. Above that, the UB sanitizer flags the out-of-bounds shift attempts.
Which bits end up being set in such case is implementation defined, but it's either going to be a wrong non-zero value, or zero, which is at least not misleading. Make the latter choice deterministic by always setting to 0 for higher-numbered multicast groups.
To get information about membership in groups >= 32, userspace is expected to use nl_pktinfo control messages[0], which are enabled by NETLINK_PKTINFO socket option.
[0] https://lwn.net/Articles/147608/
The way to trigger this issue is e.g. through monitoring the BRVLAN group:
# bridge monitor vlan & # ip link add name br type bridge
Which produces the following citation:
UBSAN: shift-out-of-bounds in net/netlink/af_netlink.c:162:19 shift exponent 32 is too large for 32-bit type 'int'
--- net/netlink/af_netlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/netlink/af_netlink.c +2 -0
@@ -161,6 +161,8 @@ static const struct rhashtable_params netlink_rhashtable_params;static inline u32 netlink_group_mask (u32 group) { +if (group >32 ) +return 0 ;return group ?1 << (group -1 ) :0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 117/218 kgdbts: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 96c9e802c64014a7716865332d732cc9c7f24593 ]
__setup() handlers should return 1 to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings. So return 1 from kgdbts_option_setup().
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd kgdbts=", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc7
kgdboc=kbd
kgdbts=--- drivers/misc/kgdbts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/kgdbts.c +2 -2
@@ -1066,10 +1066,10 @@ static int kgdbts_option_setup(char *opt) {if (strlen (opt) >=MAX_CONFIG_LEN ) {printk (KERN_ERR "kgdbts: config string too long\n" ); -return -ENOSPC ; +return 1 ; }strcpy (config, opt); -return 0 ; +return 1 ; }__setup ("kgdbts=" , kgdbts_option_setup);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 118/218 jfs: fix divide error in dbNextAG
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 2cc7cc01c15f57d056318c33705647f87dcd4aab ]
Syzbot reported divide error in dbNextAG(). The problem was in missing validation check for malicious image.
Syzbot crafted an image with bmp->db_numag equal to 0. There wasn't any validation checks, but dbNextAG() blindly use bmp->db_numag in divide expression
Fix it by validating bmp->db_numag in dbMount() and return an error if image is malicious
--- fs/jfs/jfs_dmap.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/jfs/jfs_dmap.c +7 -0
@@ -161,6 +161,7 @@ static const s8 budtab[256] = {* 0 - success * -ENOMEM - insufficient memory * -EIO - i/o error +* -EINVAL - wrong bmap data */ int dbMount (struct inode *ipbmap) {
@@ -192,6 +193,12 @@ int dbMount(struct inode *ipbmap) bmp->db_nfree =le64_to_cpu (dbmp_le->dn_nfree); bmp->db_l2nbperpage =le32_to_cpu (dbmp_le->dn_l2nbperpage); bmp->db_numag =le32_to_cpu (dbmp_le->dn_numag); +if (!bmp->db_numag) { +release_metapage (mp); +kfree (bmp); +return -EINVAL ; + } + bmp->db_maxlevel =le32_to_cpu (dbmp_le->dn_maxlevel); bmp->db_maxag =le32_to_cpu (dbmp_le->dn_maxag); bmp->db_agpref =le32_to_cpu (dbmp_le->dn_agpref);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 82/218 HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit a5e5e03e94764148a01757b2fa4737d3445c13a6 ]
Internally kernel prepends all report buffers, for both numbered and unnumbered reports, with report ID, therefore to properly handle unnumbered reports we should prepend it ourselves.
For the same reason we should skip the first byte of the buffer when calling i2c_hid_set_or_send_report() which then will take care of properly formatting the transfer buffer based on its separate report ID argument along with report payload.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 32 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +24 -8
@@ -643,6 +643,17 @@ static int i2c_hid_get_raw_report(struct hid_device *hid,if (report_type ==HID_OUTPUT_REPORT )return -EINVAL ; +/* +* In case of unnumbered reports the response from the device will +* not have the report ID that the upper layers expect, so we need +* to stash it the buffer ourselves and adjust the data size. +*/ +if (!report_number) { + buf[0 ] =0 ; + buf++; + count--; + } +/* +2 bytes to include the size of the reply in the query buffer */ ask_count =min (count +2 , (size_t )ihid->bufsize);
@@ -664,6 +675,9 @@ static int i2c_hid_get_raw_report(struct hid_device *hid, count =min (count, ret_count -2 );memcpy (buf, ihid->rawbuf +2 , count); +if (!report_number) + count++; +return count; }
@@ -680,17 +694,19 @@ static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,mutex_lock (&ihid->reset_lock); -if (report_id) { - buf++; - count--; - } - +/* +* Note that both numbered and unnumbered reports passed here +* are supposed to have report ID stored in the 1st byte of the +* buffer, so we strip it off unconditionally before passing payload +* to i2c_hid_set_or_send_report which takes care of encoding +* everything properly. +*/ ret =i2c_hid_set_or_send_report (client, report_type ==HID_FEATURE_REPORT ?0x03 :0x02 , - report_id, buf, count, use_data); + report_id, buf +1 , count -1 , use_data); -if (report_id && ret >=0 ) - ret++;/* add report_id to the number of transfered bytes */ +if (ret >=0 ) + ret++;/* add report_id to the number of transferred bytes */ mutex_unlock (&ihid->reset_lock);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 85/218 scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit cd2268a180117aa8ebb23e090ba204324b2d0e93 ]
The ds_ads_m field of struct ssp_ini_tm_start_req has the type __le32. Assigning a value to it should thus use cpu_to_le32(). This fixes the sparse warning:
warning: incorrect type in assignment (different base types)
expected restricted __le32 [addressable] [assigned] [usertype] ds_ads_m got int
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -4718,7 +4718,7 @@ int pm8001_chip_ssp_tm_req(struct pm8001_hba_info *pm8001_ha,memcpy (sspTMCmd.lun, task->ssp_task.LUN,8 ); sspTMCmd.tag =cpu_to_le32 (ccb->ccb_tag);if (pm8001_ha->chip_id != chip_8001) - sspTMCmd.ds_ads_m =0x08 ; + sspTMCmd.ds_ads_m =cpu_to_le32 (0x08 ); circularQ = &pm8001_ha->inbnd_q_tbl[0 ]; ret =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &sspTMCmd,0 );return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 86/218 scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit bb225b12dbcc82d53d637d10b8d70b64494f8c16 ]
The fields of the set_ctrl_cfg_req structure have the __le32 type, so use cpu_to_le32() to assign them. This removes the sparse warnings:
warning: incorrect type in assignment (different base types)
expected restricted __le32
got unsigned int
--- drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm80xx_hwi.c +5 -3
@@ -870,9 +870,11 @@ pm80xx_set_thermal_config(struct pm8001_hba_info *pm8001_ha)else page_code =THERMAL_PAGE_CODE_8H ; - payload.cfg_pg[0 ] = (THERMAL_LOG_ENABLE <<9 ) | - (THERMAL_ENABLE <<8 ) | page_code; - payload.cfg_pg[1 ] = (LTEMPHIL <<24 ) | (RTEMPHIL <<8 ); + payload.cfg_pg[0 ] = +cpu_to_le32 ((THERMAL_LOG_ENABLE <<9 ) | + (THERMAL_ENABLE <<8 ) | page_code); + payload.cfg_pg[1 ] = +cpu_to_le32 ((LTEMPHIL <<24 ) | (RTEMPHIL <<8 )); rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload,0 );if (rc)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 87/218 scsi: pm8001: Fix abort all task initialization
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 7f12845c8389855dbcc67baa068b6832dc4a396e ]
In pm80xx_send_abort_all(), the n_elem field of the ccb used is not initialized to 0. This missing initialization sometimes lead to the task completion path seeing the ccb with a non-zero n_elem resulting in the execution of invalid dma_unmap_sg() calls in pm8001_ccb_task_free(), causing a crash such as:
[ 197.676341] RIP: 0010:iommu_dma_unmap_sg+0x6d/0x280 [ 197.700204] RSP: 0018:ffff889bbcf89c88 EFLAGS: 00010012 [ 197.705485] RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff83d0bda0 [ 197.712687] RDX: 0000000000000002 RSI: 0000000000000000 RDI: ffff88810dffc0d0 [ 197.719887] RBP: 0000000000000000 R08: 0000000000000000 R09: ffff8881c790098b [ 197.727089] R10: ffffed1038f20131 R11: 0000000000000001 R12: 0000000000000000 [ 197.734296] R13: ffff88810dffc0d0 R14: 0000000000000010 R15: 0000000000000000 [ 197.741493] FS: 0000000000000000(0000) GS:ffff889bbcf80000(0000) knlGS:0000000000000000 [ 197.749659] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 197.755459] CR2: 00007f16c1b42734 CR3: 0000000004814000 CR4: 0000000000350ee0 [ 197.762656] Call Trace: [ 197.765127] <IRQ> [ 197.767162] pm8001_ccb_task_free+0x5f1/0x820 [pm80xx] [ 197.772364] ? do_raw_spin_unlock+0x54/0x220 [ 197.776680] pm8001_mpi_task_abort_resp+0x2ce/0x4f0 [pm80xx] [ 197.782406] process_oq+0xe85/0x7890 [pm80xx] [ 197.786817] ? lock_acquire+0x194/0x490 [ 197.790697] ? handle_irq_event+0x10e/0x1b0 [ 197.794920] ? mpi_sata_completion+0x2d70/0x2d70 [pm80xx] [ 197.800378] ? __wake_up_bit+0x100/0x100 [ 197.804340] ? lock_is_held_type+0x98/0x110 [ 197.808565] pm80xx_chip_isr+0x94/0x130 [pm80xx] [ 197.813243] tasklet_action_common.constprop.0+0x24b/0x2f0 [ 197.818785] __do_softirq+0x1b5/0x82d [ 197.822485] ? do_raw_spin_unlock+0x54/0x220 [ 197.826799] __irq_exit_rcu+0x17e/0x1e0 [ 197.830678] irq_exit_rcu+0xa/0x20 [ 197.834114] common_interrupt+0x78/0x90 [ 197.840051] </IRQ> [ 197.844236] <TASK> [ 197.848397] asm_common_interrupt+0x1e/0x40
Avoid this issue by always initializing the ccb n_elem field to 0 in pm8001_send_abort_all(), pm8001_send_read_log() and pm80xx_send_abort_all().
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 ++ drivers/scsi/pm8001/pm80xx_hwi.c | 1 + 2 files changed, 3 insertions(+)
drivers/scsi/pm8001/pm8001_hwi.c +2 -0
@@ -1748,6 +1748,7 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, ccb->device = pm8001_ha_dev; ccb->ccb_tag = ccb_tag; ccb->task = task; + ccb->n_elem =0 ; circularQ = &pm8001_ha->inbnd_q_tbl[0 ];
@@ -1810,6 +1811,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha, ccb->device = pm8001_ha_dev; ccb->ccb_tag = ccb_tag; ccb->task = task; + ccb->n_elem =0 ; pm8001_ha_dev->id |=NCQ_READ_LOG_FLAG ; pm8001_ha_dev->id |=NCQ_2ND_RLE_FLAG ;
drivers/scsi/pm8001/pm80xx_hwi.c +1 -0
@@ -1426,6 +1426,7 @@ static void pm80xx_send_abort_all(struct pm8001_hba_info *pm8001_ha, ccb->device = pm8001_ha_dev; ccb->ccb_tag = ccb_tag; ccb->task = task; + ccb->n_elem =0 ; circularQ = &pm8001_ha->inbnd_q_tbl[0 ];
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 119/218 netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit f2dd495a8d589371289981d5ed33e6873df94ecc ]
Do not reset IP_CT_TCP_FLAG_BE_LIBERAL flag in out-of-sync scenarios coming before the TCP window tracking, otherwise such connections will fail in the window check.
Update tcp_options() to leave this flag in place and add a new helper function to reset the tcp window state.
Based on patch from Sven Auhagen.
--- net/netfilter/nf_conntrack_proto_tcp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
net/netfilter/nf_conntrack_proto_tcp.c +13 -4
@@ -390,8 +390,8 @@ static void tcp_options(const struct sk_buff *skb, length, buff);BUG_ON (ptr ==NULL ); - state->td_scale = - state->flags =0 ; + state->td_scale =0 ; + state->flags &=IP_CT_TCP_FLAG_BE_LIBERAL ;while (length >0 ) {int opcode=*ptr++;
@@ -806,6 +806,16 @@ static unsigned int *tcp_get_timeouts(struct net *net)return tcp_pernet (net)->timeouts; } +static void nf_ct_tcp_state_reset (struct ip_ct_tcp_state *state) +{ + state->td_end =0 ; + state->td_maxend =0 ; + state->td_maxwin =0 ; + state->td_maxack =0 ; + state->td_scale =0 ; + state->flags &=IP_CT_TCP_FLAG_BE_LIBERAL ; +} +/* Returns verdict for packet, or -1 for invalid. */ static int tcp_packet(struct nf_conn *ct, const struct sk_buff *skb,
@@ -907,8 +917,7 @@ static int tcp_packet(struct nf_conn *ct, ct->proto.tcp.last_flags &= ~IP_CT_EXP_CHALLENGE_ACK ; ct->proto.tcp.seen[ct->proto.tcp.last_dir].flags = ct->proto.tcp.last_flags; -memset (&ct->proto.tcp.seen[dir],0 , -sizeof (struct ip_ct_tcp_state )); +nf_ct_tcp_state_reset (&ct->proto.tcp.seen[dir]);break ; } ct->proto.tcp.last_index = index;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 120/218 net: phy: broadcom: Fix brcm_fet_config_init()
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit bf8bfc4336f7a34e48b3bbd19b1542bf085bdc3d ]
A Broadcom AC201 PHY (same entry as 5241) would be flagged by the Broadcom UniMAC MDIO controller as not completing the turn around properly since the PHY expects 65 MDC clock cycles to complete a write cycle, and the MDIO controller was only sending 64 MDC clock cycles as determined by looking at a scope shot.
This would make the subsequent read fail with the UniMAC MDIO controller command field having MDIO_READ_FAIL set and we would abort the brcm_fet_config_init() function and thus not probe the PHY at all.
After issuing a software reset, wait for at least 1ms which is well above the 1us reset delay advertised by the datasheet and issue a dummy read to let the PHY turn around the line properly. This read specifically ignores -EIO which would be returned by MDIO controllers checking for the line being turned around.
If we have a genuine reaad failure, the next read of the interrupt status register would pick it up anyway.
--- drivers/net/phy/broadcom.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/net/phy/broadcom.c +21 -0
@@ -15,6 +15,7 @@*/ #include "bcm-phy-lib.h" +#include <linux/delay.h> #include <linux/module.h> #include <linux/phy.h> #include <linux/brcmphy.h>
@@ -357,6 +358,26 @@ static int brcm_fet_config_init(struct phy_device *phydev)if (err <0 )return err; +/* The datasheet indicates the PHY needs up to 1us to complete a reset, +* build some slack here. +*/ +usleep_range (1000 ,2000 ); + +/* The PHY requires 65 MDC clock cycles to complete a write operation +* and turnaround the line properly. +* +* We ignore -EIO here as the MDIO controller (e.g.: mdio-bcm-unimac) +* may flag the lack of turn-around as a read failure. This is +* particularly true with this combination since the MDIO controller +* only used 64 MDC cycles. This is not a critical failure in this +* specific case and it has no functional impact otherwise, so we let +* that one go through. If there is a genuine bus error, the next read +* of MII_BRCM_FET_INTREG will error out. +*/ + err =phy_read (phydev,MII_BMCR ); +if (err <0 && err != -EIO ) +return err; + reg =phy_read (phydev,MII_BRCM_FET_INTREG );if (reg <0 )return reg;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 84/218 scsi: pm8001: Fix command initialization in pm80XX_send_read_log()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 1a37b6738b58d86f6b144b3fc754ace0f2e0166d ]
Since the sata_cmd struct is zeroed out before its fields are initialized, there is no need for using "|=" to initialize the ncqtag_atap_dir_m field. Using a standard assignment removes the sparse warning:
warning: invalid assignment: |=
Also, since the ncqtag_atap_dir_m field has type __le32, use cpu_to_le32() to generate the assigned value.
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -1826,7 +1826,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha, sata_cmd.tag =cpu_to_le32 (ccb_tag); sata_cmd.device_id =cpu_to_le32 (pm8001_ha_dev->device_id); - sata_cmd.ncqtag_atap_dir_m |= ((0x1 <<7 ) | (0x5 <<9 )); + sata_cmd.ncqtag_atap_dir_m =cpu_to_le32 ((0x1 <<7 ) | (0x5 <<9 ));memcpy (&sata_cmd.sata_fis, &fis,sizeof (struct host_to_dev_fis )); res =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &sata_cmd,0 );
drivers/scsi/pm8001/pm80xx_hwi.c +1 -1
@@ -1504,7 +1504,7 @@ static void pm80xx_send_read_log(struct pm8001_hba_info *pm8001_ha, sata_cmd.tag =cpu_to_le32 (ccb_tag); sata_cmd.device_id =cpu_to_le32 (pm8001_ha_dev->device_id); - sata_cmd.ncqtag_atap_dir_m_dad |= ((0x1 <<7 ) | (0x5 <<9 )); + sata_cmd.ncqtag_atap_dir_m_dad =cpu_to_le32 (((0x1 <<7 ) | (0x5 <<9 )));memcpy (&sata_cmd.sata_fis, &fis,sizeof (struct host_to_dev_fis )); res =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &sata_cmd,0 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 83/218 iwlwifi: Fix -EIO error code that is never returned
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit c305c94bdc18e45b5ad1db54da4269f8cbfdff6b ]
Currently the error -EIO is being assinged to variable ret when the READY_BIT is not set but the function iwlagn_mac_start returns 0 rather than ret. Fix this by returning ret instead of 0.
Addresses-Coverity: ("Unused value")
--- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +1 -1
@@ -315,7 +315,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 121/218 qlcnic: dcb: default to returning -EOPNOTSUPP
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 1521db37f0d42334a88e8ff28198a27d1ed5cd7b ]
Clang static analysis reports this issue
qlcnic_dcb.c:382:10: warning: Assigned value is
garbage or undefined
mbx_out = *val;
^ ~~~~val is set in the qlcnic_dcb_query_hw_capability() wrapper. If there is no query_hw_capability op in dcp, success is returned without setting the val.
For this and similar wrappers, return -EOPNOTSUPP.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h +5 -5
@@ -52,7 +52,7 @@ static inline int qlcnic_dcb_get_hw_capability(struct qlcnic_dcb *dcb)if (dcb && dcb->ops->get_hw_capability)return dcb->ops->get_hw_capability (dcb); -return 0 ; +return -EOPNOTSUPP ; }static inline void qlcnic_dcb_free (struct qlcnic_dcb *dcb)
@@ -66,7 +66,7 @@ static inline int qlcnic_dcb_attach(struct qlcnic_dcb *dcb)if (dcb && dcb->ops->attach)return dcb->ops->attach (dcb); -return 0 ; +return -EOPNOTSUPP ; } static inline int
@@ -75,7 +75,7 @@ qlcnic_dcb_query_hw_capability(struct qlcnic_dcb *dcb, char *buf)if (dcb && dcb->ops->query_hw_capability)return dcb->ops->query_hw_capability (dcb, buf); -return 0 ; +return -EOPNOTSUPP ; }static inline void qlcnic_dcb_get_info (struct qlcnic_dcb *dcb)
@@ -90,7 +90,7 @@ qlcnic_dcb_query_cee_param(struct qlcnic_dcb *dcb, char *buf, u8 type)if (dcb && dcb->ops->query_cee_param)return dcb->ops->query_cee_param (dcb, buf, type); -return 0 ; +return -EOPNOTSUPP ; }static inline int qlcnic_dcb_get_cee_cfg (struct qlcnic_dcb *dcb)
@@ -98,7 +98,7 @@ static inline int qlcnic_dcb_get_cee_cfg(struct qlcnic_dcb *dcb)if (dcb && dcb->ops->get_cee_cfg)return dcb->ops->get_cee_cfg (dcb); -return 0 ; +return -EOPNOTSUPP ; }static inline void qlcnic_dcb_aen_handler (struct qlcnic_dcb *dcb,void *msg)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 137/218 ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
[ Upstream commit 6f7e221e7a5cfc3299616543fce42b36e631497b ]
IRQ types blindly copied from very similar APQ8064.
Fixes warnings as:
WARNING: CPU: 0 PID: 1 at drivers/irqchip/irq-gic.c:1080 gic_irq_domain_translate+0x118/0x120
...
--- arch/arm/boot/dts/qcom-msm8960.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/qcom-msm8960.dtsi +5 -3
@@ -139,7 +139,9 @@ reg = <0x108000 0x1000>; qcom,ipc = <&l2cc 0x8 2>; - interrupts = <0 19 0>, <0 21 0>, <0 22 0>; + interrupts = <GIC_SPI 19 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ack", "err", "wakeup"; regulators {
@@ -185,7 +187,7 @@ compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; - interrupts = <0 154 0x0>; + interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; status = "disabled";
@@ -311,7 +313,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x16080000 0x1000>; - interrupts = <0 147 0>; + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; spi-max-frequency = <24000000>; cs-gpios = <&msmgpio 8 0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 138/218 ARM: dts: bcm2837: Add the missing L1/L2 cache information
In reply to Greg Kroah-HartmanFrom: Richard Schleich <[email protected]>
[ Upstream commit bdf8762da268d2a34abf517c36528413906e9cd5 ]
This patch fixes the kernel warning "cacheinfo: Unable to detect cache hierarchy for CPU 0" for the bcm2837 on newer kernel versions.
--- arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+)
arch/arm64/boot/dts/broadcom/bcm2837.dtsi +49 -0
@@ -31,12 +31,26 @@ #address-cells = <1>; #size-cells = <0>; + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/ddi0500/e/level-1-memory-system + * /about-the-l1-memory-system?lang=en + * + * Source for d/i-cache-size + * https://magpi.raspberrypi.com/articles/raspberry-pi-3-specs-benchmarks + */ cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a53"; reg = <0>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000d8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu1: cpu@1 {
@@ -45,6 +59,13 @@ reg = <1>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu2: cpu@2 {
@@ -53,6 +74,13 @@ reg = <2>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu3: cpu@3 {
@@ -61,6 +89,27 @@ reg = <3>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000f0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; + }; + + /* Source for cache-line-size + cache-sets + * https://developer.arm.com/documentation/ddi0500 + * /e/level-2-memory-system/about-the-l2-memory-system?lang=en + * Source for cache-size + * https://datasheets.raspberrypi.com/cm/cm1-and-cm3-datasheet.pdf + */ + l2: l2-cache0 { + compatible = "cache"; + cache-size = <0x80000>; + cache-line-size = <64>; + cache-sets = <512>; // 512KiB(size)/64(line-size)=8192ways/16-way set + cache-level = <2>; }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 78/218 drm/edid: Dont clear formats if using deep color
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 75478b3b393bcbdca4e6da76fe3a9f1a4133ec5d ]
The current code, when parsing the EDID Deep Color depths, that the YUV422 cannot be used, referring to the HDMI 1.3 Specification.
This specification, in its section 6.2.4, indeed states:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is not permitted for any Deep Color mode.
This indeed can be interpreted like the code does, but the HDMI 1.4 specification further clarifies that statement in its section 6.2.4:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is also 36-bit mode but does not require the further use of the Deep Color modes described in section 6.5.2 and 6.5.3.
This means that, even though YUV422 can be used with 12 bit per color, it shouldn't be treated as a deep color mode.
This is also broken with YUV444 if it's supported by the display, but DRM_EDID_HDMI_DC_Y444 isn't set. In such a case, the code will clear color_formats of the YUV444 support set previously in drm_parse_cea_ext(), but will not set it back.
Since the formats supported are already setup properly in drm_parse_cea_ext(), let's just remove the code modifying the formats in drm_parse_hdmi_deep_color_info()
--- drivers/gpu/drm/drm_edid.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -8
@@ -3791,16 +3791,8 @@ static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector, connector->name, dc_bpc); info->bpc = dc_bpc; -/* -* Deep color support mandates RGB444 support for all video -* modes and forbids YCRCB422 support for all video modes per -* HDMI 1.3 spec. -*/ - info->color_formats =DRM_COLOR_FORMAT_RGB444 ; -/* YCRCB444 is optional according to spec. */ if (hdmi[6 ] &DRM_EDID_HDMI_DC_Y444 ) { - info->color_formats |=DRM_COLOR_FORMAT_YCRCB444 ;DRM_DEBUG ("%s: HDMI sink does YCRCB444 in deep color.\n" , connector->name); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 141/218 ASoC: soc-core: skip zero num_dai component in searching dai name
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea ]
In the case like dmaengine which's not a dai but as a component, the num_dai is zero, dmaengine component has the same component_of_node as cpu dai, when cpu dai component is not ready, but dmaengine component is ready, try to get cpu dai name, the snd_soc_get_dai_name() return -EINVAL, not -EPROBE_DEFER, that cause below error:
asoc-simple-card <card name>: parse error -22
asoc-simple-card: probe of <card name> failed with error -22
The sound card failed to probe.
So this patch fixes the issue above by skipping the zero num_dai component in searching dai name.
--- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-core.c +1 -1
@@ -3799,7 +3799,7 @@ static int snd_soc_get_dai_name(struct of_phandle_args *args,if (!component_of_node && pos->dev->parent) component_of_node = pos->dev->parent->of_node; -if (component_of_node != args->np) +if (component_of_node != args->np || !pos->num_dai)continue ;if (pos->driver->of_xlate_dai_name) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 139/218 video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
In reply to Greg Kroah-HartmanFrom: Jing Yao <[email protected]>
[ Upstream commit f63658a59c3d439c8ad7b290f8ec270980e0f384 ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c +4 -4
@@ -413,7 +413,7 @@ static ssize_t dsicm_num_errors_show(struct device *dev,if (r)return r; -return snprintf (buf,PAGE_SIZE ,"%d\n" , errors); +return sysfs_emit (buf,"%d\n" , errors); } static ssize_t dsicm_hw_revision_show(struct device *dev,
@@ -444,7 +444,7 @@ static ssize_t dsicm_hw_revision_show(struct device *dev,if (r)return r; -return snprintf (buf,PAGE_SIZE ,"%02x.%02x.%02x\n" , id1, id2, id3); +return sysfs_emit (buf,"%02x.%02x.%02x\n" , id1, id2, id3); } static ssize_t dsicm_store_ulps(struct device *dev,
@@ -494,7 +494,7 @@ static ssize_t dsicm_show_ulps(struct device *dev, t = ddata->ulps_enabled;mutex_unlock (&ddata->lock); -return snprintf (buf,PAGE_SIZE ,"%u\n" , t); +return sysfs_emit (buf,"%u\n" , t); } static ssize_t dsicm_store_ulps_timeout(struct device *dev,
@@ -541,7 +541,7 @@ static ssize_t dsicm_show_ulps_timeout(struct device *dev, t = ddata->ulps_timeout;mutex_unlock (&ddata->lock); -return snprintf (buf,PAGE_SIZE ,"%u\n" , t); +return sysfs_emit (buf,"%u\n" , t); } static DEVICE_ATTR(num_dsi_errors, S_IRUGO, dsicm_num_errors_show, NULL);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 123/218 selinux: use correct type for context length
In reply to Greg Kroah-HartmanFrom: Christian Göttsche <[email protected]>
[ Upstream commit b97df7c098c531010e445da88d02b7bf7bf59ef6 ]
security_sid_to_context() expects a pointer to an u32 as the address where to store the length of the computed context.
Reported by sparse:
security/selinux/xfrm.c:359:39: warning: incorrect type in arg 4
(different signedness)
security/selinux/xfrm.c:359:39: expected unsigned int
[usertype] *scontext_len
security/selinux/xfrm.c:359:39: got int *
--- security/selinux/xfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/xfrm.c +1 -1
@@ -344,7 +344,7 @@ int selinux_xfrm_state_alloc_acquire(struct xfrm_state *x,int rc;struct xfrm_sec_ctx *ctx;char *ctx_str =NULL ; -int str_len; +u32 str_len;if (!polsec)return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 132/218 ntfs: add sanity check on allocation size
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 714fbf2647b1a33d914edd695d4da92029c7e7c0 ]
ntfs_read_inode_mount invokes ntfs_malloc_nofs with zero allocation size. It triggers one BUG in the __ntfs_malloc function.
Fix this by adding sanity check on ni->attr_list_size.
--- fs/ntfs/inode.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ntfs/inode.c +4 -0
@@ -1915,6 +1915,10 @@ int ntfs_read_inode_mount(struct inode *vi) }/* Now allocate memory for the attribute list. */ ni->attr_list_size = (u32 )ntfs_attr_size (a); +if (!ni->attr_list_size) { +ntfs_error (sb,"Attr_list_size is zero" ); + goto put_err_out; + } ni->attr_list =ntfs_malloc_nofs (ni->attr_list_size);if (!ni->attr_list) { ntfs_error(sb, "Not enough memory to allocate buffer "
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 124/218 loop: use sysfs_emit() in the sysfs xxx show()
In reply to Greg Kroah-HartmanFrom: Chaitanya Kulkarni <[email protected]>
[ Upstream commit b27824d31f09ea7b4a6ba2c1b18bd328df3e8bed ]
sprintf does not know the PAGE_SIZE maximum of the temporary buffer used for outputting sysfs content and it's possible to overrun the PAGE_SIZE buffer length.
Use a generic sysfs_emit function that knows the size of the temporary buffer and ensures that no overrun is done for offset attribute in loop_attr_[offset|sizelimit|autoclear|partscan|dio]_show() callbacks.
--- drivers/block/loop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/block/loop.c +5 -5
@@ -773,33 +773,33 @@ static ssize_t loop_attr_backing_file_show(struct loop_device *lo, char *buf)static ssize_t loop_attr_offset_show (struct loop_device *lo,char *buf) { -return sprintf (buf,"%llu\n" , (unsigned long long )lo->lo_offset); +return sysfs_emit (buf,"%llu\n" , (unsigned long long )lo->lo_offset); }static ssize_t loop_attr_sizelimit_show (struct loop_device *lo,char *buf) { -return sprintf (buf,"%llu\n" , (unsigned long long )lo->lo_sizelimit); +return sysfs_emit (buf,"%llu\n" , (unsigned long long )lo->lo_sizelimit); }static ssize_t loop_attr_autoclear_show (struct loop_device *lo,char *buf) {int autoclear = (lo->lo_flags &LO_FLAGS_AUTOCLEAR ); -return sprintf (buf,"%s\n" , autoclear ?"1" :"0" ); +return sysfs_emit (buf,"%s\n" , autoclear ?"1" :"0" ); }static ssize_t loop_attr_partscan_show (struct loop_device *lo,char *buf) {int partscan = (lo->lo_flags &LO_FLAGS_PARTSCAN ); -return sprintf (buf,"%s\n" , partscan ?"1" :"0" ); +return sysfs_emit (buf,"%s\n" , partscan ?"1" :"0" ); }static ssize_t loop_attr_dio_show (struct loop_device *lo,char *buf) {int dio = (lo->lo_flags &LO_FLAGS_DIRECT_IO ); -return sprintf (buf,"%s\n" , dio ?"1" :"0" ); +return sysfs_emit (buf,"%s\n" , dio ?"1" :"0" ); }LOOP_ATTR_RO (backing_file);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 140/218 video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
In reply to Greg Kroah-HartmanFrom: Jing Yao <[email protected]>
[ Upstream commit c07a039cbb96748f54c02995bae8131cc9a73b0a ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- .../video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c +2 -2
@@ -173,7 +173,7 @@ static ssize_t tpo_td043_vmirror_show(struct device *dev, {struct panel_drv_data *ddata =dev_get_drvdata (dev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ddata->vmirror); +return sysfs_emit (buf,"%d\n" , ddata->vmirror); } static ssize_t tpo_td043_vmirror_store(struct device *dev,
@@ -203,7 +203,7 @@ static ssize_t tpo_td043_mode_show(struct device *dev, {struct panel_drv_data *ddata =dev_get_drvdata (dev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ddata->mode); +return sysfs_emit (buf,"%d\n" , ddata->mode); } static ssize_t tpo_td043_mode_store(struct device *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 134/218 video: fbdev: w100fb: Reset global state
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 8738ddcac644964ae128ccd3d80d48773c8d528e ]
w100fb_probe() did not reset the global state to its initial state. This can result in invocation of iounmap() even when there was not the appropriate successful call of ioremap(). For instance, this may be the case if first probe fails after two successful ioremap() while second probe fails when first ioremap() fails. The similar issue is with w100fb_remove(). The patch fixes both bugs.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/video/fbdev/w100fb.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/video/fbdev/w100fb.c +12 -3
@@ -772,12 +772,18 @@ int w100fb_probe(struct platform_device *pdev)fb_dealloc_cmap (&info->cmap);kfree (info->pseudo_palette); } -if (remapped_fbuf !=NULL ) +if (remapped_fbuf !=NULL ) {iounmap (remapped_fbuf); -if (remapped_regs !=NULL ) + remapped_fbuf =NULL ; + } +if (remapped_regs !=NULL ) {iounmap (remapped_regs); -if (remapped_base !=NULL ) + remapped_regs =NULL ; + } +if (remapped_base !=NULL ) {iounmap (remapped_base); + remapped_base =NULL ; + }if (info)framebuffer_release (info);return err;
@@ -802,8 +808,11 @@ static int w100fb_remove(struct platform_device *pdev)fb_dealloc_cmap (&info->cmap);iounmap (remapped_base); + remapped_base =NULL ;iounmap (remapped_regs); + remapped_regs =NULL ;iounmap (remapped_fbuf); + remapped_fbuf =NULL ;framebuffer_release (info);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 136/218 video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
In reply to Greg Kroah-HartmanFrom: Yang Guang <[email protected]>
[ Upstream commit 24565bc4115961db7ee64fcc7ad2a7437c0d0a49 ]
coccinelle report:./drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c:
479:9-17: WARNING: use scnprintf or sprintf
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
--- .../video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c +1 -1
@@ -487,7 +487,7 @@ static ssize_t show_cabc_available_modes(struct device *dev,int i;if (!ddata->has_cabc) -return snprintf (buf,PAGE_SIZE ,"%s\n" , cabc_modes[0 ]); +return sysfs_emit (buf,"%s\n" , cabc_modes[0 ]);for (i =0 , len =0 ; len <PAGE_SIZE && i <ARRAY_SIZE (cabc_modes); i++)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 146/218 media: hdpvr: initialize dev->worker at hdpvr_register_videodev
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 07922937e9a580825f9965c46fd15e23ba5754b6 ]
hdpvr_register_videodev is responsible to initialize a worker in hdpvr_device. However, the worker is only initialized at hdpvr_start_streaming other than hdpvr_register_videodev. When hdpvr_probe does not initialize its worker, the hdpvr_disconnect will encounter one WARN in flush_work.The stack trace is as follows:
hdpvr_disconnect+0xb8/0xf2 drivers/media/usb/hdpvr/hdpvr-core.c:425 usb_unbind_interface+0xbf/0x3a0 drivers/usb/core/driver.c:458 __device_release_driver drivers/base/dd.c:1206 [inline] device_release_driver_internal+0x22a/0x230 drivers/base/dd.c:1237 bus_remove_device+0x108/0x160 drivers/base/bus.c:529 device_del+0x1fe/0x510 drivers/base/core.c:3592 usb_disable_device+0xd1/0x1d0 drivers/usb/core/message.c:1419 usb_disconnect+0x109/0x330 drivers/usb/core/hub.c:2228
Fix this by moving the initialization of dev->worker to the starting of hdpvr_register_videodev
--- drivers/media/usb/hdpvr/hdpvr-video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/usb/hdpvr/hdpvr-video.c +3 -1
@@ -312,7 +312,6 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev) dev->status =STATUS_STREAMING ; -INIT_WORK (&dev->worker, hdpvr_transmit_buffers);schedule_work (&dev->worker); v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
@@ -1156,6 +1155,9 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,bool ac3 = dev->flags &HDPVR_FLAG_AC3_CAP ;int res; +// initialize dev->worker +INIT_WORK (&dev->worker, hdpvr_transmit_buffers); + dev->cur_std =V4L2_STD_525_60 ; dev->width =720 ; dev->height =480 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 145/218 video: fbdev: sm712fb: Fix crash in smtcfb_write()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 4f01d09b2bbfbcb47b3eb305560a7f4857a32260 ]
When the sm712fb driver writes three bytes to the framebuffer, the driver will crash:
BUG: unable to handle page fault for address: ffffc90001ffffff
RIP: 0010:smtcfb_write+0x454/0x5b0
Call Trace:
vfs_write+0x291/0xd60
? do_sys_openat2+0x27d/0x350
? __fget_light+0x54/0x340
ksys_write+0xce/0x190
do_syscall_64+0x43/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xaeFix it by removing the open-coded endianness fixup-code.
--- drivers/video/fbdev/sm712fb.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/video/fbdev/sm712fb.c +4 -17
@@ -1118,7 +1118,7 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf, count = total_size - p; } - buffer =kmalloc ((count >PAGE_SIZE ) ?PAGE_SIZE : count,GFP_KERNEL ); + buffer =kmalloc (PAGE_SIZE ,GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -1136,24 +1136,11 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf,break ; } -for (i = c >>2 ; i--;) { -fb_writel (big_swap (*src), dst++); +for (i = (c +3 ) >>2 ; i--;) { +fb_writel (big_swap (*src), dst); + dst++; src++; } -if (c &3 ) { -u8 *src8 = (u8 *)src; -u8 __iomem *dst8 = (u8 __iomem *)dst; - -for (i = c &3 ; i--;) { -if (i &1 ) { -fb_writeb (*src8++, ++dst8); - }else { -fb_writeb (*src8++, --dst8); - dst8 +=2 ; - } - } - dst = (u32 __iomem *)dst8; - } *ppos += c; buf += c;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 135/218 video: fbdev: cirrusfb: check pixclock to avoid divide by zero
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
[ Upstream commit 5c6f402bdcf9e7239c6bc7087eda71ac99b31379 ]
Do a sanity check on pixclock value to avoid divide by zero.
If the pixclock value is zero, the cirrusfb driver will round up pixclock to get the derived frequency as close to maxclock as possible.
Syzkaller reported a divide error in cirrusfb_check_pixclock.
divide error: 0000 [#1] SMP KASAN PTI
CPU: 0 PID: 14938 Comm: cirrusfb_test Not tainted 5.15.0-rc6 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2 RIP: 0010:cirrusfb_check_var+0x6f1/0x1260 Call Trace: fb_set_var+0x398/0xf90 do_fb_ioctl+0x4b8/0x6f0 fb_ioctl+0xeb/0x130 __x64_sys_ioctl+0x19d/0x220 do_syscall_64+0x3a/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- drivers/video/fbdev/cirrusfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/video/fbdev/cirrusfb.c +8 -8
@@ -470,7 +470,7 @@ static int cirrusfb_check_mclk(struct fb_info *info, long freq)return 0 ; } -static int cirrusfb_check_pixclock (const struct fb_var_screeninfo *var, +static int cirrusfb_check_pixclock (struct fb_var_screeninfo *var,struct fb_info *info) {long freq;
@@ -479,9 +479,7 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,unsigned maxclockidx = var->bits_per_pixel >>3 ;/* convert from ps to kHz */ - freq =PICOS2KHZ (var->pixclock); - -dev_dbg (info->device,"desired pixclock: %ld kHz\n" , freq); + freq =PICOS2KHZ (var->pixclock ? :1 ); maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx]; cinfo->multiplexing =0 ;
@@ -489,11 +487,13 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,/* If the frequency is greater than we can support, we might be able * to use multiplexing for the video mode */ if (freq > maxclock) { -dev_err (info->device, -"Frequency greater than maxclock (%ld kHz)\n" , - maxclock); -return -EINVAL ; + var->pixclock =KHZ2PICOS (maxclock); + +while ((freq =PICOS2KHZ (var->pixclock)) > maxclock) + var->pixclock++; } +dev_dbg (info->device,"desired pixclock: %ld kHz\n" , freq); +/* * Additional constraint: 8bpp uses DAC clock doubling to allow maximum * pixel clock
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 142/218 media: cx88-mpeg: clear interrupt status register before streaming video
In reply to Greg Kroah-HartmanFrom: Daniel González Cabanelas <[email protected]>
[ Upstream commit 56cb61f70e547e1b0cdfe6ff5a1f1ce6242e6d96 ]
Some cx88 video cards may have transport stream status interrupts set to 1 from cold start, causing errors like this:
cx88xx: cx88_print_irqbits: core:irq mpeg [0x100000] ts_err?*
cx8802: cx8802_mpeg_irq: mpeg:general errors: 0x00100000
According to CX2388x datasheet, the interrupt status register should be cleared before enabling IRQs to stream video.
Fix it by clearing the Transport Stream Interrupt Status register.
--- drivers/media/pci/cx88/cx88-mpeg.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/cx88/cx88-mpeg.c +3 -0
@@ -175,6 +175,9 @@ int cx8802_start_dma(struct cx8802_dev *dev,cx_write (MO_TS_GPCNTRL ,GP_COUNT_CONTROL_RESET ); q->count =0 ; +/* clear interrupt status register */ +cx_write (MO_TS_INTSTAT ,0x1f1111 ); +/* enable irqs */ dprintk (1 ,"setting the interrupt mask\n" );cx_set (MO_PCI_INTMSK , core->pci_irqmask |PCI_INT_TSINT );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 152/218 gfs2: Make sure FITRIM minlen is rounded up to fs block size
In reply to Greg Kroah-HartmanFrom: Andrew Price <[email protected]>
commit 27ca8273fda398638ca994a207323a85b6d81190 upstream.
Per fstrim(8) we must round up the minlen argument to the fs block size. The current calculation doesn't take into account devices that have a discard granularity and requested minlen less than 1 fs block, so the value can get shifted away to zero in the translation to fs blocks.
The zero minlen passed to gfs2_rgrp_send_discards() then allows sb_issue_discard() to be called with nr_sects == 0 which returns -EINVAL and results in gfs2_rgrp_send_discards() returning -EIO.
Make sure minlen is never < 1 fs block by taking the max of the requested minlen and the fs block size before comparing to the device's discard granularity and shifting to fs blocks.
--- fs/gfs2/rgrp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/gfs2/rgrp.c +2 -1
@@ -1390,7 +1390,8 @@ int gfs2_fitrim(struct file *filp, void start = r.start >> bs_shift; end = start + (r.len >> bs_shift); - minlen =max_t (u64, r.minlen, + minlen =max_t (u64, r.minlen, sdp->sd_sb.sb_bsize); + minlen =max_t (u64, minlen, q->limits.discard_granularity) >> bs_shift;if (end <= start || minlen > sdp->sd_max_rg_data)
Greg Kroah-Hartman
maintainerPATCH 125/218 Fix incorrect type in assignment of ipv6 port for audit
In reply to Greg Kroah-HartmanFrom: Casey Schaufler <[email protected]>
[ Upstream commit a5cd1ab7ab679d252a6d2f483eee7d45ebf2040c ]
Remove inappropriate use of ntohs() and assign the port value directly.
--- security/smack/smack_lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/smack/smack_lsm.c +1 -1
@@ -2567,7 +2567,7 @@ static int smk_ipv6_check(struct smack_known *subject,#ifdef CONFIG_AUDIT smk_ad_init_net (&ad, __func__,LSM_AUDIT_DATA_NET , &net); ad.a.u.net->family =PF_INET6 ; - ad.a.u.net->dport =ntohs (address->sin6_port); + ad.a.u.net->dport = address->sin6_port;if (act ==SMK_RECEIVING ) ad.a.u.net->v6info.saddr = address->sin6_addr;else
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 150/218 ubifs: Add missing iput if do_tmpfile() failed in rename whiteout
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit 716b4573026bcbfa7b58ed19fe15554bac66b082 upstream.
whiteout inode should be put when do_tmpfile() failed if inode has been initialized. Otherwise we will get following warning during umount:
UBIFS error (ubi0:0 pid 1494): ubifs_assert_failed [ubifs]: UBIFS assert failed: c->bi.dd_growth == 0, in fs/ubifs/super.c:1930
VFS: Busy inodes after unmount of ubifs. Self-destruct in 5 seconds.
--- fs/ubifs/dir.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ubifs/dir.c +2 -0
@@ -376,6 +376,8 @@ out_inode:make_bad_inode (inode);if (!instantiated)iput (inode); +else if (whiteout) +iput (*whiteout); out_budg:ubifs_release_budget (c, &req);if (!instantiated)
Greg Kroah-Hartman
maintainerPATCH 157/218 ubi: fastmap: Return error code if memory allocation fails in add_aeb()
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit c3c07fc25f37c157fde041b3a0c3dfcb1590cbce upstream.
Abort fastmap scanning and return error code if memory allocation fails in add_aeb(). Otherwise ubi will get wrong peb statistics information after scanning.
--- drivers/mtd/ubi/fastmap.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/mtd/ubi/fastmap.c +19 -9
@@ -478,7 +478,9 @@ static int scan_pool(struct ubi_device *if (err ==UBI_IO_FF_BITFLIPS ) scrub =1 ; -add_aeb (ai, free, pnum, ec, scrub); + ret =add_aeb (ai, free, pnum, ec, scrub); +if (ret) + goto out;continue ; }else if (err ==0 || err ==UBI_IO_BITFLIPS ) {dbg_bld ("Found non empty PEB:%i in pool" , pnum);
@@ -648,8 +650,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &ai->free,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),0 ); + ret =add_aeb (ai, &ai->free,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),0 ); +if (ret) + goto fail; }/* read EC values from used list */
@@ -659,8 +663,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &used,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),0 ); + ret =add_aeb (ai, &used,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),0 ); +if (ret) + goto fail; }/* read EC values from scrub list */
@@ -670,8 +676,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &used,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),1 ); + ret =add_aeb (ai, &used,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),1 ); +if (ret) + goto fail; }/* read EC values from erase list */
@@ -681,8 +689,10 @@ static int ubi_attach_fastmap(struct ubiif (fm_pos >= fm_size) goto fail_bad; -add_aeb (ai, &ai->erase,be32_to_cpu (fmec->pnum), -be32_to_cpu (fmec->ec),1 ); + ret =add_aeb (ai, &ai->erase,be32_to_cpu (fmec->pnum), +be32_to_cpu (fmec->ec),1 ); +if (ret) + goto fail; } ai->mean_ec =div_u64 (ai->ec_sum, ai->ec_count);
Greg Kroah-Hartman
maintainerPATCH 149/218 KVM: Prevent module exit until all VMs are freed
In reply to Greg Kroah-HartmanFrom: David Matlack <[email protected]>
commit 5f6de5cbebee925a612856fce6f9182bb3eee0db upstream.
Tie the lifetime the KVM module to the lifetime of each VM via kvm.users_count. This way anything that grabs a reference to the VM via kvm_get_kvm() cannot accidentally outlive the KVM module.
Prior to this commit, the lifetime of the KVM module was tied to the lifetime of /dev/kvm file descriptors, VM file descriptors, and vCPU file descriptors by their respective file_operations "owner" field. This approach is insufficient because references grabbed via kvm_get_kvm() do not prevent closing any of the aforementioned file descriptors.
This fixes a long standing theoretical bug in KVM that at least affects async page faults. kvm_setup_async_pf() grabs a reference via kvm_get_kvm(), and drops it in an asynchronous work callback. Nothing prevents the VM file descriptor from being closed and the KVM module from being unloaded before this callback runs.
Message-Id: <[email protected]>
--- virt/kvm/kvm_main.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
virt/kvm/kvm_main.c +13 -0
@@ -107,6 +107,8 @@ EXPORT_SYMBOL_GPL(kvm_debugfs_dir);static int kvm_debugfs_num_entries;static const struct file_operations *stat_fops_per_vm[]; +static struct file_operations kvm_chardev_ops; +static long kvm_vcpu_ioctl (struct file *file,unsigned int ioctl,unsigned long arg);#ifdef CONFIG_KVM_COMPAT
@@ -714,6 +716,16 @@ static struct kvm *kvm_create_vm(unsignepreempt_notifier_inc (); +/* +* When the fd passed to this ioctl() is opened it pins the module, +* but try_module_get() also prevents getting a reference if the module +* is in MODULE_STATE_GOING (e.g. if someone ran "rmmod --wait"). +*/ +if (!try_module_get (kvm_chardev_ops.owner)) { + r = -ENODEV ; + goto out_err; + } +return kvm; out_err:
@@ -798,6 +810,7 @@ static void kvm_destroy_vm(struct kvm *kpreempt_notifier_dec ();hardware_disable_all ();mmdrop (mm); +module_put (kvm_chardev_ops.owner); }void kvm_get_kvm (struct kvm *kvm)
Greg Kroah-Hartman
maintainerPATCH 147/218 mmc: host: Return an error when ->enable_sdio_irq() ops is missing
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
[ Upstream commit d6c9219ca1139b74541b2a98cee47a3426d754a9 ]
Even if the current WARN() notifies the user that something is severely wrong, we can still end up in a PANIC() when trying to invoke the missing ->enable_sdio_irq() ops. Therefore, let's also return an error code and prevent the host from being added.
While at it, move the code into a separate function to prepare for subsequent changes and for further host caps validations.
--- drivers/mmc/core/host.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/mmc/core/host.c +13 -2
@@ -403,6 +403,16 @@ again:EXPORT_SYMBOL (mmc_alloc_host); +static int mmc_validate_host_caps (struct mmc_host *host) +{ +if (host->caps &MMC_CAP_SDIO_IRQ && !host->ops->enable_sdio_irq) { +dev_warn (host->parent,"missing ->enable_sdio_irq() ops\n" ); +return -EINVAL ; + } + +return 0 ; +} +/** * mmc_add_host - initialise host hardware * @host: mmc host
@@ -415,8 +425,9 @@ int mmc_add_host(struct mmc_host *host) {int err; -WARN_ON ((host->caps &MMC_CAP_SDIO_IRQ ) && - !host->ops->enable_sdio_irq); + err =mmc_validate_host_caps (host); +if (err) +return err; err =device_add (&host->class_dev);if (err)
Greg Kroah-Hartman
maintainerPATCH 156/218 mm/memcontrol: return 1 from cgroup.memory __setup() handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 460a79e18842caca6fa0c415de4a3ac1e671ac50 upstream.
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; it just pollutes init's environment).
The only reason that this particular __setup handler does not pollute init's environment is that the setup string contains a '.', as in "cgroup.memory". This causes init/main.c::unknown_boottoption() to consider it to be an "Unused module parameter" and ignore it. (This is for parsing of loadable module parameters any time after kernel init.) Otherwise the string "cgroup.memory=whatever" would be added to init's environment strings.
Instead of relying on this '.' quirk, just return 1 to indicate that the boot option has been handled.
Note that there is no warning message if someone enters:
cgroup.memory=anything_invalid
--- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memcontrol.c +1 -1
@@ -5840,7 +5840,7 @@ static int __init cgroup_memory(char *s)if (!strcmp (token,"nokmem" )) cgroup_memory_nokmem = true; } -return 0 ; +return 1 ; }__setup ("cgroup.memory=" , cgroup_memory);
Greg Kroah-Hartman
maintainerPATCH 151/218 ubifs: setflags: Make dirtied_ino_d 8 bytes aligned
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit 1b83ec057db16b4d0697dc21ef7a9743b6041f72 upstream.
Make 'ui->data_len' aligned with 8 bytes before it is assigned to dirtied_ino_d. Since 8871d84c8f8b0c6b("ubifs: convert to fileattr") applied, 'setflags()' only affects regular files and directories, only xattr inode, symlink inode and special inode(pipe/char_dev/block_dev) have none- zero 'ui->data_len' field, so assertion '!(req->dirtied_ino_d & 7)' cannot fail in ubifs_budget_space(). To avoid assertion fails in future evolution(eg. setflags can operate special inodes), it's better to make dirtied_ino_d 8 bytes aligned, after all aligned size is still zero for regular files.
--- fs/ubifs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ubifs/ioctl.c +1 -1
@@ -105,7 +105,7 @@ static int setflags(struct inode *inode,struct ubifs_inode *ui =ubifs_inode (inode);struct ubifs_info *c = inode->i_sb->s_fs_info;struct ubifs_budget_req req = { .dirtied_ino =1 , - .dirtied_ino_d = ui->data_len }; + .dirtied_ino_d =ALIGN (ui->data_len,8 ) }; err =ubifs_budget_space (c, &req);if (err)
Greg Kroah-Hartman
maintainerPATCH 153/218 pinctrl: pinconf-generic: Print arguments for bias-pull-*
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 188e5834b930acd03ad3cf7c5e7aa24db9665a29 upstream.
The bias-pull-* properties, or PIN_CONFIG_BIAS_PULL_* pin config parameters, accept optional arguments in ohms denoting the strength of the pin bias.
Print these values out in debugfs as well.
--- drivers/pinctrl/pinconf-generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/pinconf-generic.c +3 -3
@@ -31,10 +31,10 @@ static const struct pin_config_item confPCONFDUMP (PIN_CONFIG_BIAS_BUS_HOLD ,"input bias bus hold" ,NULL , false),PCONFDUMP (PIN_CONFIG_BIAS_DISABLE ,"input bias disabled" ,NULL , false),PCONFDUMP (PIN_CONFIG_BIAS_HIGH_IMPEDANCE ,"input bias high impedance" ,NULL , false), -PCONFDUMP (PIN_CONFIG_BIAS_PULL_DOWN ,"input bias pull down" ,NULL , false), +PCONFDUMP (PIN_CONFIG_BIAS_PULL_DOWN ,"input bias pull down" ,"ohms" , true),PCONFDUMP (PIN_CONFIG_BIAS_PULL_PIN_DEFAULT , -"input bias pull to pin specific state" ,NULL , false), -PCONFDUMP (PIN_CONFIG_BIAS_PULL_UP ,"input bias pull up" ,NULL , false), +"input bias pull to pin specific state" ,"ohms" , true), +PCONFDUMP (PIN_CONFIG_BIAS_PULL_UP ,"input bias pull up" ,"ohms" , true),PCONFDUMP (PIN_CONFIG_DRIVE_OPEN_DRAIN ,"output drive open drain" ,NULL , false),PCONFDUMP (PIN_CONFIG_DRIVE_OPEN_SOURCE ,"output drive open source" ,NULL , false), PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL, false),
Greg Kroah-Hartman
maintainerPATCH 144/218 ARM: mmp: Fix failure to remove sram device
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 4036b29a146b2749af3bb213b003eb69f3e5ecc4 ]
Make sure in .probe() to set driver data before the function is left to make it possible in .remove() to undo the actions done.
This fixes a potential memory leak and stops returning an error code in .remove() that is ignored by the driver core anyhow.
--- arch/arm/mach-mmp/sram.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/arm/mach-mmp/sram.c +12 -10
@@ -75,6 +75,8 @@ static int sram_probe(struct platform_device *pdev)if (!info)return -ENOMEM ; +platform_set_drvdata (pdev, info); + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (res ==NULL ) {dev_err (&pdev->dev,"no memory resource defined\n" );
@@ -110,8 +112,6 @@ static int sram_probe(struct platform_device *pdev)list_add (&info->node, &sram_bank_list);mutex_unlock (&sram_lock); -platform_set_drvdata (pdev, info); -dev_info (&pdev->dev,"initialized\n" );return 0 ;
@@ -130,17 +130,19 @@ static int sram_remove(struct platform_device *pdev)struct sram_bank_info *info; info =platform_get_drvdata (pdev); -if (info ==NULL ) -return -ENODEV ; -mutex_lock (&sram_lock); -list_del (&info->node); -mutex_unlock (&sram_lock); +if (info->sram_size) { +mutex_lock (&sram_lock); +list_del (&info->node); +mutex_unlock (&sram_lock); + +gen_pool_destroy (info->gpool); +iounmap (info->sram_virt); +kfree (info->pool_name); + } -gen_pool_destroy (info->gpool); -iounmap (info->sram_virt); -kfree (info->pool_name);kfree (info); +return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 148/218 scsi: qla2xxx: Fix incorrect reporting of task management failure
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 58ca5999e0367d131de82a75257fbfd5aed0195d upstream.
User experienced no task management error while target device is responding with error. The RSP_CODE field in the status IOCB is in little endian. Driver assumes it's big endian and it picked up erroneous data.
Convert the data back to big endian as is on the wire.
--- drivers/scsi/qla2xxx/qla_isr.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_isr.c +1 -0
@@ -1618,6 +1618,7 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *v iocb->u.tmf.data =QLA_FUNCTION_FAILED ; }else if ((le16_to_cpu (sts->scsi_status) &SS_RESPONSE_INFO_LEN_VALID )) { +host_to_fcp_swap (sts->data,sizeof (sts->data));if (le32_to_cpu (sts->rsp_data_len) <4 ) { ql_log(ql_log_warn, fcport->vha, 0x503b, "Async-%s error - hdl=%x not enough response(%d).\n",
Greg Kroah-Hartman
maintainerPATCH 160/218 ARM: dts: spear13xx: Update SPI dma properties
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
commit 31d3687d6017c7ce6061695361598d9cda70807a upstream.
Reorder dmas and dma-names property for spi controller node to make it compliant with bindings.
--- arch/arm/boot/dts/spear13xx.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear13xx.dtsi +3 -3
@@ -288,9 +288,9 @@ #size-cells = <0>; interrupts = <0 31 0x4>; status = "disabled"; - dmas = <&dwdma0 4 0 0>, - <&dwdma0 5 0 0>; - dma-names = "tx", "rx"; + dmas = <&dwdma0 5 0 0>, + <&dwdma0 4 0 0>; + dma-names = "rx", "tx"; }; rtc@e0580000 {
Greg Kroah-Hartman
maintainerPATCH 161/218 openvswitch: Fixed nd target mask field in the flow dump.
In reply to Greg Kroah-HartmanFrom: Martin Varghese <[email protected]>
commit f19c44452b58a84d95e209b847f5495d91c9983a upstream.
IPv6 nd target mask was not getting populated in flow dump.
In the function __ovs_nla_put_key the icmp code mask field was checked instead of icmp code key field to classify the flow as neighbour discovery.
ufid:bdfbe3e5-60c2-43b0-a5ff-dfcac1c37328, recirc_id(0),dp_hash(0/0), skb_priority(0/0),in_port(ovs-nm1),skb_mark(0/0),ct_state(0/0), ct_zone(0/0),ct_mark(0/0),ct_label(0/0), eth(src=00:00:00:00:00:00/00:00:00:00:00:00, dst=00:00:00:00:00:00/00:00:00:00:00:00),eth_type(0x86dd), ipv6(src=::/::,dst=::/::,label=0/0,proto=58,tclass=0/0,hlimit=0/0,frag=no), icmpv6(type=135,code=0),
nd(target=2001::2/::,
sll=00:00:00:00:00:00/00:00:00:00:00:00, tll=00:00:00:00:00:00/00:00:00:00:00:00),
packets:10, bytes:860, used:0.504s, dp:ovs, actions:ovs-nm2
--- net/openvswitch/flow_netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/openvswitch/flow_netlink.c +2 -2
@@ -1713,8 +1713,8 @@ static int __ovs_nla_put_key(const struc icmpv6_key->icmpv6_type =ntohs (output->tp.src); icmpv6_key->icmpv6_code =ntohs (output->tp.dst); -if (icmpv6_key->icmpv6_type ==NDISC_NEIGHBOUR_SOLICITATION || - icmpv6_key->icmpv6_type ==NDISC_NEIGHBOUR_ADVERTISEMENT ) { +if (swkey->tp.src ==htons (NDISC_NEIGHBOUR_SOLICITATION ) || + swkey->tp.src ==htons (NDISC_NEIGHBOUR_ADVERTISEMENT )) {struct ovs_key_nd *nd_key; nla =nla_reserve (skb,OVS_KEY_ATTR_ND ,sizeof (*nd_key));
Greg Kroah-Hartman
maintainerPATCH 154/218 ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 40d8abf364bcab23bc715a9221a3c8623956257b upstream.
If the NumEntries field in the _CPC return package is less than 2, do not attempt to access the "Revision" element of that package, because it may not be present then.
--- drivers/acpi/cppc_acpi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/acpi/cppc_acpi.c +5 -0
@@ -681,6 +681,11 @@ int acpi_cppc_processor_probe(struct acp cpc_obj = &out_obj->package.elements[0 ];if (cpc_obj->type ==ACPI_TYPE_INTEGER ) { num_ent = cpc_obj->integer.value; +if (num_ent <=1 ) { +pr_debug ("Unexpected _CPC NumEntries value (%d) for CPU:%d\n" , + num_ent, pr->id); + goto out_free; + } }else {pr_debug ("Unexpected entry type(%d) for NumEntries\n" , cpc_obj->type);
Greg Kroah-Hartman
maintainerPATCH 158/218 ASoC: topology: Allow TLV control to be either read or write
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit feb00b736af64875560f371fe7f58b0b7f239046 upstream.
There is no reason to force readwrite access on TLV controls. It can be either read, write or both. This is further evidenced in code where it performs following checks:
if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ) && !sbe->get)
return -EINVAL;
if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) && !sbe->put)
return -EINVAL;--- sound/soc/soc-topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/soc-topology.c +2 -1
@@ -507,7 +507,8 @@ static int soc_tplg_kcontrol_bind_io(strif (hdr->ops.info ==SND_SOC_TPLG_CTL_BYTES && k->iface &SNDRV_CTL_ELEM_IFACE_MIXER - && k->access &SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE + && (k->access &SNDRV_CTL_ELEM_ACCESS_TLV_READ + || k->access &SNDRV_CTL_ELEM_ACCESS_TLV_WRITE ) && k->access &SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK ) {struct soc_bytes_ext *sbe;struct snd_soc_tplg_bytes_control *be;
Greg Kroah-Hartman
maintainerPATCH 126/218 irqchip/nvic: Release nvic_base upon failure
In reply to Greg Kroah-HartmanFrom: Souptick Joarder (HPE) <[email protected]>
[ Upstream commit e414c25e3399b2b3d7337dc47abccab5c71b7c8f ]
smatch warning was reported as below ->
smatch warnings:drivers/irqchip/irq-nvic.c:131 nvic_of_init()
warn: 'nvic_base' not released on lines: 97.
Release nvic_base upon failure.
--- drivers/irqchip/irq-nvic.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/irqchip/irq-nvic.c +2 -0
@@ -108,6 +108,7 @@ static int __init nvic_of_init(struct device_node *node,if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" ); +iounmap (nvic_base);return -ENOMEM ; }
@@ -117,6 +118,7 @@ static int __init nvic_of_init(struct device_node *node,if (ret) {pr_warn ("Failed to allocate irq chips\n" );irq_domain_remove (nvic_irq_domain); +iounmap (nvic_base);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 155/218 mm/mmap: return 1 from stack_guard_gap __setup() handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit e6d094936988910ce6e8197570f2753898830081 upstream.
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; it just pollutes init's environment). This prevents:
Unknown kernel command line parameters \ "BOOT_IMAGE=/boot/bzImage-517rc5 stack_guard_gap=100", will be \ passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
stack_guard_gap=100Return 1 to indicate that the boot option has been handled.
Note that there is no warning message if someone enters:
stack_guard_gap=anything_invalid
and 'val' and stack_guard_gap are both set to 0 due to the use of simple_strtoul(). This could be improved by using kstrtoxxx() and checking for an error.
It appears that having stack_guard_gap == 0 is valid (if unexpected) since using "stack_guard_gap=0" on the kernel command line does that.
--- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mmap.c +1 -1
@@ -2425,7 +2425,7 @@ static int __init cmdline_parse_stack_guif (!*endptr) stack_guard_gap = val <<PAGE_SHIFT ; -return 0 ; +return 1 ; }__setup ("stack_guard_gap=" , cmdline_parse_stack_guard_gap);
Greg Kroah-Hartman
maintainerPATCH 143/218 ARM: tegra: tamonten: Fix I2C3 pad setting
In reply to Greg Kroah-HartmanFrom: Richard Leitner <[email protected]>
[ Upstream commit 0092c25b541a5422d7e71892a13c55ee91abc34b ]
This patch fixes the tristate configuration for i2c3 function assigned to the dtf pins on the Tamonten Tegra20 SoM.
--- arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra20-tamonten.dtsi +3 -3
@@ -182,8 +182,8 @@ }; conf_ata { nvidia,pins = "ata", "atb", "atc", "atd", "ate", - "cdev1", "cdev2", "dap1", "dtb", "gma", - "gmb", "gmc", "gmd", "gme", "gpu7", + "cdev1", "cdev2", "dap1", "dtb", "dtf", + "gma", "gmb", "gmc", "gmd", "gme", "gpu7", "gpv", "i2cp", "irrx", "irtx", "pta", "rm", "slxa", "slxk", "spia", "spib", "uac";
@@ -202,7 +202,7 @@ }; conf_crtp { nvidia,pins = "crtp", "dap2", "dap3", "dap4", - "dtc", "dte", "dtf", "gpu", "sdio1", + "dtc", "dte", "gpu", "sdio1", "slxc", "slxd", "spdi", "spdo", "spig", "uda"; nvidia,pull = <TEGRA_PIN_PULL_NONE>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 159/218 ARM: dts: spear1340: Update serial node properties
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
commit 583d6b0062640def86f3265aa1042ecb6672516e upstream.
Reorder dma and dma-names property for serial node to make it compliant with bindings.
--- arch/arm/boot/dts/spear1340.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/spear1340.dtsi +3 -3
@@ -141,9 +141,9 @@ reg = <0xb4100000 0x1000>; interrupts = <0 105 0x4>; status = "disabled"; - dmas = <&dwdma0 12 0 1>, - <&dwdma0 13 1 0>; - dma-names = "tx", "rx"; + dmas = <&dwdma0 13 0 1>, + <&dwdma0 12 1 0>; + dma-names = "rx", "tx"; }; thermal@e07008c4 {
Greg Kroah-Hartman
maintainerPATCH 162/218 KVM: x86: Forbid VMM to set SYNIC/STIMER MSRs when SynIC wasnt activated
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit b1e34d325397a33d97d845e312d7cf2a8b646b44 upstream.
Setting non-zero values to SYNIC/STIMER MSRs activates certain features, this should not happen when KVM_CAP_HYPERV_SYNIC{,2} was not activated.
Note, it would've been better to forbid writing anything to SYNIC/STIMER MSRs, including zeroes, however, at least QEMU tries clearing HV_X64_MSR_STIMER0_CONFIG without SynIC. HV_X64_MSR_EOM MSR is somewhat 'special' as writing zero there triggers an action, this also should not happen when SynIC wasn't activated.
Message-Id: <[email protected]>
--- arch/x86/kvm/hyperv.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/x86/kvm/hyperv.c +15 -0
@@ -244,6 +244,9 @@ static int synic_set_msr(struct kvm_vcpucase HV_X64_MSR_EOM : {int i; +if (!synic->active) +break ; +for (i =0 ; i <ARRAY_SIZE (synic->sint); i++)kvm_hv_notify_acked_sint (vcpu, i);break ;
@@ -504,6 +507,12 @@ static int stimer_start(struct kvm_vcpu_static int stimer_set_config (struct kvm_vcpu_hv_stimer *stimer,u64 config,bool host) { +struct kvm_vcpu *vcpu =stimer_to_vcpu (stimer); +struct kvm_vcpu_hv_synic *synic =vcpu_to_synic (vcpu); + +if (!synic->active && (!host || config)) +return 1 ; +trace_kvm_hv_stimer_set_config (stimer_to_vcpu (stimer)->vcpu_id, stimer->index, config, host);
@@ -518,6 +527,12 @@ static int stimer_set_config(struct kvm_static int stimer_set_count (struct kvm_vcpu_hv_stimer *stimer,u64 count,bool host) { +struct kvm_vcpu *vcpu =stimer_to_vcpu (stimer); +struct kvm_vcpu_hv_synic *synic =vcpu_to_synic (vcpu); + +if (!synic->active && (!host || count)) +return 1 ; +trace_kvm_hv_stimer_set_count (stimer_to_vcpu (stimer)->vcpu_id, stimer->index, count, host);
Greg Kroah-Hartman
maintainerPATCH 163/218 rtc: wm8350: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 43f0269b6b89c1eec4ef83c48035608f4dcdd886 ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, it need not free 'wm_rtc->rtc' since it will be freed automatically.
--- drivers/rtc/rtc-wm8350.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/rtc/rtc-wm8350.c +9 -2
@@ -443,14 +443,21 @@ static int wm8350_rtc_probe(struct platform_device *pdev)return ret; } -wm8350_register_irq (wm8350,WM8350_IRQ_RTC_SEC , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_RTC_SEC , wm8350_rtc_update_handler,0 ,"RTC Seconds" , wm8350); +if (ret) +return ret; +wm8350_mask_irq (wm8350,WM8350_IRQ_RTC_SEC ); -wm8350_register_irq (wm8350,WM8350_IRQ_RTC_ALM , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_RTC_ALM , wm8350_rtc_alarm_handler,0 ,"RTC Alarm" , wm8350); +if (ret) { +wm8350_free_irq (wm8350,WM8350_IRQ_RTC_SEC , wm8350); +return ret; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 127/218 ACPICA: Avoid walking the ACPI Namespace if it is not there
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 0c9992315e738e7d6e927ef36839a466b080dba6 ]
ACPICA commit b1c3656ef4950098e530be68d4b589584f06cddc
Prevent acpi_ns_walk_namespace() from crashing when called with start_node equal to ACPI_ROOT_OBJECT if the Namespace has not been instantiated yet and acpi_gbl_root_node is NULL.
For instance, this can happen if the kernel is run with "acpi=off" in the command line.
--- drivers/acpi/acpica/nswalk.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/acpi/acpica/nswalk.c +3 -0
@@ -203,6 +203,9 @@ acpi_ns_walk_namespace(acpi_object_type type,if (start_node ==ACPI_ROOT_OBJECT ) { start_node = acpi_gbl_root_node; +if (!start_node) { +return_ACPI_STATUS (AE_NO_NAMESPACE ); + } }/* Null child means "get first node" */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 128/218 ACPI/APEI: Limit printable size of BERT table data
In reply to Greg Kroah-HartmanFrom: Darren Hart <[email protected]>
[ Upstream commit 3f8dec116210ca649163574ed5f8df1e3b837d07 ]
Platforms with large BERT table data can trigger soft lockup errors while attempting to print the entire BERT table data to the console at boot:
watchdog: BUG: soft lockup - CPU#160 stuck for 23s! [swapper/0:1]
Observed on Ampere Altra systems with a single BERT record of ~250KB.
The original bert driver appears to have assumed relatively small table data. Since it is impractical to reassemble large table data from interwoven console messages, and the table data is available in
/sys/firmware/acpi/tables/data/BERT
limit the size for tables printed to the console to 1024 (for no reason other than it seemed like a good place to kick off the discussion, would appreciate feedback from existing users in terms of what size would maintain their current usage model).
Alternatively, we could make printing a CONFIG option, use the bert_disable boot arg (or something similar), or use a debug log level. However, all those solutions require extra steps or change the existing behavior for small table data. Limiting the size preserves existing behavior on existing platforms with small table data, and eliminates the soft lockups for platforms with large table data, while still making it available.
--- drivers/acpi/apei/bert.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/acpi/apei/bert.c +6 -2
@@ -31,6 +31,7 @@#undef pr_fmt#define pr_fmt (fmt) "BERT: " fmt +#define ACPI_BERT_PRINT_MAX_LEN 1024static int bert_disable;
@@ -59,8 +60,11 @@ static void __init bert_print_all(struct acpi_bert_region *region, }pr_info_once ("Error records from previous boot:\n" ); - - cper_estatus_print(KERN_INFO HW_ERR, estatus); +if (region_len <ACPI_BERT_PRINT_MAX_LEN ) + cper_estatus_print(KERN_INFO HW_ERR, estatus); +else +pr_info_once ("Max print length exceeded, table data is available at:\n" +"/sys/firmware/acpi/tables/data/BERT" );/* * Because the boot error source is "one-time polled" type,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 129/218 PM: core: keep irq flags in device_pm_check_callbacks()
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 524bb1da785a7ae43dd413cd392b5071c6c367f8 ]
The function device_pm_check_callbacks() can be called under the spin lock (in the reported case it happens from genpd_add_device() -> dev_pm_domain_set(), when the genpd uses spinlocks rather than mutexes.
However this function uncoditionally uses spin_lock_irq() / spin_unlock_irq(), thus not preserving the CPU flags. Use the irqsave/irqrestore instead.
The backtrace for the reference:
[ 2.752010] ------------[ cut here ]------------ [ 2.756769] raw_local_irq_restore() called with IRQs enabled [ 2.762596] WARNING: CPU: 4 PID: 1 at kernel/locking/irqflag-debug.c:10 warn_bogus_irq_restore+0x34/0x50 [ 2.772338] Modules linked in: [ 2.775487] CPU: 4 PID: 1 Comm: swapper/0 Tainted: G S 5.17.0-rc6-00384-ge330d0d82eff-dirty #684 [ 2.781384] Freeing initrd memory: 46024K [ 2.785839] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 2.785841] pc : warn_bogus_irq_restore+0x34/0x50 [ 2.785844] lr : warn_bogus_irq_restore+0x34/0x50 [ 2.785846] sp : ffff80000805b7d0 [ 2.785847] x29: ffff80000805b7d0 x28: 0000000000000000 x27: 0000000000000002 [ 2.785850] x26: ffffd40e80930b18 x25: ffff7ee2329192b8 x24: ffff7edfc9f60800 [ 2.785853] x23: ffffd40e80930b18 x22: ffffd40e80930d30 x21: ffff7edfc0dffa00 [ 2.785856] x20: ffff7edfc09e3768 x19: 0000000000000000 x18: ffffffffffffffff [ 2.845775] x17: 6572206f74206465 x16: 6c696166203a3030 x15: ffff80008805b4f7 [ 2.853108] x14: 0000000000000000 x13: ffffd40e809550b0 x12: 00000000000003d8 [ 2.860441] x11: 0000000000000148 x10: ffffd40e809550b0 x9 : ffffd40e809550b0 [ 2.867774] x8 : 00000000ffffefff x7 : ffffd40e809ad0b0 x6 : ffffd40e809ad0b0 [ 2.875107] x5 : 000000000000bff4 x4 : 0000000000000000 x3 : 0000000000000000 [ 2.882440] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff7edfc03a8000 [ 2.889774] Call trace: [ 2.892290] warn_bogus_irq_restore+0x34/0x50 [ 2.896770] _raw_spin_unlock_irqrestore+0x94/0xa0 [ 2.901690] genpd_unlock_spin+0x20/0x30 [ 2.905724] genpd_add_device+0x100/0x2d0 [ 2.909850] __genpd_dev_pm_attach+0xa8/0x23c [ 2.914329] genpd_dev_pm_attach_by_id+0xc4/0x190 [ 2.919167] genpd_dev_pm_attach_by_name+0x3c/0xd0 [ 2.924086] dev_pm_domain_attach_by_name+0x24/0x30 [ 2.929102] psci_dt_attach_cpu+0x24/0x90 [ 2.933230] psci_cpuidle_probe+0x2d4/0x46c [ 2.937534] platform_probe+0x68/0xe0 [ 2.941304] really_probe.part.0+0x9c/0x2fc [ 2.945605] __driver_probe_device+0x98/0x144 [ 2.950085] driver_probe_device+0x44/0x15c [ 2.954385] __device_attach_driver+0xb8/0x120 [ 2.958950] bus_for_each_drv+0x78/0xd0 [ 2.962896] __device_attach+0xd8/0x180 [ 2.966843] device_initial_probe+0x14/0x20 [ 2.971144] bus_probe_device+0x9c/0xa4 [ 2.975092] device_add+0x380/0x88c [ 2.978679] platform_device_add+0x114/0x234 [ 2.983067] platform_device_register_full+0x100/0x190 [ 2.988344] psci_idle_init+0x6c/0xb0 [ 2.992113] do_one_initcall+0x74/0x3a0 [ 2.996060] kernel_init_freeable+0x2fc/0x384 [ 3.000543] kernel_init+0x28/0x130 [ 3.004132] ret_from_fork+0x10/0x20 [ 3.007817] irq event stamp: 319826 [ 3.011404] hardirqs last enabled at (319825): [<ffffd40e7eda0268>] __up_console_sem+0x78/0x84 [ 3.020332] hardirqs last disabled at (319826): [<ffffd40e7fd6d9d8>] el1_dbg+0x24/0x8c [ 3.028458] softirqs last enabled at (318312): [<ffffd40e7ec90410>] _stext+0x410/0x588 [ 3.036678] softirqs last disabled at (318299): [<ffffd40e7ed1bf68>] __irq_exit_rcu+0x158/0x174 [ 3.045607] ---[ end trace 0000000000000000 ]---
--- drivers/base/power/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/base/power/main.c +4 -2
@@ -1766,7 +1766,9 @@ static bool pm_ops_is_empty(const struct dev_pm_ops *ops)void device_pm_check_callbacks (struct device *dev) { -spin_lock_irq (&dev->power.lock); +unsigned long flags; + +spin_lock_irqsave (&dev->power.lock, flags); dev->power.no_pm_callbacks = (!dev->bus || (pm_ops_is_empty (dev->bus->pm) && !dev->bus->suspend && !dev->bus->resume)) &&
@@ -1776,5 +1778,5 @@ void device_pm_check_callbacks(struct device *dev) (!dev->pm_domain ||pm_ops_is_empty (&dev->pm_domain->ops)) && (!dev->driver || (pm_ops_is_empty (dev->driver->pm) && !dev->driver->suspend && !dev->driver->resume)); -spin_unlock_irq (&dev->power.lock); +spin_unlock_irqrestore (&dev->power.lock, flags); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 130/218 spi: tegra20: Use of_device_get_match_data()
In reply to Greg Kroah-HartmanFrom: Minghao Chi <[email protected]>
[ Upstream commit c9839acfcbe20ce43d363c2a9d0772472d9921c0 ]
Use of_device_get_match_data() to simplify the code.
--- drivers/spi/spi-tegra20-slink.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/spi/spi-tegra20-slink.c +1 -7
@@ -1016,14 +1016,8 @@ static int tegra_slink_probe(struct platform_device *pdev)struct resource *r;int ret, spi_irq;const struct tegra_slink_chip_data *cdata =NULL ; -const struct of_device_id *match; - match =of_match_device (tegra_slink_of_match, &pdev->dev); -if (!match) { -dev_err (&pdev->dev,"Error: No device match found\n" ); -return -ENODEV ; - } - cdata = match->data; + cdata =of_device_get_match_data (&pdev->dev); master =spi_alloc_master (&pdev->dev,sizeof (*tspi));if (!master) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 131/218 ext4: dont BUG if someone dirty pages without asking ext4 first
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
[ Upstream commit cc5095747edfb054ca2068d01af20be3fcc3634f ]
[un]pin_user_pages_remote is dirtying pages without properly warning the file system in advance. A related race was noted by Jan Kara in 2018[1]; however, more recently instead of it being a very hard-to-hit race, it could be reliably triggered by process_vm_writev(2) which was discovered by Syzbot[2].
This is technically a bug in mm/gup.c, but arguably ext4 is fragile in that if some other kernel subsystem dirty pages without properly notifying the file system using page_mkwrite(), ext4 will BUG, while other file systems will not BUG (although data will still be lost).
So instead of crashing with a BUG, issue a warning (since there may be potential data loss) and just mark the page as clean to avoid unprivileged denial of service attacks until the problem can be properly fixed. More discussion and background can be found in the thread starting at [2].
[1] https://lore.kernel.org/linux-mm/[email protected]
[2] https://lore.kernel.org/r/[email protected]
--- fs/ext4/inode.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
fs/ext4/inode.c +25 -0
@@ -2048,6 +2048,15 @@ static int ext4_writepage(struct page *page,else len =PAGE_SIZE ; +/* Should never happen but for bugs in other kernel subsystems */ +if (!page_has_buffers (page)) { +ext4_warning_inode (inode, +"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +return 0 ; + } + page_bufs =page_buffers (page);/* * We cannot do block allocation or other extent handling in this
@@ -2608,6 +2617,22 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)wait_on_page_writeback (page);BUG_ON (PageWriteback (page)); +/* +* Should never happen but for buggy code in +* other subsystems that call +* set_page_dirty() without properly warning +* the file system first. See [1] for more +* information. +* +* [1] https://lore.kernel.org/linux-mm/[email protected] +*/ +if (!page_has_buffers (page)) { +ext4_warning_inode (mpd->inode,"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +continue ; + } +if (mpd->map.m_len ==0 ) mpd->first_page = page->index; mpd->next_page = page->index +1 ;
Signature · 1 line
2.34.1
syzbot
syzbotRe: [PATCH 4.9 131/218] ext4: dont BUG if someone dirty pages without asking ext4 first
I see the command but can't find the corresponding bug. The email is sent to [email protected] address but the HASH does not correspond to any known bug. Please double check the…
Quoted 81 lines
From: Theodore Ts'o <[email protected]>
[ Upstream commit
cc5095747edfb054ca2068d01af20be3fcc3634f][un]pin_user_pages_remote is dirtying pages without properly warning the file system in advance. A related race was noted by Jan Kara in 2018[1]; however, more recently instead of it being a very hard-to-hit race, it could be reliably triggered by
process_vm_writev(2)which was discovered by Syzbot[2].This is technically a bug in
mm/gup.c, but arguably ext4 is fragile in that if some other kernel subsystem dirty pages without properly notifying the file system usingpage_mkwrite(), ext4 will BUG, while other file systems will not BUG (although data will still be lost).So instead of crashing with a BUG, issue a warning (since there may be potential data loss) and just mark the page as clean to avoid unprivileged denial of service attacks until the problem can be properly fixed. More discussion and background can be found in the thread starting at [2].
[1] https://lore.kernel.org/linux-mm/[email protected]
[2] https://lore.kernel.org/r/[email protected]Reported-by Lee Jones <[email protected]>Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/ext4/inode.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)fs/ext4/inode.c +25
-0@@ -2048,6 +2048,15 @@ static int ext4_writepage(struct page *page,else len =PAGE_SIZE ; +/* Should never happen but for bugs in other kernel subsystems */ +if (!page_has_buffers (page)) { +ext4_warning_inode (inode, +"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +return 0 ; + } + page_bufs =page_buffers (page);/* * We cannot do block allocation or other extent handling in this @@ -2608,6 +2617,22 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)wait_on_page_writeback (page);BUG_ON (PageWriteback (page)); +/* +* Should never happen but for buggy code in +* other subsystems that call +* set_page_dirty() without properly warning +* the file system first. See [1] for more +* information. +* +* [1] https://lore.kernel.org/linux-mm/[email protected] +*/ +if (!page_has_buffers (page)) { +ext4_warning_inode (mpd->inode,"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +continue ; + } +if (mpd->map.m_len ==0 ) mpd->first_page = page->index; mpd->next_page = page->index +1 ;Signature · 1 line
2.34.1
I see the command but can't find the corresponding bug. The email is sent to [email protected] address but the HASH does not correspond to any known bug. Please double check the address.
Greg Kroah-Hartman
maintainerPATCH 122/218 net/x25: Fix null-ptr-deref caused by x25_disconnect
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 7781607938c8371d4c2b243527430241c62e39c2 ]
When the link layer is terminating, x25->neighbour will be set to NULL in x25_disconnect(). As a result, it could cause null-ptr-deref bugs in x25_sendmsg(),x25_recvmsg() and x25_connect(). One of the bugs is shown below.
(Thread 1) | (Thread 2) x25_link_terminated() | x25_recvmsg() x25_kill_by_neigh() | ... x25_disconnect() | lock_sock(sk) ... | ... x25->neighbour = NULL //(1) | ... | x25->neighbour->extended //(2)
The code sets NULL to x25->neighbour in position (1) and dereferences x25->neighbour in position (2), which could cause null-ptr-deref bug.
This patch adds lock_sock() in x25_kill_by_neigh() in order to synchronize with x25_sendmsg(), x25_recvmsg() and x25_connect(). What`s more, the sock held by lock_sock() is not NULL, because it is extracted from x25_list and uses x25_list_lock to synchronize.
--- net/x25/af_x25.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
net/x25/af_x25.c +8 -3
@@ -1795,10 +1795,15 @@ void x25_kill_by_neigh(struct x25_neigh *nb)write_lock_bh (&x25_list_lock); -sk_for_each (s, &x25_list) -if (x25_sk (s)->neighbour == nb) +sk_for_each (s, &x25_list) { +if (x25_sk (s)->neighbour == nb) { +write_unlock_bh (&x25_list_lock); +lock_sock (s);x25_disconnect (s,ENETUNREACH ,0 ,0 ); - +release_sock (s); +write_lock_bh (&x25_list_lock); + } + }write_unlock_bh (&x25_list_lock);/* Remove any related forwards */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 175/218 bnxt_en: Eliminate unintended link toggle during FW reset
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
[ Upstream commit 7c492a2530c1f05441da541307c2534230dfd59b ]
If the flow control settings have been changed, a subsequent FW reset may cause the ethernet link to toggle unnecessarily. This link toggle will increase the down time by a few seconds.
The problem is caused by bnxt_update_phy_setting() detecting a false mismatch in the flow control settings between the stored software settings and the current FW settings after the FW reset. This mismatch is caused by the AUTONEG bit added to link_info->req_flow_ctrl in an inconsistent way in bnxt_set_pauseparam() in autoneg mode. The AUTONEG bit should not be added to link_info->req_flow_ctrl.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -3
@@ -1008,9 +1008,7 @@ static int bnxt_set_pauseparam(struct net_device *dev, } link_info->autoneg |=BNXT_AUTONEG_FLOW_CTRL ; -if (bp->hwrm_spec_code >=0x10201 ) - link_info->req_flow_ctrl = -PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE ; + link_info->req_flow_ctrl =0 ; }else {/* when transition from auto pause to force pause, * force a link change
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 166/218 ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111
In reply to Greg Kroah-HartmanFrom: Zekun Shen <[email protected]>
[ Upstream commit 564d4eceb97eaf381dd6ef6470b06377bb50c95a ]
The bug was found during fuzzing. Stacktrace locates it in ath5k_eeprom_convert_pcal_info_5111.
When none of the curve is selected in the loop, idx can go up to AR5K_EEPROM_N_PD_CURVES. The line makes pd out of bound. pd = &chinfo[pier].pd_curves[idx];
There are many OOB writes using pd later in the code. So I added a sanity check for idx. Checks for other loops involving AR5K_EEPROM_N_PD_CURVES are not needed as the loop index is not used outside the loops.
The patch is NOT tested with real device.
The following is the fuzzing report
BUG: KASAN: slab-out-of-bounds in ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] Write of size 1 at addr ffff8880174a4d60 by task modprobe/214 CPU: 0 PID: 214 Comm: modprobe Not tainted 5.6.0 #1 Call Trace: dump_stack+0x76/0xa0 print_address_description.constprop.0+0x16/0x200 ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] __kasan_report.cold+0x37/0x7c ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] kasan_report+0xe/0x20 ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] ? apic_timer_interrupt+0xa/0x20 ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] ? ath5k_pci_eeprom_read+0x228/0x3c0 [ath5k] ath5k_eeprom_init+0x2513/0x6290 [ath5k] ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] ? usleep_range+0xb8/0x100 ? apic_timer_interrupt+0xa/0x20 ? ath5k_eeprom_read_pcal_info_2413+0x2f20/0x2f20 [ath5k] ath5k_hw_init+0xb60/0x1970 [ath5k] ath5k_init_ah+0x6fe/0x2530 [ath5k] ? kasprintf+0xa6/0xe0 ? ath5k_stop+0x140/0x140 [ath5k] ? _dev_notice+0xf6/0xf6 ? apic_timer_interrupt+0xa/0x20 ath5k_pci_probe.cold+0x29a/0x3d6 [ath5k] ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] ? mutex_lock+0x89/0xd0 ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] local_pci_probe+0xd3/0x160 pci_device_probe+0x23f/0x3e0 ? pci_device_remove+0x280/0x280 ? pci_device_remove+0x280/0x280 really_probe+0x209/0x5d0
--- drivers/net/wireless/ath/ath5k/eeprom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath5k/eeprom.c +3 -0
@@ -746,6 +746,9 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode, } } +if (idx ==AR5K_EEPROM_N_PD_CURVES ) + goto err_out; + ee->ee_pd_gains[mode] =1 ; pd = &chinfo[pier].pd_curves[idx];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 176/218 MIPS: fix fortify panic when copying asm exception handlers
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit d17b66417308996e7e64b270a3c7f3c1fbd4cfc8 ]
With KCFLAGS="-O3", I was able to trigger a fortify-source memcpy() overflow panic on set_vi_srs_handler(). Although O3 level is not supported in the mainline, under some conditions that may've happened with any optimization settings, it's just a matter of inlining luck. The panic itself is correct, more precisely, 50/50 false-positive and not at the same time.
Quoted 1 line
From the one side, no real overflow happens. Exception handler
defined in asm just gets copied to some reserved places in the memory.
But the reason behind is that C code refers to that exception handler declares it as char, i.e. something of 1 byte length. It's obvious that the asm function itself is way more than 1 byte, so fortify logics thought we are going to past the symbol declared. The standard way to refer to asm symbols from C code which is not supposed to be called from C is to declare them as extern const u8[]. This is fully correct from any point of view, as any code itself is just a bunch of bytes (including 0 as it is for syms like _stext/_etext/etc.), and the exact size is not known at the moment of compilation.
Adjust the type of the except_vec_vi_*() and related variables. Make set_handler() take const as a second argument to avoid cast-away warnings and give a little more room for optimization.
--- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-)
arch/mips/include/asm/setup.h +1 -1
@@ -13,7 +13,7 @@ static inline void setup_8250_early_printk_port(unsigned long base, unsigned int reg_shift, unsigned int timeout) {}#endif -extern void set_handler (unsigned long offset,void *addr,unsigned long len); +void set_handler (unsigned long offset,const void *addr,unsigned long len);extern void set_uncached_handler (unsigned long offset,void *addr,unsigned long len);typedef void (*vi_handler_t )(void );
arch/mips/kernel/traps.c +11 -11
@@ -2019,19 +2019,19 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)* If no shadow set is selected then use the default handler * that does normal register saving and standard interrupt exit */ -extern char except_vec_vi, except_vec_vi_lui; -extern char except_vec_vi_ori, except_vec_vi_end; -extern char rollback_except_vec_vi; -char *vec_start =using_rollback_handler () ? - &rollback_except_vec_vi : &except_vec_vi; +extern const u8 except_vec_vi[], except_vec_vi_lui[]; +extern const u8 except_vec_vi_ori[], except_vec_vi_end[]; +extern const u8 rollback_except_vec_vi[]; +const u8 *vec_start =using_rollback_handler () ? + rollback_except_vec_vi : except_vec_vi;#if defined(CONFIG_CPU_MICROMIPS ) || defined(CONFIG_CPU_BIG_ENDIAN ) -const int lui_offset = &except_vec_vi_lui - vec_start +2 ; -const int ori_offset = &except_vec_vi_ori - vec_start +2 ; +const int lui_offset = except_vec_vi_lui - vec_start +2 ; +const int ori_offset = except_vec_vi_ori - vec_start +2 ;#else -const int lui_offset = &except_vec_vi_lui - vec_start; -const int ori_offset = &except_vec_vi_ori - vec_start; +const int lui_offset = except_vec_vi_lui - vec_start; +const int ori_offset = except_vec_vi_ori - vec_start;#endif -const int handler_len = &except_vec_vi_end - vec_start; +const int handler_len = except_vec_vi_end - vec_start;if (handler_len >VECTORSPACING ) {/*
@@ -2251,7 +2251,7 @@ void per_cpu_trap_init(bool is_boot_cpu) }/* Install CPU exception handler */ -void set_handler (unsigned long offset,void *addr,unsigned long size) +void set_handler (unsigned long offset,const void *addr,unsigned long size) {#ifdef CONFIG_CPU_MICROMIPS memcpy ((void *)(ebase + offset), ((unsigned char *)addr -1 ), size);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 177/218 scsi: libfc: Fix use after free in fc_exch_abts_resp()
In reply to Greg Kroah-HartmanFrom: Jianglei Nie <[email protected]>
[ Upstream commit 271add11994ba1a334859069367e04d2be2ebdd4 ]
fc_exch_release(ep) will decrease the ep's reference count. When the reference count reaches zero, it is freed. But ep is still used in the following code, which will lead to a use after free.
Return after the fc_exch_release() call to avoid use after free.
--- drivers/scsi/libfc/fc_exch.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/libfc/fc_exch.c +1 -0
@@ -1663,6 +1663,7 @@ static void fc_exch_abts_resp(struct fc_exch *ep, struct fc_frame *fp)if (cancel_delayed_work_sync (&ep->timeout_work)) {FC_EXCH_DBG (ep,"Exchange timer canceled due to ABTS response\n" );fc_exch_release (ep);/* release from pending timer hold */ +return ; }spin_lock_bh (&ep->ex_lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 180/218 Bluetooth: Fix use after free in hci_send_acl
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit f63d24baff787e13b723d86fe036f84bdbc35045 ]
This fixes the following trace caused by receiving HCI_EV_DISCONN_PHY_LINK_COMPLETE which does call hci_conn_del without first checking if conn->type is in fact AMP_LINK and in case it is do properly cleanup upper layers with hci_disconn_cfm:
==================================================================
BUG: KASAN: use-after-free in hci_send_acl+0xaba/0xc50
Read of size 8 at addr ffff88800e404818 by task bluetoothd/142
CPU: 0 PID: 142 Comm: bluetoothd Not tainted
5.17.0-rc5-00006-gda4022eeac1a #7
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014
Call Trace:
<TASK>
dump_stack_lvl+0x45/0x59
print_address_description.constprop.0+0x1f/0x150
kasan_report.cold+0x7f/0x11b
hci_send_acl+0xaba/0xc50
l2cap_do_send+0x23f/0x3d0
l2cap_chan_send+0xc06/0x2cc0
l2cap_sock_sendmsg+0x201/0x2b0
sock_sendmsg+0xdc/0x110
sock_write_iter+0x20f/0x370
do_iter_readv_writev+0x343/0x690
do_iter_write+0x132/0x640
vfs_writev+0x198/0x570
do_writev+0x202/0x280
do_syscall_64+0x38/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xae
RSP: 002b:00007ffce8a099b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000014
Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3
0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 14 00 00 00 0f 05
<48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10
RDX: 0000000000000001 RSI: 00007ffce8a099e0 RDI: 0000000000000015
RAX: ffffffffffffffda RBX: 00007ffce8a099e0 RCX: 00007f788fc3cf77
R10: 00007ffce8af7080 R11: 0000000000000246 R12: 000055e4ccf75580
RBP: 0000000000000015 R08: 0000000000000002 R09: 0000000000000001
</TASK>
R13: 000055e4ccf754a0 R14: 000055e4ccf75cd0 R15: 000055e4ccf4a6b0
Allocated by task 45:
kasan_save_stack+0x1e/0x40
__kasan_kmalloc+0x81/0xa0
hci_chan_create+0x9a/0x2f0
l2cap_conn_add.part.0+0x1a/0xdc0
l2cap_connect_cfm+0x236/0x1000
le_conn_complete_evt+0x15a7/0x1db0
hci_le_conn_complete_evt+0x226/0x2c0
hci_le_meta_evt+0x247/0x450
hci_event_packet+0x61b/0xe90
hci_rx_work+0x4d5/0xc50
process_one_work+0x8fb/0x15a0
worker_thread+0x576/0x1240
kthread+0x29d/0x340
ret_from_fork+0x1f/0x30
Freed by task 45:
kasan_save_stack+0x1e/0x40
kasan_set_track+0x21/0x30
kasan_set_free_info+0x20/0x30
__kasan_slab_free+0xfb/0x130
kfree+0xac/0x350
hci_conn_cleanup+0x101/0x6a0
hci_conn_del+0x27e/0x6c0
hci_disconn_phylink_complete_evt+0xe0/0x120
hci_event_packet+0x812/0xe90
hci_rx_work+0x4d5/0xc50
process_one_work+0x8fb/0x15a0
worker_thread+0x576/0x1240
kthread+0x29d/0x340
ret_from_fork+0x1f/0x30
The buggy address belongs to the object at ffff88800c0f0500
The buggy address is located 24 bytes inside of
which belongs to the cache kmalloc-128 of size 128
The buggy address belongs to the page:
128-byte region [ffff88800c0f0500, ffff88800c0f0580)
flags: 0x100000000000200(slab|node=0|zone=1)
page:00000000fe45cd86 refcount:1 mapcount:0
mapping:0000000000000000 index:0x0 pfn:0xc0f0
raw: 0000000000000000 0000000080100010 00000001ffffffff
0000000000000000
raw: 0100000000000200 ffffea00003a2c80 dead000000000004
ffff8880078418c0
page dumped because: kasan: bad access detected
ffff88800c0f0400: 00 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc
Memory state around the buggy address:
>ffff88800c0f0500: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88800c0f0480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800c0f0580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^
==================================================================
ffff88800c0f0600: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- net/bluetooth/hci_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +2 -1
@@ -4470,8 +4470,9 @@ static void hci_disconn_phylink_complete_evt(struct hci_dev *hdev,hci_dev_lock (hdev); hcon =hci_conn_hash_lookup_handle (hdev, ev->phy_handle); -if (hcon) { +if (hcon && hcon->type ==AMP_LINK ) { hcon->state =BT_CLOSED ; +hci_disconn_cfm (hcon, ev->reason);hci_conn_del (hcon); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 179/218 xtensa: fix DTC warning unit_address_format
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
[ Upstream commit e85d29ba4b24f68e7a78cb85c55e754362eeb2de ]
DTC issues the following warnings when building xtfpga device trees:
/soc/flash@00000000/partition@0x0: unit name should not have leading "0x" /soc/flash@00000000/partition@0x6000000: unit name should not have leading "0x" /soc/flash@00000000/partition@0x6800000: unit name should not have leading "0x" /soc/flash@00000000/partition@0x7fe0000: unit name should not have leading "0x"
Drop leading 0x from flash partition unit names.
--- arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 8 ++++---- arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 8 ++++---- arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi +4 -4
@@ -7,19 +7,19 @@ reg = <0x00000000 0x08000000>; bank-width = <2>; device-width = <2>; - partition@0x0 { + partition@0 { label = "data"; reg = <0x00000000 0x06000000>; }; - partition@0x6000000 { + partition@6000000 { label = "boot loader area"; reg = <0x06000000 0x00800000>; }; - partition@0x6800000 { + partition@6800000 { label = "kernel image"; reg = <0x06800000 0x017e0000>; }; - partition@0x7fe0000 { + partition@7fe0000 { label = "boot environment"; reg = <0x07fe0000 0x00020000>; };
arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi +4 -4
@@ -7,19 +7,19 @@ reg = <0x08000000 0x01000000>; bank-width = <2>; device-width = <2>; - partition@0x0 { + partition@0 { label = "boot loader area"; reg = <0x00000000 0x00400000>; }; - partition@0x400000 { + partition@400000 { label = "kernel image"; reg = <0x00400000 0x00600000>; }; - partition@0xa00000 { + partition@a00000 { label = "data"; reg = <0x00a00000 0x005e0000>; }; - partition@0xfe0000 { + partition@fe0000 { label = "boot environment"; reg = <0x00fe0000 0x00020000>; };
arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi +2 -2
@@ -7,11 +7,11 @@ reg = <0x08000000 0x00400000>; bank-width = <2>; device-width = <2>; - partition@0x0 { + partition@0 { label = "boot loader area"; reg = <0x00000000 0x003f0000>; }; - partition@0x3f0000 { + partition@3f0000 { label = "boot environment"; reg = <0x003f0000 0x00010000>; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 178/218 usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit ac01df343e5a6c6bcead2ed421af1fde30f73e7e ]
Usually, the vbus_regulator (smps10 on omap5evm) boots up disabled.
Hence calling regulator_disable() indirectly through dwc3_omap_set_mailbox() during probe leads to:
[ 10.332764] WARNING: CPU: 0 PID: 1628 at drivers/regulator/core.c:2853 _regulator_disable+0x40/0x164 [ 10.351919] unbalanced disables for smps10_out1 [ 10.361298] Modules linked in: dwc3_omap(+) clk_twl6040 at24 gpio_twl6040 palmas_gpadc palmas_pwrbutton industrialio snd_soc_omap_mcbsp(+) snd_soc_ti_sdma display_connector ti_tpd12s015 drm leds_gpio drm_panel_orientation_quirks ip_tables x_tables ipv6 autofs4 [ 10.387818] CPU: 0 PID: 1628 Comm: systemd-udevd Not tainted 5.17.0-rc1-letux-lpae+ #8139 [ 10.405129] Hardware name: Generic OMAP5 (Flattened Device Tree) [ 10.411455] unwind_backtrace from show_stack+0x10/0x14 [ 10.416970] show_stack from dump_stack_lvl+0x40/0x4c [ 10.422313] dump_stack_lvl from __warn+0xb8/0x170 [ 10.427377] __warn from warn_slowpath_fmt+0x70/0x9c [ 10.432595] warn_slowpath_fmt from _regulator_disable+0x40/0x164 [ 10.439037] _regulator_disable from regulator_disable+0x30/0x64 [ 10.445382] regulator_disable from dwc3_omap_set_mailbox+0x8c/0xf0 [dwc3_omap] [ 10.453116] dwc3_omap_set_mailbox [dwc3_omap] from dwc3_omap_probe+0x2b8/0x394 [dwc3_omap] [ 10.467021] dwc3_omap_probe [dwc3_omap] from platform_probe+0x58/0xa8 [ 10.481762] platform_probe from really_probe+0x168/0x2fc [ 10.481782] really_probe from __driver_probe_device+0xc4/0xd8 [ 10.481782] __driver_probe_device from driver_probe_device+0x24/0xa4 [ 10.503762] driver_probe_device from __driver_attach+0xc4/0xd8 [ 10.510018] __driver_attach from bus_for_each_dev+0x64/0xa0 [ 10.516001] bus_for_each_dev from bus_add_driver+0x148/0x1a4 [ 10.524880] bus_add_driver from driver_register+0xb4/0xf8 [ 10.530678] driver_register from do_one_initcall+0x90/0x1c4 [ 10.536661] do_one_initcall from do_init_module+0x4c/0x200 [ 10.536683] do_init_module from load_module+0x13dc/0x1910 [ 10.551159] load_module from sys_finit_module+0xc8/0xd8 [ 10.561319] sys_finit_module from __sys_trace_return+0x0/0x18 [ 10.561336] Exception stack(0xc344bfa8 to 0xc344bff0) [ 10.561341] bfa0: b6fb5778 b6fab8d8 00000007 b6ecfbb8 00000000 b6ed0398 [ 10.561341] bfc0: b6fb5778 b6fab8d8 855c0500 0000017b 00020000 b6f9a3cc 00000000 b6fb5778 [ 10.595500] bfe0: bede18f8 bede18e8 b6ec9aeb b6dda1c2 [ 10.601345] ---[ end trace 0000000000000000 ]---
Fix this unnecessary warning by checking if the regulator is enabled.
--- drivers/usb/dwc3/dwc3-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-omap.c +1 -1
@@ -245,7 +245,7 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap,break ;case OMAP_DWC3_ID_FLOAT : -if (omap->vbus_reg) +if (omap->vbus_reg &®ulator_is_enabled (omap->vbus_reg))regulator_disable (omap->vbus_reg); val =dwc3_omap_read_utmi_ctrl (omap); val |=USBOTGSS_UTMI_OTG_CTRL_IDDIG ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 182/218 w1: w1_therm: fixes w1_seq for ds28ea00 sensors
In reply to Greg Kroah-HartmanFrom: Lucas Denefle <[email protected]>
[ Upstream commit 41a92a89eee819298f805c40187ad8b02bb53426 ]
w1_seq was failing due to several devices responding to the CHAIN_DONE at the same time. Now properly selects the current device in the chain with MATCH_ROM. Also acknowledgment was read twice.
--- drivers/w1/slaves/w1_therm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/w1/slaves/w1_therm.c +6 -2
@@ -589,16 +589,20 @@ static ssize_t w1_seq_show(struct device *device,if (sl->reg_num.id == reg_num->id) seq = i; +if (w1_reset_bus (sl->master)) + goto error; + +/* Put the device into chain DONE state */ +w1_write_8 (sl->master,W1_MATCH_ROM ); +w1_write_block (sl->master, (u8 *)&rn,8 );w1_write_8 (sl->master,W1_42_CHAIN );w1_write_8 (sl->master,W1_42_CHAIN_DONE );w1_write_8 (sl->master,W1_42_CHAIN_DONE_INV ); -w1_read_block (sl->master, &ack,sizeof (ack));/* check for acknowledgment */ ack =w1_read_8 (sl->master);if (ack !=W1_42_SUCCESS_CONFIRM_BYTE ) goto error; - }/* Exit from CHAIN state */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 184/218 serial: samsung_tty: do not unlock port->lock for uart_write_wakeup()
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit 988c7c00691008ea1daaa1235680a0da49dab4e8 ]
The commit c15c3747ee32 (serial: samsung: fix potential soft lockup during uart write) added an unlock of port->lock before uart_write_wakeup() and a lock after it. It was always problematic to write data from tty_ldisc_ops::write_wakeup and it was even documented that way. We fixed the line disciplines to conform to this recently. So if there is still a missed one, we should fix them instead of this workaround.
On the top of that, s3c24xx_serial_tx_dma_complete() in this driver still holds the port->lock while calling uart_write_wakeup().
So revert the wrap added by the commit above.
--- drivers/tty/serial/samsung.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/tty/serial/samsung.c +1 -4
@@ -764,11 +764,8 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id) goto out; } -if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS ) { -spin_unlock (&port->lock); +if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )uart_write_wakeup (port); -spin_lock (&port->lock); - }if (uart_circ_empty (xmit))s3c24xx_serial_stop_tx (port);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 183/218 SUNRPC/call_alloc: async tasks mustnt block waiting for memory
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
[ Upstream commit c487216bec83b0c5a8803e5c61433d33ad7b104d ]
When memory is short, new worker threads cannot be created and we depend on the minimum one rpciod thread to be able to handle everything. So it must not block waiting for memory.
mempools are particularly a problem as memory can only be released back to the mempool by an async rpc task running. If all available workqueue threads are waiting on the mempool, no thread is available to return anything.
rpc_malloc() can block, and this might cause deadlocks.
So check RPC_IS_ASYNC(), rather than RPC_IS_SWAPPER() to determine if blocking is acceptable.
--- net/sunrpc/sched.c | 4 +++- net/sunrpc/xprtrdma/transport.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
net/sunrpc/sched.c +3 -1
@@ -883,8 +883,10 @@ int rpc_malloc(struct rpc_task *task)struct rpc_buffer *buf;gfp_t gfp =GFP_NOIO | __GFP_NOWARN; +if (RPC_IS_ASYNC (task)) + gfp =GFP_NOWAIT | __GFP_NOWARN;if (RPC_IS_SWAPPER (task)) - gfp = __GFP_MEMALLOC |GFP_NOWAIT | __GFP_NOWARN; + gfp |= __GFP_MEMALLOC; size +=sizeof (struct rpc_buffer );if (size <=RPC_BUFFER_MAXSIZE )
net/sunrpc/xprtrdma/transport.c +3 -1
@@ -577,8 +577,10 @@ xprt_rdma_allocate(struct rpc_task *task)return -ENOMEM ; flags =RPCRDMA_DEF_GFP ; +if (RPC_IS_ASYNC (task)) + flags =GFP_NOWAIT | __GFP_NOWARN;if (RPC_IS_SWAPPER (task)) - flags = __GFP_MEMALLOC |GFP_NOWAIT | __GFP_NOWARN; + flags |= __GFP_MEMALLOC;if (!rpcrdma_get_rdmabuf (r_xprt, req, flags)) goto out_fail;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 181/218 init/main.c: return 1 from handled __setup() functions
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f9a40b0890658330c83c95511f9d6b396610defc ]
initcall_blacklist() should return 1 to indicate that it handled its cmdline arguments.
set_debug_rodata() should return 1 to indicate that it handled its cmdline arguments. Print a warning if the option string is invalid.
This prevents these strings from being added to the 'init' program's environment as they are not init arguments/parameters.
--- init/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
init/main.c +4 -2
@@ -705,7 +705,7 @@ static int __init initcall_blacklist(char *str) } }while (str_entry); -return 0 ; +return 1 ; } static bool __init_or_module initcall_blacklisted(initcall_t fn)
@@ -921,7 +921,9 @@ static noinline void __init kernel_init_freeable(void);bool rodata_enabled__ro_after_init = true;static int __init set_debug_rodata (char *str) { -return strtobool (str, &rodata_enabled); +if (strtobool (str, &rodata_enabled)) +pr_warn ("Invalid option string for rodata: '%s'\n" , str); +return 1 ; }__setup ("rodata=" , set_debug_rodata);#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 167/218 ptp: replace snprintf with sysfs_emit
In reply to Greg Kroah-HartmanFrom: Yang Guang <[email protected]>
[ Upstream commit e2cf07654efb0fd7bbcb475c6f74be7b5755a8fd ]
coccinelle report:
./drivers/ptp/ptp_sysfs.c:17:8-16:
WARNING: use scnprintf or sprintf
./drivers/ptp/ptp_sysfs.c:390:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
--- drivers/ptp/ptp_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ptp/ptp_sysfs.c +2 -2
@@ -26,7 +26,7 @@ static ssize_t clock_name_show(struct device *dev, struct device_attribute *attr, char *page) { struct ptp_clock *ptp = dev_get_drvdata(dev); -return snprintf (page,PAGE_SIZE -1 ,"%s\n" , ptp->info->name); +return sysfs_emit (page,"%s\n" , ptp->info->name); } static DEVICE_ATTR(clock_name, 0444, clock_name_show, NULL);
@@ -240,7 +240,7 @@ static ssize_t ptp_pin_show(struct device *dev, struct device_attribute *attr,mutex_unlock (&ptp->pincfg_mux); -return snprintf (page,PAGE_SIZE ,"%u %u\n" , func, chan); +return sysfs_emit (page,"%u %u\n" , func, chan); } static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 188/218 scsi: zorro7xx: Fix a resource leak in zorro7xx_remove_one()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 16ed828b872d12ccba8f07bcc446ae89ba662f9c ]
The error handling path of the probe releases a resource that is not freed in the remove function. In some cases, a ioremap() must be undone.
Add the missing iounmap() call in the remove function.
--- drivers/scsi/zorro7xx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/zorro7xx.c +2 -0
@@ -158,6 +158,8 @@ static void zorro7xx_remove_one(struct zorro_dev *z)scsi_remove_host (host);NCR_700_release (host); +if (host->base >0x01000000 ) +iounmap (hostdata->base);kfree (hostdata);free_irq (host->irq, host);zorro_release_device (z);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 186/218 jfs: prevent NULL deref in diFree
In reply to Greg Kroah-HartmanFrom: Haimin Zhang <[email protected]>
[ Upstream commit a53046291020ec41e09181396c1e829287b48d47 ]
Add validation check for JFS_IP(ipimap)->i_imap to prevent a NULL deref in diFree since diFree uses it without do any validations. When function jfs_mount calls diMount to initialize fileset inode allocation map, it can fail and JFS_IP(ipimap)->i_imap won't be initialized. Then it calls diFreeSpecial to close fileset inode allocation map inode and it will flow into jfs_evict_inode. Function jfs_evict_inode just validates JFS_SBI(inode->i_sb)->ipimap, then calls diFree. diFree use JFS_IP(ipimap)->i_imap directly, then it will cause a NULL deref.
--- fs/jfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/jfs/inode.c +2 -1
@@ -156,12 +156,13 @@ void jfs_evict_inode(struct inode *inode)dquot_initialize (inode);if (JFS_IP (inode)->fileset ==FILESYSTEM_I ) { +struct inode *ipimap =JFS_SBI (inode->i_sb)->ipimap;truncate_inode_pages_final (&inode->i_data);if (test_cflag (COMMIT_Freewmap, inode))jfs_free_zero_link (inode); -if (JFS_SBI (inode->i_sb)->ipimap) +if (ipimap &&JFS_IP (ipimap)->i_imap)diFree (inode);/*
Signature · 1 line
2.35.1