iio: adc: xilinx: fix potential use-after-free on remove
Subsystems (13)
Sasha Levin
maintainerPATCH 1/25 iio: adc: xilinx: fix potential use-after-free on remove
From: Sven Van Asbroeck <[email protected]>
[ Upstream commit 62039b6aef63380ba7a37c113bbaeee8a55c5342 ]
When cancel_delayed_work() returns, the delayed work may still be running. This means that the core could potentially free the private structure (struct xadc) while the delayed work is still using it. This is a potential use-after-free.
Fix by calling cancel_delayed_work_sync(), which waits for any residual work to finish before returning.
--- drivers/iio/adc/xilinx-xadc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/xilinx-xadc-core.c +1 -1
@@ -1299,7 +1299,7 @@ static int xadc_remove(struct platform_device *pdev) }free_irq (irq, indio_dev);clk_disable_unprepare (xadc->clk); -cancel_delayed_work (&xadc->zynq_unmask_work); +cancel_delayed_work_sync (&xadc->zynq_unmask_work);kfree (xadc->data);kfree (indio_dev->channels);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/25 libnvdimm/namespace: Fix a potential NULL pointer dereference
From: Kangjie Lu <[email protected]>
[ Upstream commit 55c1fc0af29a6c1b92f217b7eb7581a882e0c07c ]
In case kmemdup fails, the fix goes to blk_err to avoid NULL pointer dereference.
--- drivers/nvdimm/namespace_devs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvdimm/namespace_devs.c +4 -1
@@ -2028,9 +2028,12 @@ struct device *create_namespace_blk(struct nd_region *nd_region,if (!nsblk->uuid) goto blk_err;memcpy (name, nd_label->name,NSLABEL_NAME_LEN ); -if (name[0 ]) +if (name[0 ]) { nsblk->alt_name =kmemdup (name,NSLABEL_NAME_LEN ,GFP_KERNEL ); +if (!nsblk->alt_name) + goto blk_err; + } res =nsblk_add_resource (nd_region, ndd, nsblk,__le64_to_cpu (nd_label->dpa));if (!res)
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Sasha Levin
maintainerPATCH 3/25 HID: input: add mapping for Expose/Overview key
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 96dd86871e1fffbc39e4fa61c9c75ec54ee9af0f ]
According to HUTRR77 usage 0x29f from the consumer page is reserved for the Desktop application to present all running user’s application windows. Linux defines KEY_SCALE to request Compiz Scale (Expose) mode, so let's add the mapping.
--- drivers/hid/hid-input.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/hid-input.c +2 -0
@@ -932,6 +932,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielcase 0x2cb :map_key_clear (KEY_KBDINPUTASSIST_ACCEPT );break ;case 0x2cc :map_key_clear (KEY_KBDINPUTASSIST_CANCEL );break ; +case 0x29f :map_key_clear (KEY_SCALE );break ; +default :map_key_clear (KEY_UNKNOWN ); }break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/25 HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 7975a1d6a7afeb3eb61c971a153d24dd8fa032f3 ]
According to HUTRR73 usages 0x79, 0x7a and 0x7c from the consumer page correspond to Brightness Up/Down/Toggle keys, so let's add the mappings.
--- drivers/hid/hid-input.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hid/hid-input.c +4 -0
@@ -802,6 +802,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielcase 0x074 :map_key_clear (KEY_BRIGHTNESS_MAX );break ;case 0x075 :map_key_clear (KEY_BRIGHTNESS_AUTO );break ; +case 0x079 :map_key_clear (KEY_KBDILLUMUP );break ; +case 0x07a :map_key_clear (KEY_KBDILLUMDOWN );break ; +case 0x07c :map_key_clear (KEY_KBDILLUMTOGGLE );break ; +case 0x082 :map_key_clear (KEY_VIDEO_NEXT );break ;case 0x083 :map_key_clear (KEY_LAST );break ;case 0x084 :map_key_clear (KEY_ENTER );break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/25 HID: input: add mapping for "Toggle Display" key
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit c01908a14bf735b871170092807c618bb9dae654 ]
According to HUT 1.12 usage 0xb5 from the generic desktop page is reserved for switching between external and internal display, so let's add the mapping.
--- drivers/hid/hid-input.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/hid/hid-input.c +8 -0
@@ -607,6 +607,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fielbreak ; } +if ((usage->hid &0xf0 ) ==0xb0 ) {/* SC - Display */ +switch (usage->hid &0xf ) { +case 0x05 :map_key_clear (KEY_SWITCHVIDEOMODE );break ; +default : goto ignore; + } +break ; + } +/* * Some lazy vendors declare 255 usages for System Control, * leading to the creation of ABS_X|Y axis and too many others.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/25 libnvdimm/btt: Fix a kmemdup failure check
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 486fa92df4707b5df58d6508728bdb9321a59766 ]
In case kmemdup fails, the fix releases resources and returns to avoid the NULL pointer dereference.
--- drivers/nvdimm/btt_devs.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/nvdimm/btt_devs.c +13 -5
@@ -190,14 +190,15 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,return NULL ; nd_btt->id =ida_simple_get (&nd_region->btt_ida,0 ,0 ,GFP_KERNEL ); -if (nd_btt->id <0 ) { -kfree (nd_btt); -return NULL ; - } +if (nd_btt->id <0 ) + goto out_nd_btt; nd_btt->lbasize = lbasize; -if (uuid) +if (uuid) { uuid =kmemdup (uuid,16 ,GFP_KERNEL ); +if (!uuid) + goto out_put_id; + } nd_btt->uuid = uuid; dev = &nd_btt->dev;dev_set_name (dev,"btt%d.%d" , nd_region->id, nd_btt->id);
@@ -212,6 +213,13 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,return NULL ; }return dev; + +out_put_id: +ida_simple_remove (&nd_region->btt_ida, nd_btt->id); + +out_nd_btt: +kfree (nd_btt); +return NULL ; }struct device *nd_btt_create (struct nd_region *nd_region)
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Sasha Levin
maintainerPATCH 7/25 s390/dasd: Fix capacity calculation for large volumes
In reply to Sasha LevinFrom: Peter Oberparleiter <[email protected]>
[ Upstream commit 2cc9637ce825f3a9f51f8f78af7474e9e85bfa5f ]
The DASD driver incorrectly limits the maximum number of blocks of ECKD DASD volumes to 32 bit numbers. Volumes with a capacity greater than 2^32-1 blocks are incorrectly recognized as smaller volumes.
This results in the following volume capacity limits depending on the formatted block size:
BLKSIZE MAX_GB MAX_CYL
512 2047 5843492
1024 4095 8676701
2048 8191 13634816
4096 16383 23860929The same problem occurs when a volume with more than 17895697 cylinders is accessed in raw-track-access mode.
Fix this problem by adding an explicit type cast when calculating the maximum number of blocks.
--- drivers/s390/block/dasd_eckd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/s390/block/dasd_eckd.c +3 -3
@@ -2054,14 +2054,14 @@ static int dasd_eckd_end_analysis(struct dasd_block *block) blk_per_trk =recs_per_track (&private->rdc_data,0 , block->bp_block); raw: - block->blocks = (private->real_cyl * + block->blocks = ((unsigned long ) private->real_cyl * private->rdc_data.trk_per_cyl * blk_per_trk); dev_info(&device->cdev->dev, - "DASD with %d KB/block, %d KB total size, %d KB/track, " + "DASD with %u KB/block, %lu KB total size, %u KB/track, " "%s\n", (block->bp_block >> 10), - ((private->real_cyl * + (((unsigned long) private->real_cyl * private->rdc_data.trk_per_cyl * blk_per_trk * (block->bp_block >> 9)) >> 1), ((blk_per_trk * block->bp_block) >> 10),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/25 mac80211: fix unaligned access in mesh table hash function
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 40586e3fc400c00c11151804dcdc93f8c831c808 ]
The pointer to the last four bytes of the address is not guaranteed to be aligned, so we need to use __get_unaligned_cpu32 here
--- net/mac80211/mesh_pathtbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mesh_pathtbl.c +1 -1
@@ -23,7 +23,7 @@ static void mesh_path_free_rcu(struct mesh_table *tbl, struct mesh_path *mpath);static u32 mesh_table_hash (const void *addr,u32 len,u32 seed) {/* Use last four bytes of hw addr as hash index */ -return jhash_1word (*(u32 *)(addr+2 ), seed); +return jhash_1word (__get_unaligned_cpu32 ((u8 *)addr +2 ), seed); }static const struct rhashtable_params mesh_rht_params = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/25 Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
In reply to Sasha LevinFrom: Anson Huang <[email protected]>
[ Upstream commit bf2a7ca39fd3ab47ef71c621a7ee69d1813b1f97 ]
SNVS IRQ is requested before necessary driver data initialized, if there is a pending IRQ during driver probe phase, kernel NULL pointer panic will occur in IRQ handler. To avoid such scenario, just initialize necessary driver data before enabling IRQ. This patch is inspired by NXP's internal kernel tree.
--- drivers/input/keyboard/snvs_pwrkey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/input/keyboard/snvs_pwrkey.c +3 -3
@@ -156,6 +156,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)return error; } + pdata->input = input; +platform_set_drvdata (pdev, pdata); + error =devm_request_irq (&pdev->dev, pdata->irq, imx_snvs_pwrkey_interrupt,0 , pdev->name, pdev);
@@ -171,9 +174,6 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)return error; } - pdata->input = input; -platform_set_drvdata (pdev, pdata); -device_init_wakeup (&pdev->dev, pdata->wakeup);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/25 s390/3270: fix lockdep false positive on view->lock
In reply to Sasha LevinFrom: Martin Schwidefsky <[email protected]>
[ Upstream commit 5712f3301a12c0c3de9cc423484496b0464f2faf ]
The spinlock in the raw3270_view structure is used by con3270, tty3270 and fs3270 in different ways. For con3270 the lock can be acquired in irq context, for tty3270 and fs3270 the highest context is bh.
Lockdep sees the view->lock as a single class and if the 3270 driver is used for the console the following message is generated:
WARNING: inconsistent lock state
5.1.0-rc3-05157-g5c168033979d #12 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
swapper/0/1 [HC0[0]:SC1[1]:HE1:SE0] takes:
(____ptrval____) (&(&view->lock)->rlock){?.-.}, at: tty3270_update+0x7c/0x330
Introduce a lockdep subclass for the view lock to distinguish bh from irq locks.
--- drivers/s390/char/con3270.c | 2 +- drivers/s390/char/fs3270.c | 3 ++- drivers/s390/char/raw3270.c | 3 ++- drivers/s390/char/raw3270.h | 4 +++- drivers/s390/char/tty3270.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-)
drivers/s390/char/con3270.c +1 -1
@@ -628,7 +628,7 @@ con3270_init(void) (void (*)(unsigned long )) con3270_read_tasklet, (unsigned long) condev->read); -raw3270_add_view (&condev->view, &con3270_fn,1 ); +raw3270_add_view (&condev->view, &con3270_fn,1 ,RAW3270_VIEW_LOCK_IRQ );INIT_LIST_HEAD (&condev->freemem);for (i =0 ; i <CON3270_STRING_PAGES ; i++) {
drivers/s390/char/fs3270.c +2 -1
@@ -462,7 +462,8 @@ fs3270_open(struct inode *inode, struct file *filp)init_waitqueue_head (&fp->wait); fp->fs_pid =get_pid (task_pid (current)); - rc =raw3270_add_view (&fp->view, &fs3270_fn, minor); + rc =raw3270_add_view (&fp->view, &fs3270_fn, minor, +RAW3270_VIEW_LOCK_BH );if (rc) {fs3270_free_view (&fp->view); goto out;
drivers/s390/char/raw3270.c +2 -1
@@ -919,7 +919,7 @@ raw3270_deactivate_view(struct raw3270_view *view)* Add view to device with minor "minor". */ int -raw3270_add_view (struct raw3270_view *view,struct raw3270_fn *fn,int minor) +raw3270_add_view (struct raw3270_view *view,struct raw3270_fn *fn,int minor,int subclass) {unsigned long flags;struct raw3270 *rp;
@@ -941,6 +941,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor) view->cols = rp->cols; view->ascebc = rp->ascebc;spin_lock_init (&view->lock); +lockdep_set_subclass (&view->lock, subclass);list_add (&view->list, &rp->view_list); rc =0 ;spin_unlock_irqrestore (get_ccwdev_lock (rp->cdev), flags);
drivers/s390/char/raw3270.h +3 -1
@@ -149,6 +149,8 @@ struct raw3270_fn {struct raw3270_view {struct list_head list;spinlock_t lock; +#define RAW3270_VIEW_LOCK_IRQ 0 +#define RAW3270_VIEW_LOCK_BH 1atomic_t ref_count;struct raw3270 *dev;struct raw3270_fn *fn;
@@ -157,7 +159,7 @@ struct raw3270_view {unsigned char *ascebc;/* ascii -> ebcdic table */ }; -int raw3270_add_view (struct raw3270_view *,struct raw3270_fn *,int ); +int raw3270_add_view (struct raw3270_view *,struct raw3270_fn *,int ,int );int raw3270_activate_view (struct raw3270_view *);void raw3270_del_view (struct raw3270_view *);void raw3270_deactivate_view (struct raw3270_view *);
drivers/s390/char/tty3270.c +2 -1
@@ -978,7 +978,8 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)return PTR_ERR (tp); rc =raw3270_add_view (&tp->view, &tty3270_fn, - tty->index +RAW3270_FIRSTMINOR ); + tty->index +RAW3270_FIRSTMINOR , +RAW3270_VIEW_LOCK_BH );if (rc) {tty3270_free_view (tp);return rc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/25 mISDN: Check address length before reading address family
In reply to Sasha LevinFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 238ffdc49ef98b15819cfd5e3fb23194e3ea3d39 ]
KMSAN will complain if valid address length passed to bind() is shorter than sizeof("struct sockaddr_mISDN"->family) bytes.
--- drivers/isdn/mISDN/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/isdn/mISDN/socket.c +2 -2
@@ -712,10 +712,10 @@ base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)struct sock *sk = sock->sk;int err =0 ; -if (!maddr || maddr->family !=AF_ISDN ) +if (addr_len <sizeof (struct sockaddr_mISDN ))return -EINVAL ; -if (addr_len <sizeof (struct sockaddr_mISDN )) +if (!maddr || maddr->family !=AF_ISDN )return -EINVAL ;lock_sock (sk);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/25 x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T
In reply to Sasha LevinFrom: Jian-Hong Pan <[email protected]>
[ Upstream commit 0082517fa4bce073e7cf542633439f26538a14cc ]
Upon reboot, the Acer TravelMate X514-51T laptop appears to complete the shutdown process, but then it hangs in BIOS POST with a black screen.
The problem is intermittent - at some points it has appeared related to Secure Boot settings or different kernel builds, but ultimately we have not been able to identify the exact conditions that trigger the issue to come and go.
Besides, the EFI mode cannot be disabled in the BIOS of this model.
However, after extensive testing, we observe that using the EFI reboot method reliably avoids the issue in all cases.
So add a boot time quirk to use EFI reboot on such systems.
--- arch/x86/kernel/reboot.c | 21 +++++++++++++++++++++ include/linux/efi.h | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-)
arch/x86/kernel/reboot.c +21 -0
@@ -82,6 +82,19 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)return 0 ; } +/* +* Some machines don't handle the default ACPI reboot method and +* require the EFI reboot method: +*/ +static int __init set_efi_reboot (const struct dmi_system_id *d) +{ +if (reboot_type !=BOOT_EFI && !efi_runtime_disabled ()) { + reboot_type =BOOT_EFI ; +pr_info ("%s series board detected. Selecting EFI-method for reboot.\n" , d->ident); + } +return 0 ; +} +void __noreturn machine_real_restart (unsigned int type) {local_irq_disable ();
@@ -167,6 +180,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"), }, }, + { /* Handle reboot issue on Acer TravelMate X514-51T */ + .callback = set_efi_reboot, + .ident = "Acer TravelMate X514-51T", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate X514-51T"), + }, + },/* Apple */ {/* Handle problems with rebooting on Apple MacBook5 */
include/linux/efi.h +6 -1
@@ -1433,7 +1433,12 @@ efi_status_t efi_setup_gop(efi_system_table_t *sys_table_arg, struct screen_info *si, efi_guid_t *proto, unsigned long size); -bool efi_runtime_disabled (void ); +#ifdef CONFIG_EFI +extern bool efi_runtime_disabled (void ); +#else +static inline bool efi_runtime_disabled (void ) {return true; } +#endif +extern void efi_call_virt_check_flags (unsigned long flags,const char *call);/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/25 KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing
In reply to Sasha LevinFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit 7a223e06b1a411cef6c4cd7a9b9a33c8d225b10e ]
In __apic_accept_irq() interface trig_mode is int and actually on some code paths it is set above u8:
kvm_apic_set_irq() extracts it from 'struct kvm_lapic_irq' where trig_mode is u16. This is done on purpose as e.g. kvm_set_msi_irq() sets it to (1 << 15) & e->msi.data
kvm_apic_local_deliver sets it to reg & (1 << 15).
Fix the immediate issue by making 'tm' into u16. We may also want to adjust __apic_accept_irq() interface and use proper sizes for vector, level, trig_mode but this is not urgent.
--- arch/x86/kvm/trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/trace.h +2 -2
@@ -434,13 +434,13 @@ TRACE_EVENT(kvm_apic_ipi, ); TRACE_EVENT(kvm_apic_accept_irq, - TP_PROTO(__u32 apicid, __u16 dm, __u8 tm, __u8 vec), + TP_PROTO(__u32 apicid, __u16 dm, __u16 tm, __u8 vec), TP_ARGS(apicid, dm, tm, vec), TP_STRUCT__entry( __field( __u32, apicid ) __field( __u16, dm ) - __field( __u8, tm ) + __field( __u16, tm ) __field( __u8, vec ) ),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/25 tools lib traceevent: Fix missing equality check for strcmp
In reply to Sasha LevinFrom: Rikard Falkeborn <[email protected]>
[ Upstream commit f32c2877bcb068a718bb70094cd59ccc29d4d082 ]
There was a missing comparison with 0 when checking if type is "s64" or "u64". Therefore, the body of the if-statement was entered if "type" was "u64" or not "s64", which made the first strcmp() redundant since if type is "u64", it's not "s64".
If type is "s64", the body of the if-statement is not entered but since the remainder of the function consists of if-statements which will not be entered if type is "s64", we will just return "val", which is correct, albeit at the cost of a few more calls to strcmp(), i.e., it will behave just as if the if-statement was entered.
If type is neither "s64" or "u64", the body of the if-statement will be entered incorrectly and "val" returned. This means that any type that is checked after "s64" and "u64" is handled the same way as "s64" and "u64", i.e., the limiting of "val" to fit in for example "s8" is never reached.
This was introduced in the kernel tree when the sources were copied from trace-cmd in commit f7d82350e597 ("tools/events: Add files to create libtraceevent.a"), and in the trace-cmd repo in 1cdbae6035cei ("Implement typecasting in parser") when the function was introduced, i.e., it has always behaved the wrong way.
Detected by cppcheck.
--- tools/lib/traceevent/event-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/traceevent/event-parse.c +1 -1
@@ -2204,7 +2204,7 @@ eval_type_str(unsigned long long val, const char *type, int pointer)return val &0xffffffff ;if (strcmp (type,"u64" ) ==0 || -strcmp (type,"s64" )) +strcmp (type,"s64" ) ==0 )return val;if (strcmp (type,"s8" ) ==0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/25 init: initialize jump labels before command line option parsing
In reply to Sasha LevinFrom: Dan Williams <[email protected]>
[ Upstream commit 6041186a32585fc7a1d0f6cfe2f138b05fdc3c82 ]
When a module option, or core kernel argument, toggles a static-key it requires jump labels to be initialized early. While x86, PowerPC, and ARM64 arrange for jump_label_init() to be called before parse_args(), ARM does not.
Kernel command line: rdinit=/sbin/init page_alloc.shuffle=1 panic=-1 console=ttyAMA0,115200 page_alloc.shuffle=1
------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at ./include/linux/jump_label.h:303 page_alloc_shuffle+0x12c/0x1ac static_key_enable(): static key 'page_alloc_shuffle_key+0x0/0x4' used before call to jump_label_init() Modules linked in: CPU: 0 PID: 0 Comm: swapper Not tainted 5.1.0-rc4-next-20190410-00003-g3367c36ce744 #1 Hardware name: ARM Integrator/CP (Device Tree) [<c0011c68>] (unwind_backtrace) from [<c000ec48>] (show_stack+0x10/0x18) [<c000ec48>] (show_stack) from [<c07e9710>] (dump_stack+0x18/0x24) [<c07e9710>] (dump_stack) from [<c001bb1c>] (__warn+0xe0/0x108) [<c001bb1c>] (__warn) from [<c001bb88>] (warn_slowpath_fmt+0x44/0x6c) [<c001bb88>] (warn_slowpath_fmt) from [<c0b0c4a8>] (page_alloc_shuffle+0x12c/0x1ac) [<c0b0c4a8>] (page_alloc_shuffle) from [<c0b0c550>] (shuffle_store+0x28/0x48) [<c0b0c550>] (shuffle_store) from [<c003e6a0>] (parse_args+0x1f4/0x350) [<c003e6a0>] (parse_args) from [<c0ac3c00>] (start_kernel+0x1c0/0x488)
Move the fallback call to jump_label_init() to occur before parse_args().
The redundant calls to jump_label_init() in other archs are left intact in case they have static key toggling use cases that are even earlier than option parsing.
--- init/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
init/main.c +2 -2
@@ -516,6 +516,8 @@ asmlinkage __visible void __init start_kernel(void)page_alloc_init ();pr_notice ("Kernel command line: %s\n" , boot_command_line); +/* parameters may set static keys */ +jump_label_init ();parse_early_param (); after_dashes = parse_args("Booting kernel", static_command_line, __start___param,
@@ -525,8 +527,6 @@ asmlinkage __visible void __init start_kernel(void)parse_args ("Setting init args" , after_dashes,NULL ,0 ,-1 ,-1 ,NULL , set_init_arg); -jump_label_init (); -/* * These use large bootmem allocations and must precede * kmem_cache_init()
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/25 selftests: netfilter: check icmp pkttoobig errors are set as related
In reply to Sasha LevinFrom: Florian Westphal <fw at strlen.de>
[ Upstream commit becf2319f320cae43e20cf179cc51a355a0deb5f ]
When an icmp error such as pkttoobig is received, conntrack checks if the "inner" header (header of packet that did not fit link mtu) is matches an existing connection, and, if so, sets that packet as being related to the conntrack entry it found.
It was recently reported that this "related" setting also works if the inner header is from another, different connection (i.e., artificial/forged icmp error).
Add a test, followup patch will add additional "inner dst matches outer dst in reverse direction" check before setting related state.
--- tools/testing/selftests/netfilter/Makefile | 2 +- .../netfilter/conntrack_icmp_related.sh | 283 ++++++++++++++++++ 2 files changed, 284 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/netfilter/conntrack_icmp_related.sh
tools/testing/selftests/netfilter/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for netfilter selftests -TEST_PROGS := nft_trans_stress.sh nft_nat.sh +TEST_PROGS := nft_trans_stress.sh nft_nat.sh conntrack_icmp_related.sh include ../lib.mk
tools/testing/selftests/netfilter/conntrack_icmp_related.sh new file +283 -0
283 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/25 ipvs: do not schedule icmp errors from tunnels
In reply to Sasha LevinFrom: Julian Anastasov <[email protected]>
[ Upstream commit 0261ea1bd1eb0da5c0792a9119b8655cf33c80a3 ]
We can receive ICMP errors from client or from
tunneling real server. While the former can be
scheduled to real server, the latter should
not be scheduled, they are decapsulated only when
existing connection is found.
--- net/netfilter/ipvs/ip_vs_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -1643,7 +1643,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (!cp) {int v; -if (!sysctl_schedule_icmp (ipvs)) +if (ipip || !sysctl_schedule_icmp (ipvs))return NF_ACCEPT ;if (!ip_vs_try_to_schedule (ipvs,AF_INET , skb, pd, &v, &cp, &ciph))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/25 MIPS: perf: ath79: Fix perfcount IRQ assignment
In reply to Sasha LevinFrom: Petr Štetiar <[email protected]>
[ Upstream commit a1e8783db8e0d58891681bc1e6d9ada66eae8e20 ]
Currently it's not possible to use perf on ath79 due to genirq flags mismatch happening on static virtual IRQ 13 which is used for performance counters hardware IRQ 5.
On TP-Link Archer C7v5:
CPU0
2: 0 MIPS 2 ath9k 4: 318 MIPS 4 19000000.eth 7: 55034 MIPS 7 timer 8: 1236 MISC 3 ttyS0 12: 0 INTC 1 ehci_hcd:usb1 13: 0 gpio-ath79 2 keys 14: 0 gpio-ath79 5 keys 15: 31 AR724X PCI 1 ath10k_pci
$ perf top genirq: Flags mismatch irq 13. 00014c83 (mips_perf_pmu) vs. 00002003 (keys)
On TP-Link Archer C7v4:
CPU0
4: 0 MIPS 4 19000000.eth 5: 7135 MIPS 5 1a000000.eth 7: 98379 MIPS 7 timer 8: 30 MISC 3 ttyS0 12: 90028 INTC 0 ath9k 13: 5520 INTC 1 ehci_hcd:usb1 14: 4623 INTC 2 ehci_hcd:usb2 15: 32844 AR724X PCI 1 ath10k_pci 16: 0 gpio-ath79 16 keys 23: 0 gpio-ath79 23 keys
$ perf top genirq: Flags mismatch irq 13. 00014c80 (mips_perf_pmu) vs. 00000080 (ehci_hcd:usb1)
This problem is happening, because currently statically assigned virtual IRQ 13 for performance counters is not claimed during the initialization of MIPS PMU during the bootup, so the IRQ subsystem doesn't know, that this interrupt isn't available for further use.
So this patch fixes the issue by simply booking hardware IRQ 5 for MIPS PMU.
--- arch/mips/ath79/setup.c | 6 ------ drivers/irqchip/irq-ath79-misc.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)
arch/mips/ath79/setup.c +0 -6
@@ -183,12 +183,6 @@ const char *get_system_type(void)return ath79_sys_type; } -int get_c0_perfcount_int (void ) -{ -return ATH79_MISC_IRQ (5 ); -} -EXPORT_SYMBOL_GPL (get_c0_perfcount_int); -unsigned int get_c0_compare_int (void ) {return CP0_LEGACY_COMPARE_IRQ ;
drivers/irqchip/irq-ath79-misc.c +11 -0
@@ -22,6 +22,15 @@#define AR71XX_RESET_REG_MISC_INT_ENABLE 4#define ATH79_MISC_IRQ_COUNT 32 +#define ATH79_MISC_PERF_IRQ 5 + +static int ath79_perfcount_irq; + +int get_c0_perfcount_int (void ) +{ +return ath79_perfcount_irq; +} +EXPORT_SYMBOL_GPL (get_c0_perfcount_int);static void ath79_misc_irq_handler (struct irq_desc *desc) {
@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domain_init( {void __iomem *base = domain->host_data; + ath79_perfcount_irq =irq_create_mapping (domain,ATH79_MISC_PERF_IRQ ); +/* Disable and clear all interrupts */ __raw_writel (0 , base +AR71XX_RESET_REG_MISC_INT_ENABLE );__raw_writel (0 , base +AR71XX_RESET_REG_MISC_INT_STATUS );
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.9 18/25] MIPS: perf: ath79: Fix perfcount IRQ assignment
Hi,
Karl has reported to me today, that he's experiencing weird reboot hang on his devices with 4.9.180 kernel and that he has bisected it down to my backported patch.
I would like to kindly ask you for removal of this patch. This patch should be reverted from all stable kernels up to 5.1, because perf counters were not broken on those kernels, and this patch won't work on the ath79 legacy IRQ code anyway, it needs new irqchip driver which was enabled on ath79 with commit 51fa4f8912c0 ("MIPS: ath79: drop legacy IRQ code").
Thanks!
Cheers,
Petr
Re: [PATCH AUTOSEL 4.9 18/25] MIPS: perf: ath79: Fix perfcount IRQ assignment
Quoted 11 lines · Petr Štetiar
Hi,
Karl has reported to me today, that he's experiencing weird reboot hang on his devices with 4.9.180 kernel and that he has bisected it down to my backported patch.
I would like to kindly ask you for removal of this patch. This patch should be reverted from all stable kernels up to 5.1, because perf counters were not broken on those kernels, and this patch won't work on the ath79 legacy IRQ code anyway, it needs new irqchip driver which was enabled on ath79 with commit
51fa4f8912c0("MIPS: ath79: drop legacy IRQ code").
Thanks for the report, I'll go revert this from everywhere.
greg k-h
Sasha Levin
maintainerPATCH 19/25 s390: ctcm: fix ctcm_new_device error return code
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 27b141fc234a3670d21bd742c35d7205d03cbb3a ]
clang points out that the return code from this function is undefined for one of the error paths:
../drivers/s390/net/ctcm_main.c:1595:7: warning: variable 'result' is used uninitialized whenever 'if' condition is true
[-Wsometimes-uninitialized]
if (priv->channel[direction] == NULL) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/s390/net/ctcm_main.c:1638:9: note: uninitialized use occurs here
return result;
^~~~~~
../drivers/s390/net/ctcm_main.c:1595:3: note: remove the 'if' if its condition is always false
if (priv->channel[direction] == NULL) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/s390/net/ctcm_main.c:1539:12: note: initialize the variable 'result' to silence this warning
int result;
^Make it return -ENODEV here, as in the related failure cases. gcc has a known bug in underreporting some of these warnings when it has already eliminated the assignment of the return code based on some earlier optimization step.
--- drivers/s390/net/ctcm_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/net/ctcm_main.c +1 -0
@@ -1595,6 +1595,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)if (priv->channel[direction] ==NULL ) {if (direction ==CTCM_WRITE )channel_free (priv->channel[CTCM_READ ]); + result = -ENODEV ; goto out_dev; } priv->channel[direction]->netdev = dev;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/25 drm/sun4i: Set device driver data at bind time for use in unbind
In reply to Sasha LevinFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit 02b92adbe33e6dbd15dc6e32540b22f47c4ff0a2 ]
Our sun4i_drv_unbind gets the drm device using dev_get_drvdata. However, that driver data is never set in sun4i_drv_bind.
Set it there to avoid getting a NULL pointer at unbind time.
--- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/sun4i/sun4i_drv.c +2 -0
@@ -137,6 +137,8 @@ static int sun4i_drv_bind(struct device *dev) ret = -ENOMEM ; goto free_drm; } + +dev_set_drvdata (dev, drm); drm->dev_private = drv;drm_vblank_init (drm,1 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/25 selftests/net: correct the return value for run_netsocktests
In reply to Sasha LevinFrom: Po-Hsu Lin <[email protected]>
[ Upstream commit 30c04d796b693e22405c38e9b78e9a364e4c77e6 ]
The run_netsocktests will be marked as passed regardless the actual test result from the ./socket:
selftests: net: run_netsocktests
========================================
--------------------
running socket test
--------------------
[FAIL]
ok 1..6 selftests: net: run_netsocktests [PASS]This is because the test script itself has been successfully executed. Fix this by exit 1 when the test failed.
--- tools/testing/selftests/net/run_netsocktests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/run_netsocktests +1 -1
@@ -6,7 +6,7 @@ echo "--------------------" ./socket if [ $? -ne 0 ]; then echo "[FAIL]" + exit 1 else echo "[PASS]" fi -
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/25 gpu: ipu-v3: dp: fix CSC handling
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit d4fad0a426c6e26f48c9a7cdd21a7fe9c198d645 ]
Initialize the flow input colorspaces to unknown and reset to that value when the channel gets disabled. This avoids the state getting mixed up with a previous mode.
Also keep the CSC settings for the background flow intact when disabling the foreground flow.
--- drivers/gpu/ipu-v3/ipu-dp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-dp.c +9 -3
@@ -195,7 +195,8 @@ int ipu_dp_setup_channel(struct ipu_dp *dp,ipu_dp_csc_init (flow, flow->foreground.in_cs, flow->out_cs,DP_COM_CONF_CSC_DEF_BOTH ); }else { -if (flow->foreground.in_cs == flow->out_cs) +if (flow->foreground.in_cs ==IPUV3_COLORSPACE_UNKNOWN || + flow->foreground.in_cs == flow->out_cs)/* * foreground identical to output, apply color * conversion on background
@@ -261,6 +262,8 @@ void ipu_dp_disable_channel(struct ipu_dp *dp)struct ipu_dp_priv *priv = flow->priv;u32 reg, csc; + dp->in_cs =IPUV3_COLORSPACE_UNKNOWN ; +if (!dp->foreground)return ;
@@ -268,8 +271,9 @@ void ipu_dp_disable_channel(struct ipu_dp *dp) reg =readl (flow->base +DP_COM_CONF ); csc = reg &DP_COM_CONF_CSC_DEF_MASK ; -if (csc ==DP_COM_CONF_CSC_DEF_FG ) - reg &= ~DP_COM_CONF_CSC_DEF_MASK ; + reg &= ~DP_COM_CONF_CSC_DEF_MASK ; +if (csc ==DP_COM_CONF_CSC_DEF_BOTH || csc ==DP_COM_CONF_CSC_DEF_BG ) + reg |=DP_COM_CONF_CSC_DEF_BG ; reg &= ~DP_COM_CONF_FG_EN ;writel (reg, flow->base +DP_COM_CONF );
@@ -350,6 +354,8 @@ int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, unsigned long base)mutex_init (&priv->mutex);for (i =0 ; i <IPUV3_NUM_FLOWS ; i++) { + priv->flow[i].background.in_cs =IPUV3_COLORSPACE_UNKNOWN ; + priv->flow[i].foreground.in_cs =IPUV3_COLORSPACE_UNKNOWN ; priv->flow[i].foreground.foreground = true; priv->flow[i].base = priv->base + ipu_dp_flow_base[i]; priv->flow[i].priv = priv;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 23/25 spi: Micrel eth switch: declare missing of table
In reply to Sasha LevinFrom: Daniel Gomez <[email protected]>
[ Upstream commit 2f23a2a768bee7ad2ff1e9527c3f7e279e794a46 ]
Add missing <of_device_id> table for SPI driver relying on SPI device match since compatible is in a DT binding or in a DTS.
Before this patch:
modinfo drivers/net/phy/spi_ks8995.ko | grep alias
alias: spi:ksz8795 alias: spi:ksz8864 alias: spi:ks8995
After this patch:
modinfo drivers/net/phy/spi_ks8995.ko | grep alias
alias: spi:ksz8795 alias: spi:ksz8864 alias: spi:ks8995 alias: of:N*T*Cmicrel,ksz8795C* alias: of:N*T*Cmicrel,ksz8795 alias: of:N*T*Cmicrel,ksz8864C* alias: of:N*T*Cmicrel,ksz8864 alias: of:N*T*Cmicrel,ks8995C* alias: of:N*T*Cmicrel,ks8995
--- drivers/net/phy/spi_ks8995.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/phy/spi_ks8995.c +9 -0
@@ -162,6 +162,14 @@ static const struct spi_device_id ks8995_id[] = { };MODULE_DEVICE_TABLE (spi, ks8995_id); +static const struct of_device_id ks8895_spi_of_match[] = { + { .compatible ="micrel,ks8995" }, + { .compatible ="micrel,ksz8864" }, + { .compatible ="micrel,ksz8795" }, + { }, + }; +MODULE_DEVICE_TABLE (of, ks8895_spi_of_match); +static inline u8 get_chip_id (u8 val) {return (val >>ID1_CHIPID_S ) &ID1_CHIPID_M ;
@@ -529,6 +537,7 @@ static int ks8995_remove(struct spi_device *spi)static struct spi_driver ks8995_driver = { .driver = { .name ="spi-ks8995" , + .of_match_table =of_match_ptr (ks8895_spi_of_match), }, .probe = ks8995_probe, .remove = ks8995_remove,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/25 spi: ST ST95HF NFC: declare missing of table
In reply to Sasha LevinFrom: Daniel Gomez <[email protected]>
[ Upstream commit d04830531d0c4a99c897a44038e5da3d23331d2f ]
Add missing <of_device_id> table for SPI driver relying on SPI device match since compatible is in a DT binding or in a DTS.
Before this patch:
modinfo drivers/nfc/st95hf/st95hf.ko | grep alias
alias: spi:st95hf
After this patch:
modinfo drivers/nfc/st95hf/st95hf.ko | grep alias
alias: spi:st95hf alias: of:N*T*Cst,st95hfC* alias: of:N*T*Cst,st95hf
--- drivers/nfc/st95hf/core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/nfc/st95hf/core.c +7 -0
@@ -1074,6 +1074,12 @@ static const struct spi_device_id st95hf_id[] = { };MODULE_DEVICE_TABLE (spi, st95hf_id); +static const struct of_device_id st95hf_spi_of_match[] = { + { .compatible ="st,st95hf" }, + { }, +}; +MODULE_DEVICE_TABLE (of, st95hf_spi_of_match); +static int st95hf_probe (struct spi_device *nfc_spi_dev) {int ret;
@@ -1260,6 +1266,7 @@ static struct spi_driver st95hf_driver = { .driver = { .name = "st95hf", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(st95hf_spi_of_match), }, .id_table = st95hf_id, .probe = st95hf_probe,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/25 Input: synaptics-rmi4 - fix possible double free
In reply to Sasha LevinFrom: Pan Bian <[email protected]>
[ Upstream commit bce1a78423961fce676ac65540a31b6ffd179e6d ]
The RMI4 function structure has been released in rmi_register_function if error occurs. However, it will be released again in the function rmi_create_function, which may result in a double-free bug.
--- drivers/input/rmi4/rmi_driver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/input/rmi4/rmi_driver.c +1 -5
@@ -772,7 +772,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev, error =rmi_register_function (fn);if (error) - goto err_put_fn; +return error;if (pdt->function_number ==0x01 ) data->f01_container = fn;
@@ -780,10 +780,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev,list_add_tail (&fn->node, &data->function_list);return RMI_SCAN_CONTINUE ; - -err_put_fn: -put_device (&fn->dev); -return error; }int rmi_driver_suspend (struct rmi_device *rmi_dev)
Signature · 1 line
2.20.1