November 2019 - Linux-stable-mirror

[PATCH AUTOSEL 4.19 008/219] ARM: dts: imx51: Fix memory node duplication

by Sasha Levin

From: Fabio Estevam <festevam(a)gmail.com> [ Upstream commit 6a9681168b83c62abfa457c709f2f4b126bd6b92 ] Boards based on imx51 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx51.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Shawn Guo <shawnguo(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/boot/dts/imx51-apf51.dts | 1 + arch/arm/boot/dts/imx51-babbage.dts | 1 + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 1 + arch/arm/boot/dts/imx51-ts4800.dts | 1 + arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 1 + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 + arch/arm/boot/dts/imx51.dtsi | 2 -- 9 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts index 79d80036f74de..1eddf2908b3f2 100644 --- a/arch/arm/boot/dts/imx51-apf51.dts +++ b/arch/arm/boot/dts/imx51-apf51.dts @@ -22,6 +22,7 @@ compatible = "armadeus,imx51-apf51", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index ba60b0cb3cc13..99191466a8085 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -15,6 +15,7 @@ }; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi index 5761a66e8a0d3..82d8df097ef1f 100644 --- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi @@ -17,6 +17,7 @@ compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x08000000>; }; }; diff --git a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi index f8902a338e49a..2e3125391bc49 100644 --- a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +++ b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi @@ -23,6 +23,7 @@ compatible = "eukrea,cpuimx51", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x10000000>; /* 256M */ }; }; diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts index 39eb067904c3d..4344632f79400 100644 --- a/arch/arm/boot/dts/imx51-ts4800.dts +++ b/arch/arm/boot/dts/imx51-ts4800.dts @@ -18,6 +18,7 @@ }; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x10000000>; }; diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index 6e80254c4562a..d0e0eb9c9adfa 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts @@ -53,6 +53,7 @@ /* Will be filled by the bootloader */ memory@90000000 { + device_type = "memory"; reg = <0x90000000 0>; }; diff --git a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts index 26cf08549df40..f5b2d768fe47f 100644 --- a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts +++ b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts @@ -18,6 +18,7 @@ /* Will be filled by the bootloader */ memory@90000000 { + device_type = "memory"; reg = <0x90000000 0>; }; diff --git a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts index e6ebac8f43e4f..ad90d66ccca6c 100644 --- a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts +++ b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts @@ -18,6 +18,7 @@ /* Will be filled by the bootloader */ memory@90000000 { + device_type = "memory"; reg = <0x90000000 0>; }; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index ef2abc0978439..81f60c96a2e41 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -16,10 +16,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec; -- 2.20.1

4 years, 4 months

6
219
0 0

[PATCH 1/5] rsi: fix use-after-free on failed probe and unbind

by Johan Hovold

Make sure to stop both URBs before returning after failed probe as well as on disconnect to avoid use-after-free in the completion handler. Reported-by: syzbot+b563b7f8dbe8223a51e8(a)syzkaller.appspotmail.com Fixes: a4302bff28e2 ("rsi: add bluetooth rx endpoint") Fixes: dad0d04fa7ba ("rsi: Add RS9113 wireless driver") Cc: stable <stable(a)vger.kernel.org> # 3.15 Cc: Siva Rebbagondla <siva.rebbagondla(a)redpinesignals.com> Cc: Prameela Rani Garnepudi <prameela.j04cs(a)gmail.com> Cc: Amitkumar Karwar <amit.karwar(a)redpinesignals.com> Cc: Fariya Fatima <fariyaf(a)gmail.com> Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/net/wireless/rsi/rsi_91x_usb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index 53f41fc2cadf..30bed719486e 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -292,6 +292,15 @@ static void rsi_rx_done_handler(struct urb *urb) dev_kfree_skb(rx_cb->rx_skb); } +static void rsi_rx_urb_kill(struct rsi_hw *adapter, u8 ep_num) +{ + struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev; + struct rx_usb_ctrl_block *rx_cb = &dev->rx_cb[ep_num - 1]; + struct urb *urb = rx_cb->rx_urb; + + usb_kill_urb(urb); +} + /** * rsi_rx_urb_submit() - This function submits the given URB to the USB stack. * @adapter: Pointer to the adapter structure. @@ -823,10 +832,13 @@ static int rsi_probe(struct usb_interface *pfunction, if (adapter->priv->coex_mode > 1) { status = rsi_rx_urb_submit(adapter, BT_EP); if (status) - goto err1; + goto err_kill_wlan_urb; } return 0; + +err_kill_wlan_urb: + rsi_rx_urb_kill(adapter, WLAN_EP); err1: rsi_deinit_usb_interface(adapter); err: @@ -857,6 +869,10 @@ static void rsi_disconnect(struct usb_interface *pfunction) adapter->priv->bt_adapter = NULL; } + if (adapter->priv->coex_mode > 1) + rsi_rx_urb_kill(adapter, BT_EP); + rsi_rx_urb_kill(adapter, WLAN_EP); + rsi_reset_card(adapter); rsi_deinit_usb_interface(adapter); rsi_91x_deinit(adapter); -- 2.24.0

4 years, 4 months

2
1
0 0

[PATCH] media: uvc: Avoid cyclic entity chains due to malformed USB descriptors

by Will Deacon

Way back in 2017, fuzzing the 4.14-rc2 USB stack with syzkaller kicked up the following WARNING from the UVC chain scanning code: | list_add double add: new=ffff880069084010, prev=ffff880069084010, | next=ffff880067d22298. | ------------[ cut here ]------------ | WARNING: CPU: 1 PID: 1846 at lib/list_debug.c:31 __list_add_valid+0xbd/0xf0 | Modules linked in: | CPU: 1 PID: 1846 Comm: kworker/1:2 Not tainted | 4.14.0-rc2-42613-g1488251d1a98 #238 | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 | Workqueue: usb_hub_wq hub_event | task: ffff88006b01ca40 task.stack: ffff880064358000 | RIP: 0010:__list_add_valid+0xbd/0xf0 lib/list_debug.c:29 | RSP: 0018:ffff88006435ddd0 EFLAGS: 00010286 | RAX: 0000000000000058 RBX: ffff880067d22298 RCX: 0000000000000000 | RDX: 0000000000000058 RSI: ffffffff85a58800 RDI: ffffed000c86bbac | RBP: ffff88006435dde8 R08: 1ffff1000c86ba52 R09: 0000000000000000 | R10: 0000000000000002 R11: 0000000000000000 R12: ffff880069084010 | R13: ffff880067d22298 R14: ffff880069084010 R15: ffff880067d222a0 | FS: 0000000000000000(0000) GS:ffff88006c900000(0000) knlGS:0000000000000000 | CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 | CR2: 0000000020004ff2 CR3: 000000006b447000 CR4: 00000000000006e0 | Call Trace: | __list_add ./include/linux/list.h:59 | list_add_tail+0x8c/0x1b0 ./include/linux/list.h:92 | uvc_scan_chain_forward.isra.8+0x373/0x416 | drivers/media/usb/uvc/uvc_driver.c:1471 | uvc_scan_chain drivers/media/usb/uvc/uvc_driver.c:1585 | uvc_scan_device drivers/media/usb/uvc/uvc_driver.c:1769 | uvc_probe+0x77f2/0x8f00 drivers/media/usb/uvc/uvc_driver.c:2104 Looking into the output from usbmon, the interesting part is the following data packet: ffff880069c63e00 30710169 C Ci:1:002:0 0 143 = 09028f00 01030080 00090403 00000e01 00000924 03000103 7c003328 010204db If we drop the lead configuration and interface descriptors, we're left with an output terminal descriptor describing a generic display: /* Output terminal descriptor */ buf[0] 09 buf[1] 24 buf[2] 03 /* UVC_VC_OUTPUT_TERMINAL */ buf[3] 00 /* ID */ buf[4] 01 /* type == 0x0301 (UVC_OTT_DISPLAY) */ buf[5] 03 buf[6] 7c buf[7] 00 /* source ID refers to self! */ buf[8] 33 The problem with this descriptor is that it is self-referential: the source ID of 0 matches itself! This causes the 'struct uvc_entity' representing the display to be added to its chain list twice during 'uvc_scan_chain()': once via 'uvc_scan_chain_entity()' when it is processed directly from the 'dev->entities' list and then again immediately afterwards when trying to follow the source ID in 'uvc_scan_chain_forward()' Add a check before adding an entity to a chain list to ensure that the entity is not already part of a chain. Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Dmitry Vyukov <dvyukov(a)google.com> Cc: Kostya Serebryany <kcc(a)google.com> Cc: <stable(a)vger.kernel.org> Fixes: c0efd232929c ("V4L/DVB (8145a): USB Video Class driver") Reported-by: Andrey Konovalov <andreyknvl(a)google.com> Link: https://lore.kernel.org/linux-media/CAAeHK+z+Si69jUR+N-SjN9q4O+o5KFiNManqEa… Signed-off-by: Will Deacon <will(a)kernel.org> --- I don't have a way to reproduce the original issue, so this change is based purely on inspection. Considering I'm not familiar with USB nor UVC, I may well have missed something! drivers/media/usb/uvc/uvc_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 66ee168ddc7e..e24420b1750a 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1493,6 +1493,11 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain, break; if (forward == prev) continue; + if (forward->chain.next || forward->chain.prev) { + uvc_trace(UVC_TRACE_DESCR, "Found reference to " + "entity %d already in chain.\n", forward->id); + return -EINVAL; + } switch (UVC_ENTITY_TYPE(forward)) { case UVC_VC_EXTENSION_UNIT: @@ -1574,6 +1579,13 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain, return -1; } + if (term->chain.next || term->chain.prev) { + uvc_trace(UVC_TRACE_DESCR, "Found reference to " + "entity %d already in chain.\n", + term->id); + return -EINVAL; + } + if (uvc_trace_param & UVC_TRACE_PROBE) printk(KERN_CONT " %d", term->id); -- 2.23.0.444.g18eeb5a265-goog

4 years, 4 months

2
5
0 0

[PATCH 02/12] fs_parse: fix fs_param_v_optional handling

by Miklos Szeredi

String options always have parameters, hence the check for optional parameter will never trigger. Check for param type being a flag first (flag is the only type that does not have a parameter) and report "Missing value" if the parameter is mandatory. Tested with gfs2's "quota" option, which is currently the only user of fs_param_v_optional. Signed-off-by: Miklos Szeredi <mszeredi(a)redhat.com> Cc: Andrew Price <anprice(a)redhat.com> Cc: David Howells <dhowells(a)redhat.com> Fixes: 31d921c7fb96 ("vfs: Add configuration parser helpers") Cc: <stable(a)vger.kernel.org> # v5.4 --- fs/fs_parser.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/fs_parser.c b/fs/fs_parser.c index d1930adce68d..5d8833d71b37 100644 --- a/fs/fs_parser.c +++ b/fs/fs_parser.c @@ -127,13 +127,15 @@ int fs_parse(struct fs_context *fc, case fs_param_is_u64: case fs_param_is_enum: case fs_param_is_string: - if (param->type != fs_value_is_string) - goto bad_value; - if (!result->has_value) { + if (param->type == fs_value_is_flag) { if (p->flags & fs_param_v_optional) goto okay; - goto bad_value; + + return invalf(fc, "%s: Missing value for '%s'", + desc->name, param->key); } + if (param->type != fs_value_is_string) + goto bad_value; /* Fall through */ default: break; -- 2.21.0

4 years, 4 months

3
6
0 0

[PATCH stable 3.16] rtlwifi: Fix potential overflow on P2P code

by pkshih＠realtek.com

From: Laura Abbott <labbott(a)redhat.com> commit 8c55dedb795be8ec0cf488f98c03a1c2176f7fb1 upstream. Nicolas Waisman noticed that even though noa_len is checked for a compatible length it's still possible to overrun the buffers of p2pinfo since there's no check on the upper bound of noa_num. Bound noa_num against P2P_MAX_NOA_NUM. Reported-by: Nicolas Waisman <nico(a)semmle.com> Signed-off-by: Laura Abbott <labbott(a)redhat.com> Acked-by: Ping-Ke Shih <pkshih(a)realtek.com> Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org> --- This fix is applied to most of stable kernel excepting to 3.16 due to directory change on kernel 4.4. So, I compose this patch with old directory for stable kernel 3.16. --- drivers/net/wireless/rtlwifi/ps.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index 50504942ded1..bfe097b224ad 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c @@ -801,6 +801,9 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, return; } else { noa_num = (noa_len - 2) / 13; + if (noa_num > P2P_MAX_NOA_NUM) + noa_num = P2P_MAX_NOA_NUM; + } noa_index = ie[3]; if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode == @@ -895,6 +898,9 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data, return; } else { noa_num = (noa_len - 2) / 13; + if (noa_num > P2P_MAX_NOA_NUM) + noa_num = P2P_MAX_NOA_NUM; + } noa_index = ie[3]; if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode == -- 2.21.0

4 years, 4 months

2
1
0 0

[PATCH for linux 4.4.y/3.16.y] fs/dcache: move security_d_instantiate() behind attaching dentry to inode

by zhangyi (F)

During backport 1e2e547a93a "do d_instantiate/unlock_new_inode combinations safely", there was a error instantiating sequence of attaching dentry to inode and calling security_d_instantiate(). Before commit ce23e640133 "->getxattr(): pass dentry and inode as separate arguments" and b96809173e9 "security_d_instantiate(): move to the point prior to attaching dentry to inode", security_d_instantiate() should be called beind __d_instantiate(), otherwise it will trigger below problem when CONFIG_SECURITY_SMACK on ext4 was enabled because d_inode(dentry) used by ->getxattr() is NULL before __d_instantiate() instantiate inode. [ 31.858026] BUG: unable to handle kernel paging request at ffffffffffffff70 ... [ 31.882024] Call Trace: [ 31.882378] [<ffffffffa347f75c>] ext4_xattr_get+0x8c/0x3e0 [ 31.883195] [<ffffffffa3489454>] ext4_xattr_security_get+0x24/0x40 [ 31.884086] [<ffffffffa336a56b>] generic_getxattr+0x5b/0x90 [ 31.884907] [<ffffffffa3700514>] smk_fetch+0xb4/0x150 [ 31.885634] [<ffffffffa3700772>] smack_d_instantiate+0x1c2/0x550 [ 31.886508] [<ffffffffa36f9a5a>] security_d_instantiate+0x3a/0x80 [ 31.887389] [<ffffffffa3353b26>] d_instantiate_new+0x36/0x130 [ 31.888223] [<ffffffffa342b1ef>] ext4_mkdir+0x4af/0x6a0 [ 31.888928] [<ffffffffa3343470>] vfs_mkdir+0x100/0x280 [ 31.889536] [<ffffffffa334b086>] SyS_mkdir+0xb6/0x170 [ 31.890255] [<ffffffffa307c855>] ? trace_do_page_fault+0x95/0x2b0 [ 31.891134] [<ffffffffa3c5e078>] entry_SYSCALL_64_fastpath+0x18/0x73 Cc: <stable(a)vger.kernel.org> # 3.16, 4.4 Signed-off-by: zhangyi (F) <yi.zhang(a)huawei.com> --- fs/dcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dcache.c b/fs/dcache.c index 5a1c36dc5d65..baa00718d8d1 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1900,7 +1900,6 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode) BUG_ON(!hlist_unhashed(&entry->d_u.d_alias)); BUG_ON(!inode); lockdep_annotate_inode_mutex_key(inode); - security_d_instantiate(entry, inode); spin_lock(&inode->i_lock); __d_instantiate(entry, inode); WARN_ON(!(inode->i_state & I_NEW)); @@ -1908,6 +1907,7 @@ void d_instantiate_new(struct dentry *entry, struct inode *inode) smp_mb(); wake_up_bit(&inode->i_state, __I_NEW); spin_unlock(&inode->i_lock); + security_d_instantiate(entry, inode); } EXPORT_SYMBOL(d_instantiate_new); -- 2.17.2

4 years, 4 months

3
2
0 0

Re: [PATCH v5 2/4] lib: devres: add a helper function for ioremap_uc

by Tuowen Zhao

Sorry, patches in this set should have tag # v4.19+ Should I resubmit a set with the correct tags? Tuowen

4 years, 4 months

4
6
0 0

[PATCH 56/63] perf tests: Fix out of bounds memory access

by Arnaldo Carvalho de Melo

From: Leo Yan <leo.yan(a)linaro.org> The test case 'Read backward ring buffer' failed on 32-bit architectures which were found by LKFT perf testing. The test failed on arm32 x15 device, qemu_arm32, qemu_i386, and found intermittent failure on i386; the failure log is as below: 50: Read backward ring buffer : --- start --- test child forked, pid 510 Using CPUID GenuineIntel-6-9E-9 mmap size 1052672B mmap size 8192B Finished reading overwrite ring buffer: rewind free(): invalid next size (fast) test child interrupted ---- end ---- Read backward ring buffer: FAILED! The log hints there have issue for memory usage, thus free() reports error 'invalid next size' and directly exit for the case. Finally, this issue is root caused as out of bounds memory access for the data array 'evsel->id'. The backward ring buffer test invokes do_test() twice. 'evsel->id' is allocated at the first call with the flow: test__backward_ring_buffer() `-> do_test() `-> evlist__mmap() `-> evlist__mmap_ex() `-> perf_evsel__alloc_id() So 'evsel->id' is allocated with one item, and it will be used in function perf_evlist__id_add(): evsel->id[0] = id evsel->ids = 1 At the second call for do_test(), it skips to initialize 'evsel->id' and reuses the array which is allocated in the first call. But 'evsel->ids' contains the stale value. Thus: evsel->id[1] = id -> out of bound access evsel->ids = 2 To fix this issue, we will use evlist__open() and evlist__close() pair functions to prepare and cleanup context for evlist; so 'evsel->id' and 'evsel->ids' can be initialized properly when invoke do_test() and avoid the out of bounds memory access. Fixes: ee74701ed8ad ("perf tests: Add test to check backward ring buffer") Signed-off-by: Leo Yan <leo.yan(a)linaro.org> Reviewed-by: Jiri Olsa <jolsa(a)kernel.org> Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Cc: Mark Rutland <mark.rutland(a)arm.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Naresh Kamboju <naresh.kamboju(a)linaro.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Wang Nan <wangnan0(a)huawei.com> Cc: stable(a)vger.kernel.org # v4.10+ Link: http://lore.kernel.org/lkml/20191107020244.2427-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> --- tools/perf/tests/backward-ring-buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c index a4cd30c0beb3..15cea518f5ad 100644 --- a/tools/perf/tests/backward-ring-buffer.c +++ b/tools/perf/tests/backward-ring-buffer.c @@ -148,6 +148,15 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m goto out_delete_evlist; } + evlist__close(evlist); + + err = evlist__open(evlist); + if (err < 0) { + pr_debug("perf_evlist__open: %s\n", + str_error_r(errno, sbuf, sizeof(sbuf))); + goto out_delete_evlist; + } + err = do_test(evlist, 1, &sample_count, &comm_count); if (err != TEST_OK) goto out_delete_evlist; -- 2.21.0

4 years, 4 months

3
2
0 0

Re: [PATCH] ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity

by Jarkko Nikula

On 11/25/19 1:11 PM, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: 3a637e008e54 ("ARM: dts: Use defined GPIO constants in flags cell for OMAP2+ boards"). > > The bot has tested the following trees: v5.3.12, v4.19.85, v4.14.155, v4.9.202, v4.4.202. > > v5.3.12: Build OK! > v4.19.85: Build OK! > v4.14.155: Build OK! > v4.9.202: Failed to apply! Possible dependencies: > 1a177cf72b3a ("ARM: dts: dra72-evm-tps65917: Add voltage supplies to usb_phy, mmc, dss") > 45ea75eb92a4 ("ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"") > 5d080aa30681 ("ARM: dts: dra72: Add separate dtsi for tps65917") > 6eebfeb9cf0d ("ARM: dts: Add support for dra718-evm") > e9a05fbd21de ("ARM: dts: dra72-evm: Fix modelling of regulators") > > v4.4.202: Failed to apply! Possible dependencies: > 12ca468306a2 ("ARM: dts: am57xx: cl-som-am57x: add dual EMAC support") > 1a472e14ba08 ("ARM: dts: am57xx: cl-som-am57x: dts: add RTC support") > 27ddd846cb25 ("ARM: dts: am57xx: cl-som-am57x: add USB support") > 2c7cf1f48f36 ("ARM: dts: am57xx: cl-som-am57x: add EEPROM support") > 2d47fc3b9801 ("ARM: dts: am57xx: cl-som-am57x: add touchscreen support") > 317d15679a5e ("ARM: dts: dra72-evm: Mark uart1 rxd as wakeup capable") > 387450fc882e ("ARM: dts: am57xx: cl-som-am57x: add basic module support") > 3a1de8082405 ("ARM: dts: dra7xx: Fix compatible string for PCF8575 chip") > 4424cd009648 ("ARM: dts: am57xx: cl-som-am57x: add analog audio support") > 45ea75eb92a4 ("ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"") > 488f270d90e1 ("ARM: dts: dra7: Fix NAND device nodes") > 4e8603eff519 ("ARM: dts: omap: remove unneeded unit name for sound nodes") > 6686f744df70 ("ARM: dts: DRA72-EVM: Add regulator-allow-bypass property for ldo1 and ldo2") > 6cfec12f2545 ("ARM: dts: dra72-evm: Enable AFIFO use for McASP3") > 6eebfeb9cf0d ("ARM: dts: Add support for dra718-evm") > 8deb60f535fa ("ARM: dts: am57xx: cl-som-am57x: add eMMC support") > 9255ea8472d2 ("ARM: dts: dra72-evm: Use DRA7XX_CORE_IOPAD pinmux macro") > a23fc1558487 ("ARM: dts: dra7x-evm: Provide NAND ready pin") > a4240d3af677 ("ARM: dts: Add support for dra72-evm rev C (SR2.0)") > a7cac713f90a ("ARM: dts: AM572x-IDK Initial Support") > cc2d681420d0 ("ARM: dts: am57xx: cl-som-am57x: add spi-flash support") > e1fdd060f08d ("ARM: dts: am57xx: sbc-am57x: add basic board support") > e9a05fbd21de ("ARM: dts: dra72-evm: Fix modelling of regulators") > > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? > Ah, it doesn't apply to v4.4 and v4.9 due the commit 45ea75eb92a4 ("ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"") but that commit doesn't apply either stable and probably even should not even if it would. I believe best is me to submit a separate version for v4.4/v4.9. -- Jarkko

4 years, 4 months

1
1
0 0

[PATCH 4.9 00/47] 4.9.196-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.196 release. There are 47 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 Tue 08 Oct 2019 05:19:59 PM UTC. 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.196-rc… 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 <gregkh(a)linuxfoundation.org> Linux 4.9.196-rc1 Andrey Konovalov <andreyknvl(a)google.com> NFC: fix attrs checks in netlink interface Eric Biggers <ebiggers(a)google.com> smack: use GFP_NOFS while holding inode_smack::smk_lock Jann Horn <jannh(a)google.com> Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set David Ahern <dsahern(a)gmail.com> ipv6: Handle missing host route in __ipv6_ifa_notify Eric Dumazet <edumazet(a)google.com> sch_cbq: validate TCA_CBQ_WRROPT to avoid crash Dongli Zhang <dongli.zhang(a)oracle.com> xen-netfront: do not use ~0U as error return value for xennet_fill_frags() Dotan Barak <dotanb(a)dev.mellanox.co.il> net/rds: Fix error handling in rds_ib_add_one() Eric Dumazet <edumazet(a)google.com> sch_dsmark: fix potential NULL deref in dsmark_init() Reinhard Speyerer <rspmn(a)arcor.de> qmi_wwan: add support for Cinterion CLS8 devices Eric Dumazet <edumazet(a)google.com> nfc: fix memory leak in llcp_sock_bind() Martin KaFai Lau <kafai(a)fb.com> net: Unpublish sk from sk_reuseport_cb before call_rcu Navid Emamdoost <navid.emamdoost(a)gmail.com> net: qlogic: Fix memory leak in ql_alloc_large_buffers Paolo Abeni <pabeni(a)redhat.com> net: ipv4: avoid mixed n_redirects and rate_tokens usage Eric Dumazet <edumazet(a)google.com> ipv6: drop incoming packets having a v4mapped source address Johan Hovold <johan(a)kernel.org> hso: fix NULL-deref on tty open Vishal Kulkarni <vishal(a)chelsio.com> cxgb4:Fix out-of-bounds MSI-X info array access Martijn Coenen <maco(a)android.com> ANDROID: binder: synchronize_rcu() when using POLLFREE. Martijn Coenen <maco(a)android.com> ANDROID: binder: remove waitqueue when thread exits. Nicolas Boichat <drinkcat(a)chromium.org> kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K Changwei Ge <gechangwei(a)live.cn> ocfs2: wait for recovering done after direct unlock request David Howells <dhowells(a)redhat.com> hypfs: Fix error number left in struct pointer member OGAWA Hirofumi <hirofumi(a)mail.parknet.co.jp> fat: work around race with userspace's read via blockdev while mounting Mike Rapoport <mike.rapoport(a)gmail.com> ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address Jia-Ju Bai <baijiaju1990(a)gmail.com> security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb() Joao Moreno <mail(a)joaomoreno.com> HID: apple: Fix stuck function keys when using FN Will Deacon <will(a)kernel.org> ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes Nishka Dasgupta <nishkadg.linux(a)gmail.com> PCI: tegra: Fix OF node reference leak Kai-Heng Feng <kai.heng.feng(a)canonical.com> mfd: intel-lpss: Remove D3cold delay Nathan Chancellor <natechancellor(a)gmail.com> MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean Bart Van Assche <bvanassche(a)acm.org> scsi: core: Reduce memory required for SCSI logging Eugen Hristev <eugen.hristev(a)microchip.com> clk: at91: select parent if main oscillator or bypass is enabled Arnd Bergmann <arnd(a)arndb.de> arm64: fix unreachable code issue with cmpxchg Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries: correctly track irq state in default idle Nicholas Piggin <npiggin(a)gmail.com> powerpc/64s/exception: machine check use correct cfar for late handler Jean Delvare <jdelvare(a)suse.de> drm/amdgpu/si: fix ASIC tests hexin <hexin.op(a)gmail.com> vfio_pci: Restore original state on release Sowjanya Komatineni <skomatineni(a)nvidia.com> pinctrl: tegra: Fix write barrier placement in pmx_writel Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/mobility: use cond_resched when updating device tree Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/rtas: use device model APIs and serialization during LPM Stephen Boyd <sboyd(a)kernel.org> clk: sirf: Don't reference clk_init_data after registration Nathan Huckleberry <nhuck(a)google.com> clk: qoriq: Fix -Wunused-const-variable Corey Minyard <cminyard(a)mvista.com> ipmi_si: Only schedule continuously in the thread in maintenance mode Jia-Ju Bai <baijiaju1990(a)gmail.com> gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property() KyleMahlkuch <kmahlkuc(a)linux.vnet.ibm.com> drm/radeon: Fix EEH during kexec Marko Kohtala <marko.kohtala(a)okoko.fi> video: ssd1307fb: Start page range at page_offset Andrey Smirnov <andrew.smirnov(a)gmail.com> drm/bridge: tc358767: Increase AUX transfer length limit ------------- Diffstat: Makefile | 4 +-- arch/arm/mm/fault.c | 4 +-- arch/arm/mm/fault.h | 1 + arch/arm/mm/mmu.c | 16 +++++++++ arch/arm64/include/asm/cmpxchg.h | 6 ++-- arch/mips/mm/tlbex.c | 2 +- arch/powerpc/include/asm/futex.h | 3 +- arch/powerpc/kernel/exceptions-64s.S | 4 +++ arch/powerpc/kernel/rtas.c | 11 ++++-- arch/powerpc/platforms/pseries/mobility.c | 9 +++++ arch/powerpc/platforms/pseries/setup.c | 3 ++ arch/s390/hypfs/inode.c | 9 ++--- drivers/android/binder.c | 26 +++++++++++++- drivers/char/ipmi/ipmi_si_intf.c | 24 ++++++++++--- drivers/clk/at91/clk-main.c | 10 ++++-- drivers/clk/clk-qoriq.c | 2 +- drivers/clk/sirf/clk-common.c | 12 ++++--- drivers/gpu/drm/amd/amdgpu/si.c | 6 ++-- drivers/gpu/drm/bridge/tc358767.c | 2 +- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 8 +++++ drivers/hid/hid-apple.c | 49 +++++++++++++++----------- drivers/mfd/intel-lpss-pci.c | 2 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 9 +++-- drivers/net/ethernet/qlogic/qla3xxx.c | 1 + drivers/net/usb/hso.c | 12 ++++--- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/xen-netfront.c | 17 ++++----- drivers/pci/host/pci-tegra.c | 22 ++++++++---- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 ++- drivers/scsi/scsi_logging.c | 48 ++----------------------- drivers/vfio/pci/vfio_pci.c | 17 ++++++--- drivers/video/fbdev/ssd1307fb.c | 2 +- fs/fat/dir.c | 13 +++++-- fs/fat/fatent.c | 3 ++ fs/ocfs2/dlm/dlmunlock.c | 23 +++++++++--- include/scsi/scsi_dbg.h | 2 -- lib/Kconfig.debug | 2 +- net/core/sock.c | 11 ++++-- net/ipv4/route.c | 5 ++- net/ipv6/addrconf.c | 17 ++++++--- net/ipv6/ip6_input.c | 10 ++++++ net/nfc/llcp_sock.c | 7 +++- net/nfc/netlink.c | 6 ++-- net/rds/ib.c | 6 ++-- net/sched/sch_cbq.c | 27 +++++++++++--- net/sched/sch_dsmark.c | 2 ++ security/smack/smack_access.c | 4 +-- security/smack/smack_lsm.c | 7 ++-- 49 files changed, 328 insertions(+), 165 deletions(-)

4 years, 4 months

9
60
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2019