5.4.132-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/348 ALSA: usb-audio: fix rate on Ozone Z90 USB headset
In reply to Greg Kroah-HartmanFrom: Daehwan Jung <[email protected]>
commit aecc19ec404bdc745c781058ac97a373731c3089 upstream.
It mislabels its 96 kHz altsetting and that's why it causes some noise
--- sound/usb/format.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/format.c +2 -0
@@ -195,9 +195,11 @@ static int parse_audio_format_rates_v1(scontinue ;/* C-Media CM6501 mislabels its 96 kHz altsetting */ /* Terratec Aureon 7.1 USB C-Media 6206, too */ +/* Ozone Z90 USB C-Media, too */ if (rate ==48000 && nr_rates ==1 && (chip->usb_id ==USB_ID (0x0d8c ,0x0201 ) || chip->usb_id ==USB_ID (0x0d8c ,0x0102 ) || + chip->usb_id ==USB_ID (0x0d8c ,0x0078 ) || chip->usb_id ==USB_ID (0x0ccd ,0x00b1 )) && fp->altsetting ==5 && fp->maxpacksize ==392 ) rate =96000 ;
Greg Kroah-Hartman
maintainerPATCH 10/348 Input: usbtouchscreen - fix control-request directions
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 41e81022a04a0294c55cfa7e366bc14b9634c66e upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the four control requests which erroneously used usb_rcvctrlpipe().
--- drivers/input/touchscreen/usbtouchscreen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +4 -4
@@ -251,7 +251,7 @@ static int e2i_init(struct usbtouch_usbint ret;struct usb_device *udev =interface_to_usbdev (usbtouch->interface); - ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), + ret =usb_control_msg (udev,usb_sndctrlpipe (udev,0 ),0x01 ,0x02 ,0x0000 ,0x0081 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -531,7 +531,7 @@ static int mtouch_init(struct usbtouch_uif (ret)return ret; - ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), + ret =usb_control_msg (udev,usb_sndctrlpipe (udev,0 ),MTOUCHUSB_RESET ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,1 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -543,7 +543,7 @@ static int mtouch_init(struct usbtouch_umsleep (150 );for (i =0 ; i <3 ; i++) { - ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), + ret =usb_control_msg (udev,usb_sndctrlpipe (udev,0 ),MTOUCHUSB_ASYNC_REPORT ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,1 ,1 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -722,7 +722,7 @@ static int dmc_tsc10_init(struct usbtouc }/* start sending data */ - ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), + ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ),TSC10_CMD_DATA1 ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
Greg Kroah-Hartman
maintainerPATCH 11/348 net: can: ems_usb: fix use-after-free in ems_usb_disconnect()
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit ab4a0b8fcb9a95c02909b62049811bd2e586aaa4 upstream.
In ems_usb_disconnect() dev pointer, which is netdev private data, is used after free_candev() call:
| if (dev) {
| unregister_netdev(dev->netdev);
| free_candev(dev->netdev);
|
| unlink_all_urbs(dev);
|
| usb_free_urb(dev->intr_urb);
|
| kfree(dev->intr_in_buffer);
| kfree(dev->tx_msg_buffer);
| }Fix it by simply moving free_candev() at the end of the block.
Fail log:
| BUG: KASAN: use-after-free in ems_usb_disconnect | Read of size 8 at addr ffff88804e041008 by task kworker/1:2/2895 | | CPU: 1 PID: 2895 Comm: kworker/1:2 Not tainted 5.13.0-rc5+ #164 | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a-rebuilt.opensuse.4 | Workqueue: usb_hub_wq hub_event | Call Trace: | dump_stack (lib/dump_stack.c:122) | print_address_description.constprop.0.cold (mm/kasan/report.c:234) | kasan_report.cold (mm/kasan/report.c:420 mm/kasan/report.c:436) | ems_usb_disconnect (drivers/net/can/usb/ems_usb.c:683 drivers/net/can/usb/ems_usb.c:1058)
--- drivers/net/can/usb/ems_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/can/usb/ems_usb.c +2 -1
@@ -1053,7 +1053,6 @@ static void ems_usb_disconnect(struct usif (dev) {unregister_netdev (dev->netdev); -free_candev (dev->netdev);unlink_all_urbs (dev);
@@ -1061,6 +1060,8 @@ static void ems_usb_disconnect(struct uskfree (dev->intr_in_buffer);kfree (dev->tx_msg_buffer); + +free_candev (dev->netdev); } }
Greg Kroah-Hartman
maintainerPATCH 12/348 usb: gadget: eem: fix echo command packet response issue
In reply to Greg Kroah-HartmanFrom: Linyu Yuan <[email protected]>
commit 4249d6fbc10fd997abdf8a1ea49c0389a0edf706 upstream.
when receive eem echo command, it will send a response, but queue this response to the usb request which allocate from gadget device endpoint zero,
and transmit the request to IN endpoint of eem interface.
on dwc3 gadget, it will trigger following warning in function __dwc3_gadget_ep_queue(),
if (WARN(req->dep != dep, "request %pK belongs to '%s'\n", &req->request, req->dep->name)) return -EINVAL;
fix it by allocating a usb request from IN endpoint of eem interface, and transmit the usb request to same IN endpoint of eem interface.
--- drivers/usb/gadget/function/f_eem.c | 43 ++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/f_eem.c +39 -4
@@ -30,6 +30,11 @@ struct f_eem {u8 ctrl_id; }; +struct in_context { +struct sk_buff *skb; +struct usb_ep *ep; +}; +static inline struct f_eem *func_to_eem (struct usb_function *f) { return container_of(f, struct f_eem, port.func);
@@ -322,9 +327,12 @@ fail:static void eem_cmd_complete (struct usb_ep *ep,struct usb_request *req) { -struct sk_buff *skb = (struct sk_buff *)req->context; +struct in_context *ctx = req->context; -dev_kfree_skb_any (skb); +dev_kfree_skb_any (ctx->skb); +kfree (req->buf); +usb_ep_free_request (ctx->ep, req); +kfree (ctx); }/*
@@ -412,7 +420,9 @@ static int eem_unwrap(struct gether *por* b15: bmType (0 == data, 1 == command) */ if (header &BIT (15 )) { -struct usb_request *req = cdev->req; +struct usb_request *req; +struct in_context *ctx; +struct usb_ep *ep;u16 bmEEMCmd;/* EEM command packet format:
@@ -441,11 +451,36 @@ static int eem_unwrap(struct gether *porskb_trim (skb2, len);put_unaligned_le16 (BIT (15 ) |BIT (11 ) | len,skb_push (skb2,2 )); + + ep = port->in_ep; + req =usb_ep_alloc_request (ep,GFP_ATOMIC ); +if (!req) { +dev_kfree_skb_any (skb2); + goto next; + } + + req->buf =kmalloc (skb2->len,GFP_KERNEL ); +if (!req->buf) { +usb_ep_free_request (ep, req); +dev_kfree_skb_any (skb2); + goto next; + } + + ctx =kmalloc (sizeof (*ctx),GFP_KERNEL ); +if (!ctx) { +kfree (req->buf); +usb_ep_free_request (ep, req); +dev_kfree_skb_any (skb2); + goto next; + } + ctx->skb = skb2; + ctx->ep = ep; +skb_copy_bits (skb2,0 , req->buf, skb2->len); req->length = skb2->len; req->complete = eem_cmd_complete; req->zero =1 ; - req->context = skb2; + req->context = ctx;if (usb_ep_queue (port->in_ep, req,GFP_ATOMIC ))DBG (cdev,"echo response queue fail\n" );break ;
Greg Kroah-Hartman
maintainerPATCH 13/348 USB: cdc-acm: blacklist Heimann USB Appset device
In reply to Greg Kroah-HartmanFrom: Hannu Hartikainen <[email protected]>
commit 4897807753e078655a78de39ed76044d784f3e63 upstream.
The device (32a7:0000 Heimann Sensor GmbH USB appset demo) claims to be a CDC-ACM device in its descriptors but in fact is not. If it is run with echo disabled it returns garbled data, probably due to something that happens in the TTY layer. And when run with echo enabled (the default), it will mess up the calibration data of the sensor the first time any data is sent to the device.
In short, I had a bad time after connecting the sensor and trying to get it to work. I hope blacklisting it in the cdc-acm driver will save someone else a bit of trouble.
--- drivers/usb/class/cdc-acm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/class/cdc-acm.c +5 -0
@@ -1960,6 +1960,11 @@ static const struct usb_device_id acm_id .driver_info = IGNORE_DEVICE, }, +/* Exclude Heimann Sensor GmbH USB appset demo */ + { USB_DEVICE(0x32a7, 0x0000), + .driver_info =IGNORE_DEVICE , + }, + /* control interfaces without any protocol set */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, USB_CDC_PROTO_NONE) },
Greg Kroah-Hartman
maintainerPATCH 14/348 usb: dwc3: Fix debugfs creation flow
In reply to Greg Kroah-HartmanFrom: Minas Harutyunyan <[email protected]>
commit 84524d1232ecca7cf8678e851b254f05cff4040a upstream.
Creation EP's debugfs called earlier than debugfs folder for dwc3 device created. As result EP's debugfs are created in '/sys/kernel/debug' instead of '/sys/kernel/debug/usb/dwc3.1.auto'.
Moved dwc3_debugfs_init() function call before calling dwc3_core_init_mode() to allow create dwc3 debugfs parent before creating EP's debugfs's.
--- drivers/usb/dwc3/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc3/core.c +2 -1
@@ -1523,17 +1523,18 @@ static int dwc3_probe(struct platform_de }dwc3_check_params (dwc); +dwc3_debugfs_init (dwc); ret =dwc3_core_init_mode (dwc);if (ret) goto err5; -dwc3_debugfs_init (dwc);pm_runtime_put (dev);return 0 ; err5: +dwc3_debugfs_exit (dwc);dwc3_event_buffers_cleanup (dwc);usb_phy_shutdown (dwc->usb2_phy);
Greg Kroah-Hartman
maintainerPATCH 15/348 usb: typec: Add the missed altmode_id_remove() in typec_register_altmode()
In reply to Greg Kroah-HartmanFrom: Jing Xiangfeng <[email protected]>
commit 03026197bb657d784220b040c6173267a0375741 upstream.
typec_register_altmode() misses to call altmode_id_remove() in an error path. Add the missed function call to fix it.
--- drivers/usb/typec/class.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/typec/class.c +3 -1
@@ -487,8 +487,10 @@ typec_register_altmode(struct device *paint ret; alt =kzalloc (sizeof (*alt),GFP_KERNEL ); -if (!alt) +if (!alt) { +altmode_id_remove (parent, id);return ERR_PTR (-ENOMEM ); + } alt->adev.svid = desc->svid; alt->adev.mode = desc->mode;
Greg Kroah-Hartman
maintainerPATCH 16/348 xhci: solve a double free problem while doing s4
In reply to Greg Kroah-HartmanFrom: Zhangjiantao (Kirin, nanjing) <[email protected]>
commit b31d9d6d7abbf6483b871b6370bc31c930d53f54 upstream.
when system is doing s4, the process of xhci_resume may be as below:
1、xhci_mem_cleanup 2、xhci_init->xhci_mem_init->xhci_mem_cleanup(when memory is not enough). xhci_mem_cleanup will be executed twice when system is out of memory. xhci->port_caps is freed in xhci_mem_cleanup,but it isn't set to NULL. It will be freed twice when xhci_mem_cleanup is called the second time.
We got following bug when system resumes from s4:
kernel BUG at mm/slub.c:309!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP CPU: 0 PID: 5929 Tainted: G S W 5.4.96-arm64-desktop #1 pc : __slab_free+0x5c/0x424 lr : kfree+0x30c/0x32c Call trace: __slab_free+0x5c/0x424 kfree+0x30c/0x32c xhci_mem_cleanup+0x394/0x3cc xhci_mem_init+0x9ac/0x1070 xhci_init+0x8c/0x1d0 xhci_resume+0x1cc/0x5fc xhci_plat_resume+0x64/0x70 platform_pm_thaw+0x28/0x60 dpm_run_callback+0x54/0x24c device_resume+0xd0/0x200 async_resume+0x24/0x60 async_run_entry_fn+0x44/0x110 process_one_work+0x1f0/0x490 worker_thread+0x5c/0x450 kthread+0x158/0x160 ret_from_fork+0x10/0x24
Original patch that caused this issue was backported to 4.4 stable, so this should be backported to 4.4 stabe as well.
--- drivers/usb/host/xhci-mem.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci-mem.c +1 -0
@@ -1929,6 +1929,7 @@ no_bw: xhci->hw_ports =NULL ; xhci->rh_bw =NULL ; xhci->ext_caps =NULL ; + xhci->port_caps =NULL ; xhci->page_size =0 ; xhci->page_shift =0 ;
Greg Kroah-Hartman
maintainerPATCH 17/348 ntfs: fix validity check for file name attribute
In reply to Greg Kroah-HartmanFrom: Desmond Cheong Zhi Xi <[email protected]>
commit d98e4d95411bbde2220a7afa38dcc9c14d71acbe upstream.
When checking the file name attribute, we want to ensure that it fits within the bounds of ATTR_RECORD. To do this, we should check that (attr record + file name offset + file name length) < (attr record + attr record length).
However, the original check did not include the file name offset in the calculation. This means that corrupted on-disk metadata might not caught by the incorrect file name check, and lead to an invalid memory access.
An example can be seen in the crash report of a memory corruption error found by Syzbot:
https://syzkaller.appspot.com/bug?id=a1a1e379b225812688566745c3e2f7242bffc246
Adding the file name offset to the validity check fixes this error and passes the Syzbot reproducer test.
--- fs/ntfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs/inode.c +1 -1
@@ -476,7 +476,7 @@ err_corrupt_attr: } file_name_attr = (FILE_NAME_ATTR *)((u8 *)attr +le16_to_cpu (attr->data.resident.value_offset)); - p2 = (u8 *)attr +le32_to_cpu (attr->data.resident.value_length); + p2 = (u8 *)file_name_attr +le32_to_cpu (attr->data.resident.value_length);if (p2 < (u8 *)attr || p2 > p) goto err_corrupt_attr;/* This attribute is ok, but is it in the $Extend directory? */
Greg Kroah-Hartman
maintainerPATCH 18/348 copy_page_to_iter(): fix ITER_DISCARD case
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit a506abc7b644d71966a75337d5a534f531b3cdc4 upstream.
we need to advance the iterator...
--- lib/iov_iter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
lib/iov_iter.c +5 -2
@@ -896,9 +896,12 @@ size_t copy_page_to_iter(struct page *pasize_t wanted =copy_to_iter (kaddr + offset, bytes, i);kunmap_atomic (kaddr);return wanted; - }else if (unlikely (iov_iter_is_discard (i))) + }else if (unlikely (iov_iter_is_discard (i))) { +if (unlikely (i->count < bytes)) + bytes = i->count; + i->count -= bytes;return bytes; -else if (likely (!iov_iter_is_pipe (i))) + }else if (likely (!iov_iter_is_pipe (i)))return copy_page_to_iter_iovec (page, offset, bytes, i);else return copy_page_to_iter_pipe (page, offset, bytes, i);
Greg Kroah-Hartman
maintainerPATCH 19/348 iov_iter_fault_in_readable() should do nothing in xarray case
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 0e8f0d67401589a141950856902c7d0ec8d9c985 upstream.
... and actually should just check it's given an iovec-backed iterator in the first place.
--- lib/iov_iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/iov_iter.c +1 -1
@@ -422,7 +422,7 @@ int iov_iter_fault_in_readable(struct ioint err;struct iovec v; -if (!(i->type & (ITER_BVEC |ITER_KVEC ))) { +if (iter_is_iovec (i)) { iterate_iovec(i, bytes, v, iov, skip, ({ err = fault_in_pages_readable(v.iov_base, v.iov_len); if (unlikely(err))
Greg Kroah-Hartman
maintainerPATCH 2/348 ALSA: usb-audio: Fix OOB access at proc output
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 362372ceb6556f338e230f2d90af27b47f82365a upstream.
At extending the available mixer values for 32bit types, we forgot to add the corresponding entries for the format dump in the proc output. This may result in OOB access. Here adds the missing entries.
--- sound/usb/mixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/usb/mixer.c +3 -2
@@ -3241,8 +3241,9 @@ static void snd_usb_mixer_dump_cval(stru struct usb_mixer_elem_list *list) {struct usb_mixer_elem_info *cval =mixer_elem_list_to_info (list); -static const char *const val_types[] = {"BOOLEAN" ,"INV_BOOLEAN" , -"S8" ,"U8" ,"S16" ,"U16" }; +static const char *const val_types[] = { +"BOOLEAN" ,"INV_BOOLEAN" ,"S8" ,"U8" ,"S16" ,"U16" ,"S32" ,"U32" , + }; snd_iprintf(buffer, " Info: id=%i, control=%i, cmask=0x%x, " "channels=%i, type=\"%s\"\n", cval->head.id, cval->control, cval->cmask, cval->channels,
Greg Kroah-Hartman
maintainerPATCH 20/348 Input: joydev - prevent use of not validated data in JSIOCSBTNMAP ioctl
In reply to Greg Kroah-HartmanFrom: Alexander Larkin <[email protected]>
commit f8f84af5da9ee04ef1d271528656dac42a090d00 upstream.
Even though we validate user-provided inputs we then traverse past validated data when applying the new map. The issue was originally discovered by Murray McAllister with this simple POC (if the following is executed by an unprivileged user it will instantly panic the system):
int main(void) {
int fd, ret;
unsigned int buffer[10000];
fd = open("/dev/input/js0", O_RDONLY);
if (fd == -1)
printf("Error opening file\n");
ret = ioctl(fd, JSIOCSBTNMAP & ~IOCSIZE_MASK, &buffer);
printf("%d\n", ret);
}The solution is to traverse internal buffer which is guaranteed to only contain valid date when constructing the map.
--- drivers/input/joydev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/joydev.c +1 -1
@@ -500,7 +500,7 @@ static int joydev_handle_JSIOCSBTNMAP(stmemcpy (joydev->keypam, keypam, len);for (i =0 ; i < joydev->nkey; i++) - joydev->keymap[keypam[i] -BTN_MISC ] = i; + joydev->keymap[joydev->keypam[i] -BTN_MISC ] = i; out:kfree (keypam);
Greg Kroah-Hartman
maintainerPATCH 21/348 arm_pmu: Fix write counter incorrect in ARMv7 big-endian mode
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
commit fdbef8c4e68ad423416aa6cc93d1616d6f8ac5b3 upstream.
Commit 3a95200d3f89 ("arm_pmu: Change API to support 64bit counter values") changes the input "value" type from 32-bit to 64-bit, which introduces the following problem: ARMv7 PMU counters is 32-bit width, in big-endian mode, write counter uses high 32-bit, which writes an incorrect value.
Before:
Performance counter stats for 'ls':
2.22 msec task-clock # 0.675 CPUs utilized
0 context-switches # 0.000 K/sec
0 cpu-migrations # 0.000 K/sec
49 page-faults # 0.022 M/sec
2150476593 cycles # 966.663 GHz
2148588788 instructions # 1.00 insn per cycle
2147745484 branches # 965435.074 M/sec
2147508540 branch-misses # 99.99% of all branchesNone of the above hw event counters are correct.
Solution:
"value" forcibly converted to 32-bit type before being written to PMU register.
After:
Performance counter stats for 'ls':
2.09 msec task-clock # 0.681 CPUs utilized
0 context-switches # 0.000 K/sec
0 cpu-migrations # 0.000 K/sec
46 page-faults # 0.022 M/sec
2807301 cycles # 1.344 GHz
1060159 instructions # 0.38 insn per cycle
250496 branches # 119.914 M/sec
23192 branch-misses # 9.26% of all branches--- arch/arm/kernel/perf_event_v7.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/perf_event_v7.c +2 -2
@@ -773,10 +773,10 @@ static inline void armv7pmu_write_countepr_err ("CPU%u writing wrong counter %d\n" ,smp_processor_id (), idx); }else if (idx ==ARMV7_IDX_CYCLE_COUNTER ) { - asmvolatile ("mcr p15, 0, %0, c9, c13, 0" : :"r" (value)); + asmvolatile ("mcr p15, 0, %0, c9, c13, 0" : :"r" ((u32 )value)); }else {armv7_pmnc_select_counter (idx); - asmvolatile ("mcr p15, 0, %0, c9, c13, 2" : :"r" (value)); + asmvolatile ("mcr p15, 0, %0, c9, c13, 2" : :"r" ((u32 )value)); } }
Greg Kroah-Hartman
maintainerPATCH 22/348 ARM: dts: at91: sama5d4: fix pinctrl muxing
In reply to Greg Kroah-HartmanFrom: Ludovic Desroches <[email protected]>
commit 253adffb0e98eaf6da2e7cf73ae68695e21f2f3c upstream.
Fix pinctrl muxing, PD28, PD29 and PD31 can be muxed to peripheral A. It allows to use SCK0, SCK1 and SPI0_NPCS2 signals.
--- arch/arm/boot/dts/sama5d4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sama5d4.dtsi +1 -1
@@ -914,7 +914,7 @@ 0xffffffff 0x3ffcfe7c 0x1c010101 /* pioA */ 0x7fffffff 0xfffccc3a 0x3f00cc3a /* pioB */ 0xffffffff 0x3ff83fff 0xff00ffff /* pioC */ - 0x0003ff00 0x8002a800 0x00000000 /* pioD */ + 0xb003ff00 0x8002a800 0x00000000 /* pioD */ 0xffffffff 0x7fffffff 0x76fff1bf /* pioE */ >;
Greg Kroah-Hartman
maintainerPATCH 3/348 ALSA: usb-audio: scarlett2: Fix wrong resume call
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 785b6f29a795f109685f286b91e0250c206fbffb upstream.
The current way of the scarlett2 mixer code managing the usb_mixer_elem_info object is wrong in two ways: it passes its internal index to the head.id field, and the val_type field is uninitialized. This ended up with the wrong execution at the resume because a bogus unit id is passed wrongly. Also, in the later code extensions, we'll have more mixer elements, and passing the index will overflow the unit id size (of 256).
This patch corrects those issues. It introduces a new value type, USB_MIXER_BESPOKEN, which indicates a non-standard mixer element, and use this type for all scarlett2 mixer elements, as well as initializing the fixed unit id 0 for avoiding the overflow.
--- sound/usb/mixer.c | 3 +++ sound/usb/mixer.h | 1 + sound/usb/mixer_scarlett_gen2.c | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-)
sound/usb/mixer.c +3 -0
@@ -3599,6 +3599,9 @@ static int restore_mixer_value(struct usstruct usb_mixer_elem_info *cval =mixer_elem_list_to_info (list);int c, err, idx; +if (cval->val_type ==USB_MIXER_BESPOKEN ) +return 0 ; +if (cval->cmask) { idx =0 ;for (c =0 ; c <MAX_CHANNELS ; c++) {
sound/usb/mixer.h +1 -0
@@ -55,6 +55,7 @@ enum {USB_MIXER_U16 ,USB_MIXER_S32 ,USB_MIXER_U32 , + USB_MIXER_BESPOKEN, /* non-standard type */ }; typedef void (*usb_mixer_elem_dump_func_t)(struct snd_info_buffer *buffer,
sound/usb/mixer_scarlett_gen2.c +6 -1
@@ -949,10 +949,15 @@ static int scarlett2_add_new_ctl(structif (!elem)return -ENOMEM ; +/* We set USB_MIXER_BESPOKEN type, so that the core USB mixer code +* ignores them for resume and other operations. +* Also, the head.id field is set to 0, as we don't use this field. +*/ elem->head.mixer = mixer; elem->control = index; - elem->head.id = index; + elem->head.id =0 ; elem->channels = channels; + elem->val_type =USB_MIXER_BESPOKEN ; kctl =snd_ctl_new1 (ncontrol, elem);if (!kctl) {
Greg Kroah-Hartman
maintainerPATCH 4/348 ALSA: intel8x0: Fix breakage at ac97 clock measurement
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 24d1e49415be546470b20429d748e240d0518b7e upstream.
The recent workaround for the wild interrupts in commit c1f0616124c4 ("ALSA: intel8x0: Don't update period unless prepared") leaded to a regression, causing the interrupt storm during ac97 clock measurement at the driver probe. We need to handle the interrupt while the clock measurement as well as the proper PCM streams.
--- sound/pci/intel8x0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/intel8x0.c +1 -1
@@ -715,7 +715,7 @@ static inline void snd_intel8x0_update(sint status, civ, i, step;int ack =0 ; -if (!ichdev->prepared || ichdev->suspended) +if (!(ichdev->prepared || chip->in_measurement) || ichdev->suspended)return ;spin_lock_irqsave (&chip->reg_lock, flags);
Greg Kroah-Hartman
maintainerPATCH 5/348 ALSA: hda/realtek: Add another ALC236 variant support
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 1948fc065a89f18d057b8ffaef6d7242ad99edb8 upstream.
The codec chip 10ec:0230 is another variant of ALC236, combined with a card reader. Apply the equivalent setup as 10ec:0236.
--- sound/pci/hda/patch_realtek.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/pci/hda/patch_realtek.c +13 -0
@@ -375,6 +375,7 @@ static void alc_fill_eapd_coef(struct hdalc_update_coef_idx (codec,0x67 ,0xf000 ,0x3000 );/* fallthrough */ case 0x10ec0215 : +case 0x10ec0230 :case 0x10ec0233 :case 0x10ec0235 :case 0x10ec0236 :
@@ -3143,6 +3144,7 @@ static void alc_disable_headset_jack_keyalc_update_coef_idx (codec,0x49 ,0x0045 ,0x0 );alc_update_coef_idx (codec,0x44 ,0x0045 <<8 ,0x0 );break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_write_coef_idx (codec,0x48 ,0x0 );
@@ -3170,6 +3172,7 @@ static void alc_enable_headset_jack_key(alc_update_coef_idx (codec,0x49 ,0x007f ,0x0045 );alc_update_coef_idx (codec,0x44 ,0x007f <<8 ,0x0045 <<8 );break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_write_coef_idx (codec,0x48 ,0xd011 );
@@ -4630,6 +4633,7 @@ static void alc_headset_mode_unplugged(scase 0x10ec0255 :alc_process_coef_fw (codec, coef0255);break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_process_coef_fw (codec, coef0256);
@@ -4744,6 +4748,7 @@ static void alc_headset_mode_mic_in(strualc_process_coef_fw (codec, coef0255);snd_hda_set_pin_ctl_cache (codec, mic_pin,PIN_VREF50 );break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_write_coef_idx (codec,0x45 ,0xc489 );
@@ -4893,6 +4898,7 @@ static void alc_headset_mode_default(strcase 0x10ec0255 :alc_process_coef_fw (codec, coef0255);break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_write_coef_idx (codec,0x1b ,0x0e4b );
@@ -4991,6 +4997,7 @@ static void alc_headset_mode_ctia(structcase 0x10ec0255 :alc_process_coef_fw (codec, coef0255);break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_process_coef_fw (codec, coef0256);
@@ -5104,6 +5111,7 @@ static void alc_headset_mode_omtp(structcase 0x10ec0255 :alc_process_coef_fw (codec, coef0255);break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_process_coef_fw (codec, coef0256);
@@ -5199,6 +5207,7 @@ static void alc_determine_headset_type(s val =alc_read_coef_idx (codec,0x46 ); is_ctia = (val &0x0070 ) ==0x0070 ;break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_write_coef_idx (codec,0x1b ,0x0e4b );
@@ -5492,6 +5501,7 @@ static void alc255_set_default_jack_typecase 0x10ec0255 :alc_process_coef_fw (codec, alc255fw);break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 :alc_process_coef_fw (codec, alc256fw);
@@ -6092,6 +6102,7 @@ static void alc_combo_jack_hp_jd_restartalc_update_coef_idx (codec,0x4a ,0x8000 ,1 <<15 );/* Reset HP JD */ alc_update_coef_idx (codec,0x4a ,0x8000 ,0 <<15 );break ; +case 0x10ec0230 :case 0x10ec0235 :case 0x10ec0236 :case 0x10ec0255 :
@@ -9063,6 +9074,7 @@ static int patch_alc269(struct hda_codec spec->shutup = alc256_shutup; spec->init_hook = alc256_init;break ; +case 0x10ec0230 :case 0x10ec0236 :case 0x10ec0256 : spec->codec_variant =ALC269_TYPE_ALC256 ;
@@ -10354,6 +10366,7 @@ static const struct hda_device_id snd_hdHDA_CODEC_ENTRY (0x10ec0221 ,"ALC221" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0222 ,"ALC222" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0225 ,"ALC225" , patch_alc269), +HDA_CODEC_ENTRY (0x10ec0230 ,"ALC236" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0231 ,"ALC231" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0233 ,"ALC233" , patch_alc269), HDA_CODEC_ENTRY(0x10ec0234, "ALC234", patch_alc269),
Greg Kroah-Hartman
maintainerPATCH 6/348 ALSA: hda/realtek: Improve fixup for HP Spectre x360 15-df0xxx
In reply to Greg Kroah-HartmanFrom: Elia Devito <[email protected]>
commit 434591b2a77def0e78abfa38e5d7c4bca954e68a upstream.
On HP Spectre x360 15-df0xxx, after system boot with plugged headset, the headset mic are not detected.
Moving pincfg and DAC's config to single fixup function fix this.
[ The actual bug in the original code was that it used a chain to
ALC286_FIXUP_SPEAKER2_TO_DAC1, and it contains not only the DAC1 route fix but also another chain to ALC269_FIXUP_THINKPAD_ACPI. I thought the latter one is harmless for non-Thinkpad, but it doesn't seem so; it contains again yet another chain to ALC269_FIXUP_SKI_IGNORE, and this might be bad for some machines, including this HP machine. -- tiwai ]
--- sound/pci/hda/patch_realtek.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
sound/pci/hda/patch_realtek.c +20 -7
@@ -6218,6 +6218,24 @@ static void alc274_fixup_hp_headset_mic( } } +static void alc285_fixup_hp_spectre_x360 (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +static const hda_nid_t conn[] = {0x02 }; +static const struct hda_pintbl pincfgs[] = { + {0x14 ,0x90170110 },/* rear speaker */ + { } + }; + +switch (action) { +case HDA_FIXUP_ACT_PRE_PROBE : +snd_hda_apply_pincfgs (codec, pincfgs); +/* force front speaker to DAC1 */ +snd_hda_override_conn_list (codec,0x17 ,ARRAY_SIZE (conn), conn); +break ; + } +} +/* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c"
@@ -7916,13 +7934,8 @@ static const struct hda_fixup alc269_fix .chain_id = ALC269_FIXUP_HP_LINE1_MIC1_LED, }, [ALC285_FIXUP_HP_SPECTRE_X360] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl []) { - {0x14 ,0x90170110 },/* enable top speaker */ - {} - }, - .chained = true, - .chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1, + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_hp_spectre_x360, }, };
Greg Kroah-Hartman
maintainerPATCH 7/348 ALSA: hda/realtek: Fix bass speaker DAC mapping for Asus UM431D
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit f8fbcdfb0665de60997d9746809e1704ed782bbc upstream.
Asus Zenbook 14 UM431D has two speaker pins and a headphone pin, and the auto-parser ends up assigning the bass to the third DAC 0x06. Although the tone comes out, it's inconvenient because this DAC has no volume control unlike two other DACs.
For obtaining the volume control for the bass speaker, this patch enforces the mapping to let both front and bass speaker pins sharing the same DAC. It's not ideal but a little bit of improvement.
Since we've already applied the same workaround for another ASUS machine, we just need to hook the chain to the existing quirk.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -7681,6 +7681,8 @@ static const struct hda_fixup alc269_fix { 0x20, AC_VERB_SET_PROC_COEF, 0x4e4b }, { } }, + .chained = true, + .chain_id = ALC289_FIXUP_ASUS_GA401, }, [ALC285_FIXUP_HP_GPIO_LED] = { .type = HDA_FIXUP_FUNC,
Greg Kroah-Hartman
maintainerPATCH 8/348 ALSA: hda/realtek: Apply LED fixup for HP Dragonfly G1, too
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 0ac05b25c3dd8299204ae9d50c1c2f7f05eef08f upstream.
HP Dragonfly G1 (SSID 103c:861f) also requires the same quirk for the mute and mic-mute LED just as Dragonfly G2 model.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8093,6 +8093,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x84da ,"HP OMEN dc0019-ur" ,ALC295_FIXUP_HP_OMEN ),SND_PCI_QUIRK (0x103c ,0x84e7 ,"HP Pavilion 15" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x8519 ,"HP Spectre x360 15-df0xxx" ,ALC285_FIXUP_HP_SPECTRE_X360 ), +SND_PCI_QUIRK (0x103c ,0x861f ,"HP Elite Dragonfly G1" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x869d ,"HP" ,ALC236_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x8724 ,"HP EliteBook 850 G7" ,ALC285_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8729, "HP", ALC285_FIXUP_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 9/348 media: dvb-usb: fix wrong definition
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit c680ed46e418e9c785d76cf44eb33bfd1e8cf3f6 upstream.
syzbot reported WARNING in vmalloc. The problem
was in zero size passed to vmalloc.
The root case was in wrong cxusb_bluebird_lgz201_properties definition. adapter array has only 1 entry, but num_adapters was 2.
Call Trace: __vmalloc_node mm/vmalloc.c:2963 [inline] vmalloc+0x67/0x80 mm/vmalloc.c:2996 dvb_dmx_init+0xe4/0xb90 drivers/media/dvb-core/dvb_demux.c:1251 dvb_usb_adapter_dvb_init+0x564/0x860 drivers/media/usb/dvb-usb/dvb-usb-dvb.c:184 dvb_usb_adapter_init drivers/media/usb/dvb-usb/dvb-usb-init.c:86 [inline] dvb_usb_init drivers/media/usb/dvb-usb/dvb-usb-init.c:184 [inline] dvb_usb_device_init.cold+0xc94/0x146e drivers/media/usb/dvb-usb/dvb-usb-init.c:308 cxusb_probe+0x159/0x5e0 drivers/media/usb/dvb-usb/cxusb.c:1634
--- drivers/media/usb/dvb-usb/cxusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/dvb-usb/cxusb.c +1 -1
@@ -1950,7 +1950,7 @@ static struct dvb_usb_device_properties .size_of_priv = sizeof(struct cxusb_state), - .num_adapters = 2, + .num_adapters = 1, .adapter = { { .num_frontends = 1,
Greg Kroah-Hartman
maintainercover 5.4.132-rc1 review
This is the start of the stable review cycle for the 5.4.132 release. There are 348 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, 14 Jul 2021 06:02:46 +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/v5.x/stable-review/patch-5.4.132-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-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.132-rc1
Quat Le <[email protected]>
scsi: core: Retry I/O for Notify (Enable Spinup) Required error
Johan Hovold <[email protected]>
mmc: vub3000: fix control-request direction
Bean Huo <[email protected]>
mmc: block: Disable CMDQ on the ioctl path
Long Li <[email protected]>
block: return the correct bvec when checking for gaps
Varun Prakash <[email protected]>
scsi: target: cxgbit: Unmap DMA buffer before calling target_execute_cmd()
Arnaldo Carvalho de Melo <[email protected]>
perf llvm: Return -ENOMEM when asprintf() fails
Dave Hansen <[email protected]>
selftests/vm/pkeys: fix alloc_random_pkey() to make it really, really random
Miaohe Lin <[email protected]>
mm/z3fold: fix potential memory leak in z3fold_destroy_pool()
Miaohe Lin <[email protected]>
mm/huge_memory.c: don't discard hugepage if other processes are mapping it
Alex Williamson <[email protected]>
vfio/pci: Handle concurrent vma faults
Pali Rohár <[email protected]>
arm64: dts: marvell: armada-37xx: Fix reg for standard variant of UART
Pali Rohár <[email protected]>
serial: mvebu-uart: correctly calculate minimal possible baudrate
Pali Rohár <[email protected]>
serial: mvebu-uart: do not allow changing baudrate when uartclk is not available
Nicholas Piggin <[email protected]>
powerpc: Offline CPU in stop_this_cpu()
Christophe JAILLET <[email protected]>
leds: ktd2692: Fix an error handling path
Zhen Lei <[email protected]>
leds: as3645a: Fix error return code in as3645a_parse_node()
Chung-Chiang Cheng <[email protected]>
configfs: fix memleak in configfs_release_bin_file
Codrin Ciubotariu <[email protected]>
ASoC: atmel-i2s: Fix usage of capture and playback at the same time
Marek Szyprowski <[email protected]>
extcon: max8997: Add missing modalias string
Stephan Gerhold <[email protected]>
extcon: sm5502: Drop invalid register write in sm5502_reg_data
Christophe JAILLET <[email protected]>
phy: ti: dm816x: Fix the error handling path in 'dm816x_usb_phy_probe()
Kunihiko Hayashi <[email protected]>
phy: uniphier-pcie: Fix updating phy parameters
Richard Fitzgerald <[email protected]>
soundwire: stream: Fix test for DP prepare complete
Zhen Lei <[email protected]>
scsi: mpt3sas: Fix error return value in _scsih_expander_add()
Yang Yingliang <[email protected]>
mtd: rawnand: marvell: add missing clk_disable_unprepare() on error in marvell_nfc_resume()
Geert Uytterhoeven <[email protected]>
of: Fix truncation of memory sizes on 32-bit platforms
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Correct definition of CS42L42_ADC_PDN_MASK
Jonathan Cameron <[email protected]>
iio: prox: isl29501: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: light: vcnl4035: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Maciej W. Rozycki <[email protected]>
serial: 8250: Actually allow UPF_MAGIC_MULTIPLIER baud rates
Sergio Paracuellos <[email protected]>
staging: mt7621-dts: fix pci address for PCI memory range
Pavel Skripkin <[email protected]>
staging: rtl8712: fix memory leak in rtl871x_load_fw_cb
Pavel Skripkin <[email protected]>
staging: rtl8712: remove redundant check in r871xu_drv_init
Dan Carpenter <[email protected]>
staging: gdm724x: check for overflow in gdm_lte_netif_rx()
Dan Carpenter <[email protected]>
staging: gdm724x: check for buffer overflow in gdm_lte_multi_sdu_pkt()
Jonathan Cameron <[email protected]>
iio: magn: rm3100: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: adc: ti-ads8688: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: adc: mxs-lradc: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: adc: hx711: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: adc: at91-sama5d2: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Alexandru Ardelean <[email protected]>
iio: at91-sama5d2_adc: remove usage of iio_priv_to_dev() helper
Andy Shevchenko <[email protected]>
eeprom: idt_89hpesx: Restore printing the unsupported fwnode name
Andy Shevchenko <[email protected]>
eeprom: idt_89hpesx: Put fwnode in matching case during ->probe()
Clément Lassieur <[email protected]>
usb: dwc2: Don't reset the core after setting turnaround time
Andrew Gabbasov <[email protected]>
usb: gadget: f_fs: Fix setting of device and driver data cross-references
Christophe JAILLET <[email protected]>
ASoC: mediatek: mtk-btcvsd: Fix an error handling path in 'mtk_btcvsd_snd_probe()'
Srinath Mannam <[email protected]>
iommu/dma: Fix IOVA reserve dma ranges
Randy Dunlap <[email protected]>
s390: appldata depends on PROC_SYSCTL
Zhen Lei <[email protected]>
visorbus: fix error return code in visorchipset_init()
Joachim Fenkes <[email protected]>
fsi/sbefifo: Fix reset timeout
Joachim Fenkes <[email protected]>
fsi/sbefifo: Clean up correct FIFO when receiving reset request from SBE
Eddie James <[email protected]>
fsi: occ: Don't accept response from un-initialized OCC
Eddie James <[email protected]>
fsi: scom: Reset the FSI2PIB engine for any error
Colin Ian King <[email protected]>
fsi: core: Fix return of error values on failures
Randy Dunlap <[email protected]>
scsi: FlashPoint: Rename si_flags field
Andy Shevchenko <[email protected]>
leds: lm3692x: Put fwnode in any case during ->probe()
Marek Behún <[email protected]>
leds: lm36274: cosmetic: rename lm36274_data to chip
Andy Shevchenko <[email protected]>
leds: lm3532: select regmap I2C API
Christophe JAILLET <[email protected]>
tty: nozomi: Fix the error handling path of 'nozomi_card_init()'
Christophe JAILLET <[email protected]>
firmware: stratix10-svc: Fix a resource leak in an error handling path
Yu Kuai <[email protected]>
char: pcmcia: error out if 'num_bytes_read' is greater than 4 in set_protocol()
Corentin Labbe <[email protected]>
mtd: partitions: redboot: seek fis-index-block in the right node
Zhen Lei <[email protected]>
Input: hil_kbd - fix error return code in hil_dev_connect()
Kuninori Morimoto <[email protected]>
ASoC: rsnd: tidyup loop on rsnd_adg_clk_query()
Andy Shevchenko <[email protected]>
backlight: lm3630a_bl: Put fwnode in error case during ->probe()
Yang Yingliang <[email protected]>
ASoC: hisilicon: fix missing clk_disable_unprepare() on error in hi6210_i2s_startup()
Yang Yingliang <[email protected]>
ASoC: rk3328: fix missing clk_disable_unprepare() on error in rk3328_platform_probe()
Jonathan Cameron <[email protected]>
iio: potentiostat: lmp91000: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: cros_ec_sensors: Fix alignment of buffer in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: light: tcs3472: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: light: isl29125: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: magn: bmc150: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: magn: hmc5843: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: prox: as3935: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: prox: srf08: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: humidity: am2315: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: adc: ti-ads1015: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: accel: stk8ba50: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: accel: mxc4005: Fix overread of data and alignment issue.
Jonathan Cameron <[email protected]>
iio:accel:mxc4005: Drop unnecessary explicit casts in regmap_bulk_read calls
Jonathan Cameron <[email protected]>
iio: accel: kxcjk-1013: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: accel: hid: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Jonathan Cameron <[email protected]>
iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp()
Nuno Sa <[email protected]>
iio: adis16400: do not return ints in irq handlers
Nuno Sa <[email protected]>
iio: adis_buffer: do not return ints in irq handlers
Arnd Bergmann <[email protected]>
mwifiex: re-fix for unaligned accesses
Christophe JAILLET <[email protected]>
tty: nozomi: Fix a resource leak in an error handling function
Paul E. McKenney <[email protected]>
rcu: Invoke rcu_spawn_core_kthreads() from rcu_spawn_gp_kthread()
Andy Shevchenko <[email protected]>
staging: fbtft: Rectify GPIO handling
Wei Li <[email protected]>
MIPS: Fix PKMAP with 32-bit MIPS huge page support
Leon Romanovsky <[email protected]>
RDMA/mlx5: Don't access NULL-cleared mpi pointer
Pavel Skripkin <[email protected]>
net: sched: fix warning in tcindex_alloc_perfect_hash
Vadim Fedorenko <[email protected]>
net: lwtunnel: handle MTU calculation in forwading
Muchun Song <[email protected]>
writeback: fix obtain a reference to a freeing memcg css
Robert Hancock <[email protected]>
clk: si5341: Update initialization magic
Robert Hancock <[email protected]>
clk: si5341: Avoid divide errors due to bogus register contents
Cristian Ciocaltea <[email protected]>
clk: actions: Fix bisp_factor_table based clocks on Owl S500 SoC
Cristian Ciocaltea <[email protected]>
clk: actions: Fix SD clocks factor table on Owl S500 SoC
Cristian Ciocaltea <[email protected]>
clk: actions: Fix UART clock dividers on Owl S500 SoC
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix handling of HCI_LE_Advertising_Set_Terminated event
Luiz Augusto von Dentz <[email protected]>
Bluetooth: mgmt: Fix slab-out-of-bounds in tlv_data_is_valid
Petr Oros <[email protected]>
Revert "be2net: disable bh with spin_lock in be_process_mcc"
Bailey Forrest <[email protected]>
gve: Fix swapped vars when fetching max queues
Gary Lin <[email protected]>
bpfilter: Specify the log level for the kmsg message
Sasha Neftin <[email protected]>
e1000e: Check the PCIm state
Eric Dumazet <[email protected]>
ipv6: fix out-of-bound access in ip6_parse_tlv()
Sukadev Bhattiprolu <[email protected]>
ibmvnic: free tx_pool if tso_pool alloc fails
Dany Madden <[email protected]>
Revert "ibmvnic: remove duplicate napi_schedule call in open function"
Mateusz Palczewski <[email protected]>
i40e: Fix autoneg disabling for non-10GBaseT links
Dinghao Liu <[email protected]>
i40e: Fix error handling in i40e_vsi_open
Maciej Żenczykowski <[email protected]>
bpf: Do not change gso_size during bpf_skb_change_proto()
Eric Dumazet <[email protected]>
ipv6: exthdrs: do not blindly use init_net
Jian-Hong Pan <[email protected]>
net: bcmgenet: Fix attaching to PYH failed on RPi 4B
Ping-Ke Shih <[email protected]>
mac80211: remove iwlwifi specific workaround NDPs of null_response
Eric Dumazet <[email protected]>
ieee802154: hwsim: avoid possible crash in hwsim_del_edge_nl()
Dongliang Mu <[email protected]>
ieee802154: hwsim: Fix memory leak in hwsim_add_one
Marcelo Ricardo Leitner <[email protected]>
tc-testing: fix list handling
Miao Wang <[email protected]>
net/ipv4: swap flow ports when validating source
Eric Dumazet <[email protected]>
vxlan: add missing rcu_read_lock() in neigh_reduce()
Eric Dumazet <[email protected]>
pkt_sched: sch_qfq: fix qfq_change_class() error path
Jakub Kicinski <[email protected]>
tls: prevent oversized sendfile() hangs by ignoring MSG_MORE
Yunsheng Lin <[email protected]>
net: sched: add barrier to ensure correct ordering for lockless qdisc
Antoine Tenart <[email protected]>
vrf: do not push non-ND strict packets with a source LLA through packet taps again
Pavel Skripkin <[email protected]>
net: ethernet: ezchip: fix error handling
Pavel Skripkin <[email protected]>
net: ethernet: ezchip: fix UAF in nps_enet_remove
Pavel Skripkin <[email protected]>
net: ethernet: aeroflex: fix UAF in greth_of_remove
Wang Hai <[email protected]>
samples/bpf: Fix the error return code of xdp_redirect's main()
Bob Pearson <[email protected]>
RDMA/rxe: Fix qp reference counting for atomic ops
Pablo Neira Ayuso <[email protected]>
netfilter: nft_tproxy: restrict support to TCP and UDP transport protocols
Pablo Neira Ayuso <[email protected]>
netfilter: nft_osf: check for TCP packet before further processing
Pablo Neira Ayuso <[email protected]>
netfilter: nft_exthdr: check for IPv6 packet before further processing
Leon Romanovsky <[email protected]>
RDMA/mlx5: Don't add slave port to unaffiliated list
Liu Shixin <[email protected]>
netlabel: Fix memory leak in netlbl_mgmt_add_common
Yang Li <[email protected]>
ath10k: Fix an error code in ath10k_add_interface()
Christophe JAILLET <[email protected]>
brcmsmac: mac80211_if: Fix a resource leak in an error handling path
Alvin Šipraga <[email protected]>
brcmfmac: correctly report average RSSI in station info
Alvin Šipraga <[email protected]>
brcmfmac: fix setting of station info chains bitmask
Zhen Lei <[email protected]>
ssb: Fix error return code in ssb_bus_scan()
Bryan O'Donoghue <[email protected]>
wcn36xx: Move hal_buf allocation to devm_kmalloc in probe
Dongliang Mu <[email protected]>
ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
Randy Dunlap <[email protected]>
wireless: carl9170: fix LEDS build errors & warnings
Yang Yingliang <[email protected]>
ath10k: add missing error return code in ath10k_pci_probe()
Yang Yingliang <[email protected]>
ath10k: go to path err_unsupported when chip id is not supported
Zhihao Cheng <[email protected]>
tools/bpftool: Fix error return code in do_batch()
Colin Ian King <[email protected]>
drm: qxl: ensure surf.data is ininitialized
Kamal Heib <[email protected]>
RDMA/rxe: Fix failure during driver load
Leon Romanovsky <[email protected]>
RDMA/core: Sanitize WQ state received from the userspace
Boris Sukholitko <[email protected]>
net/sched: act_vlan: Fix modify to allow 0
Zhen Lei <[email protected]>
ehea: fix error return code in ehea_restart_qps()
Thomas Hebb <[email protected]>
drm/rockchip: dsi: move all lane config except LCDC mux to bind()
Yang Yingliang <[email protected]>
drm/rockchip: cdn-dp-core: add missing clk_disable_unprepare() on error in cdn_dp_grf_write()
Yang Yingliang <[email protected]>
net: ftgmac100: add missing error return code in ftgmac100_probe()
Jerome Brunet <[email protected]>
clk: meson: g12a: fix gp0 and hifi ranges
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a77990: JTAG pins do not have pull-down capabilities
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a7796: Add missing bias for PRESET# pin
Andy Shevchenko <[email protected]>
net: pch_gbe: Propagate error from devm_gpio_request_one()
Andy Shevchenko <[email protected]>
net: mvpp2: Put fwnode in error case during ->probe()
Christophe JAILLET <[email protected]>
video: fbdev: imxfb: Fix an error message
Sabrina Dubroca <[email protected]>
xfrm: xfrm_state_mtu should return at least 1280 for ipv6
Jan Kara <[email protected]>
dax: fix ENOMEM handling in grab_mapping_entry()
Dan Carpenter <[email protected]>
ocfs2: fix snprintf() checking
Rafael J. Wysocki <[email protected]>
cpufreq: Make cpufreq_online() call driver->offline() on errors
Nathan Chancellor <[email protected]>
ACPI: bgrt: Fix CFI violation
Dwaipayan Ray <[email protected]>
ACPI: Use DEVICE_ATTR_<RW|RO|WO> macros
Zhang Yi <[email protected]>
blk-wbt: make sure throttle is enabled properly
Zhang Yi <[email protected]>
blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()
Matti Vaittinen <[email protected]>
extcon: extcon-max8997: Fix IRQ freeing at error path
Krzysztof Wilczyński <[email protected]>
ACPI: sysfs: Fix a buffer overrun problem with description_show()
Herbert Xu <[email protected]>
crypto: nx - Fix RCU warning in nx842_OF_upd_status
Mirko Vogt <mirko-dev|[email protected]>
spi: spi-sun6i: Fix chipselect/clock bug
Qais Yousef <[email protected]>
sched/uclamp: Fix uclamp_tg_restrict()
Vincent Donnefort <[email protected]>
sched/rt: Fix Deadline utilization tracking during policy change
Vincent Donnefort <[email protected]>
sched/rt: Fix RT utilization tracking during policy change
David Sterba <[email protected]>
btrfs: clear log tree recovering status if starting transaction fails
Axel Lin <[email protected]>
regulator: hi655x: Fix pass wrong pointer to config.driver_data
Sean Christopherson <[email protected]>
KVM: nVMX: Ensure 64-bit shift when checking VMFUNC bitmap
Guenter Roeck <[email protected]>
hwmon: (max31790) Fix fan speed reporting for fan7..12
Guenter Roeck <[email protected]>
hwmon: (max31722) Remove non-standard ACPI device IDs
Dillon Min <[email protected]>
media: s5p-g2d: Fix a memory leak on ctx->fh.m2m_ctx
Anshuman Khandual <[email protected]>
arm64/mm: Fix ttbr0 values stored in struct thread_info for software-pan
Mark Rutland <[email protected]>
arm64: consistently use reserved_pg_dir
Zhen Lei <[email protected]>
mmc: usdhi6rol0: fix error return code in usdhi6_probe()
Zhang Qilong <[email protected]>
crypto: omap-sham - Fix PM reference leak in omap sham ops
Tong Tiangen <[email protected]>
crypto: nitrox - fix unchecked variable in nitrox_register_interrupts
Gustavo A. R. Silva <[email protected]>
media: siano: Fix out-of-bounds warnings in smscore_load_firmware_family2()
Randy Dunlap <[email protected]>
m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
Johan Hovold <[email protected]>
media: gspca/gl860: fix zero-length control requests
Zhen Lei <[email protected]>
media: tc358743: Fix error return code in tc358743_probe_of()
Dan Carpenter <[email protected]>
media: au0828: fix a NULL vs IS_ERR() check
Lv Yunlong <[email protected]>
media: exynos4-is: Fix a use after free in isp_video_release
Sergey Shtylyov <[email protected]>
pata_ep93xx: fix deferred probing
Christophe JAILLET <[email protected]>
media: rc: i2c: Fix an error message
Christophe JAILLET <[email protected]>
crypto: ccp - Fix a resource leak in an error handling path
Mimi Zohar <[email protected]>
evm: fix writing <securityfs>/evm overflow
Sergey Shtylyov <[email protected]>
pata_octeon_cf: avoid WARN_ON() in ata_host_activate()
Josh Poimboeuf <[email protected]>
kbuild: Fix objtool dependency for 'OBJECT_FILES_NON_STANDARD_<obj> := n'
Luc Van Oostenryck <[email protected]>
kbuild: run the checker after the compiler
Qais Yousef <[email protected]>
sched/uclamp: Fix locking around cpu_util_update_eff()
Qais Yousef <[email protected]>
sched/uclamp: Fix wrong implementation of cpu.uclamp.min
Randy Dunlap <[email protected]>
media: I2C: change 'RST' to "RSET" to fix multiple build errors
Sergey Shtylyov <[email protected]>
pata_rb532_cf: fix deferred probing
Sergey Shtylyov <[email protected]>
sata_highbank: fix deferred probing
Zhen Lei <[email protected]>
crypto: ux500 - Fix error return code in hash_hw_final()
Corentin Labbe <[email protected]>
crypto: ixp4xx - dma_unmap the correct address
Mauro Carvalho Chehab <[email protected]>
media: s5p_cec: decrement usage count if disabled
Roman Gushchin <[email protected]>
writeback, cgroup: increment isw_nr_in_flight before grabbing an inode
Arnd Bergmann <[email protected]>
ia64: mca_drv: fix incorrect array size calculation
Petr Mladek <[email protected]>
kthread_worker: fix return value when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
Ming Lei <[email protected]>
block: fix discard request merge
Steve French <[email protected]>
cifs: fix missing spinlock around update to ses->status
Jason Gerecke <[email protected]>
HID: wacom: Correct base usage for capacitive ExpressKey status bits
Richard Fitzgerald <[email protected]>
ACPI: tables: Add custom DSDT file as makefile prerequisite
Paul E. McKenney <[email protected]>
clocksource: Retry clock read if long delays detected
Haiyang Zhang <[email protected]>
PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv()
Tony Luck <[email protected]>
EDAC/Intel: Do not load EDAC driver when running as a guest
Hannes Reinecke <[email protected]>
nvmet-fc: do not check for invalid target port in nvmet_fc_handle_fcp_rqst()
Jiapeng Chong <[email protected]>
platform/x86: toshiba_acpi: Fix missing error code in toshiba_acpi_setup_keyboard()
Ming Lei <[email protected]>
block: fix race between adding/removing rq qos and normal IO
Hui Wang <[email protected]>
ACPI: resources: Add checks for ACPI IRQ override
Hanjun Guo <[email protected]>
ACPI: bus: Call kobject_put() in acpi_init() error path
Erik Kaneda <[email protected]>
ACPICA: Fix memory leak caused by _CID repair function
Alexander Aring <[email protected]>
fs: dlm: fix memory leak when fenced
Richard Fitzgerald <[email protected]>
random32: Fix implicit truncation warning in prandom_seed_state()
Alexander Aring <[email protected]>
fs: dlm: cancel work sync othercon
zhangyi (F) <[email protected]>
block_dump: remove block_dump feature in mark_inode_dirty()
Chris Chiu <[email protected]>
ACPI: EC: Make more Asus laptops use ECDT _GPE
Richard Fitzgerald <[email protected]>
lib: vsprintf: Fix handling of number field widths in vsscanf
YueHaibing <[email protected]>
hv_utils: Fix passing zero to 'PTR_ERR' warning
Mario Limonciello <[email protected]>
ACPI: processor idle: Fix up C-state latency if not ordered
Bixuan Cui <[email protected]>
EDAC/ti: Add missing MODULE_DEVICE_TABLE
Dmitry Torokhov <[email protected]>
HID: do not use down_interruptible() when unbinding devices
Shuah Khan <[email protected]>
media: Fix Media Controller API config checks
Axel Lin <[email protected]>
regulator: da9052: Ensure enough delay time for .set_voltage_time_sel
Hsin-Hsiung Wang <[email protected]>
regulator: mt6358: Fix vdram2 .vsel_mask
Heiko Carstens <[email protected]>
KVM: s390: get rid of register asm usage
Boqun Feng <[email protected]>
lockding/lockdep: Avoid to find wrong lock dep path in check_irq_usage()
Boqun Feng <[email protected]>
locking/lockdep: Fix the dep path printing for backwards BFS
Christophe Leroy <[email protected]>
btrfs: disable build on platforms having page size 256K
Josef Bacik <[email protected]>
btrfs: abort transaction if we fail to update the delayed inode
Josef Bacik <[email protected]>
btrfs: fix error handling in __btrfs_update_delayed_inode
Suraj Jitindar Singh <[email protected]>
KVM: PPC: Book3S HV: Fix TLB management on SMT8 POWER9 and POWER10 processors
Jing Xiangfeng <[email protected]>
drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()
Guenter Roeck <[email protected]>
hwmon: (max31790) Fix pwmX_enable attributes
Guenter Roeck <[email protected]>
hwmon: (max31790) Report correct current pwm duty cycles
Steve Longerbeam <[email protected]>
media: imx-csi: Skip first few frames from a BT.656 source
Mauro Carvalho Chehab <[email protected]>
media: siano: fix device register error path
Mauro Carvalho Chehab <[email protected]>
media: dvb_net: avoid speculation from net slot
Ard Biesheuvel <[email protected]>
crypto: shash - avoid comparing pointers to exported functions under CFI
Zheyu Ma <[email protected]>
mmc: via-sdmmc: add a check against NULL pointer dereference
Krzysztof Kozlowski <[email protected]>
mmc: sdhci-sprd: use sdhci_sprd_writew
Tong Zhang <[email protected]>
memstick: rtsx_usb_ms: fix UAF
Dongliang Mu <[email protected]>
media: dvd_usb: memory leak in cinergyt2_fe_attach
Nick Desaulniers <[email protected]>
Makefile: fix GDB warning with CONFIG_RELR
Evgeny Novikov <[email protected]>
media: st-hva: Fix potential NULL pointer dereferences
Zheyu Ma <[email protected]>
media: bt8xx: Fix a missing check bug in bt878_probe
Lv Yunlong <[email protected]>
media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release
Igor Matheus Andrade Torrente <[email protected]>
media: em28xx: Fix possible memory leak of em28xx struct
Odin Ugedal <[email protected]>
sched/fair: Fix ascii art by relpacing tabs
Jack Xu <[email protected]>
crypto: qat - remove unused macro in FW loader
Jack Xu <[email protected]>
crypto: qat - check return code of qat_hal_rd_rel_reg()
Laurent Pinchart <[email protected]>
media: imx: imx7_mipi_csis: Fix logging of only error event counters
Anirudh Rayabharam <[email protected]>
media: pvrusb2: fix warning in pvr2_i2c_core_done
Hans Verkuil <[email protected]>
media: cobalt: fix race condition in setting HPD
Pavel Skripkin <[email protected]>
media: cpia2: fix memory leak in cpia2_usb_probe
Mauro Carvalho Chehab <[email protected]>
media: sti: fix obj-$(config) targets
Bixuan Cui <[email protected]>
crypto: nx - add missing MODULE_DEVICE_TABLE
Łukasz Stelmach <[email protected]>
hwrng: exynos - Fix runtime PM imbalance on error
Zou Wei <[email protected]>
regulator: uniphier: Add missing MODULE_DEVICE_TABLE
Tian Tao <[email protected]>
spi: omap-100k: Fix the length judgment problem
Jay Fang <[email protected]>
spi: spi-topcliff-pch: Fix potential double free in pch_spi_process_messages()
Jay Fang <[email protected]>
spi: spi-loopback-test: Fix 'tx_buf' might be 'rx_buf'
Mauro Carvalho Chehab <[email protected]>
media: exynos-gsc: fix pm_runtime_get_sync() usage count
Mauro Carvalho Chehab <[email protected]>
media: sti/bdisp: fix pm_runtime_get_sync() usage count
Mauro Carvalho Chehab <[email protected]>
media: s5p-jpeg: fix pm_runtime_get_sync() usage count
Mauro Carvalho Chehab <[email protected]>
media: mtk-vcodec: fix PM runtime get logic
Mauro Carvalho Chehab <[email protected]>
media: sh_vou: fix pm_runtime_get_sync() usage count
Mauro Carvalho Chehab <[email protected]>
media: s5p: fix pm_runtime_get_sync() usage count
Mauro Carvalho Chehab <[email protected]>
media: mdk-mdp: fix pm_runtime_get_sync() usage count
Charles Keepax <[email protected]>
spi: Make of_register_spi_device also set the fwnode
Miklos Szeredi <[email protected]>
fuse: reject internal errno
Miklos Szeredi <[email protected]>
fuse: check connected before queueing on fpq->io
Miklos Szeredi <[email protected]>
fuse: ignore PG_workingset after stealing
Roberto Sassu <[email protected]>
evm: Refuse EVM_ALLOW_METADATA_WRITES only if an HMAC key is loaded
Roberto Sassu <[email protected]>
evm: Execute evm_inode_init_security() only when an HMAC key is loaded
Michael Ellerman <[email protected]>
powerpc/stacktrace: Fix spurious "stale" traces in raise_backtrace_ipi()
Yun Zhou <[email protected]>
seq_buf: Make trace_seq_putmem_hex() support data longer than 8
Steven Rostedt (VMware) <[email protected]>
tracepoint: Add tracepoint_probe_register_may_exist() for BPF tracing
Steven Rostedt (VMware) <[email protected]>
tracing/histograms: Fix parsing of "sym-offset" modifier
Martin Fuzzey <[email protected]>
rsi: fix AP mode with WPA failure due to encrypted EAPOL
Marek Vasut <[email protected]>
rsi: Assign beacon rate settings to the correct rate_info descriptor field
Michael Buesch <[email protected]>
ssb: sdio: Don't overwrite const buffer if block_write fails
Pali Rohár <[email protected]>
ath9k: Fix kernel NULL pointer dereference during ath_reset_internal()
Ondrej Zary <[email protected]>
serial_cs: remove wrong GLOBETROTTER.cis entry
Ondrej Zary <[email protected]>
serial_cs: Add Option International GSM-Ready 56K/ISDN modem
Yoshihiro Shimoda <[email protected]>
serial: sh-sci: Stop dmaengine transfer in sci_stop_tx()
Pali Rohár <[email protected]>
serial: mvebu-uart: fix calculation of clock divisor
Oliver Lang <[email protected]>
iio: ltr501: ltr501_read_ps(): add missing endianness conversion
Oliver Lang <[email protected]>
iio: ltr501: ltr559: fix initialization of LTR501_ALS_CONTR
Marc Kleine-Budde <[email protected]>
iio: ltr501: mark register holding upper 8 bits of ALS_DATA{0,1} and PS_DATA as volatile, too
frank zago <[email protected]>
iio: light: tcs3472: do not free unallocated IRQ
Martin Fuzzey <[email protected]>
rtc: stm32: Fix unbalanced clk_disable_unprepare() on probe error path
Vineeth Vijayan <[email protected]>
s390/cio: dont call css_wait_for_slow_path() inside a lock
Nathan Chancellor <[email protected]>
KVM: PPC: Book3S HV: Workaround high stack usage with clang
Robin Murphy <[email protected]>
perf/smmuv3: Don't trample existing events with global filter
Zhang Xiaoxu <[email protected]>
SUNRPC: Should wake up the privileged task firstly.
Zhang Xiaoxu <[email protected]>
SUNRPC: Fix the batch tasks count wraparound.
Felix Fietkau <[email protected]>
mac80211: remove iwlwifi specific workaround that broke sta NDP tx
Stephane Grosjean <[email protected]>
can: peak_pciefd: pucan_handle_status(): fix a potential starvation issue in TX path
Oleksij Rempel <[email protected]>
can: j1939: j1939_sk_init(): set SOCK_RCU_FREE to call sk_destruct() after RCU is done
Oliver Hartkopp <[email protected]>
can: gw: synchronize rcu operations before removing gw job entry
Thadeu Lima de Souza Cascardo <[email protected]>
can: bcm: delay release of struct bcm_op after synchronize_rcu()
Stephen Brennan <[email protected]>
ext4: use ext4_grp_locked_error in mb_find_extent
Pan Dong <[email protected]>
ext4: fix avefreec in find_group_orlov
Zhang Yi <[email protected]>
ext4: remove check for zero nr_to_scan in ext4_es_scan()
Zhang Yi <[email protected]>
ext4: correct the cache_nr in tracepoint ext4_es_shrink_exit
Yang Yingliang <[email protected]>
ext4: return error code when ext4_fill_flex_info() fails
Anirudh Rayabharam <[email protected]>
ext4: fix kernel infoleak via ext4_extent_header
Zhang Yi <[email protected]>
ext4: cleanup in-core orphan list if ext4_truncate() failed to get a transaction handle
David Sterba <[email protected]>
btrfs: clear defrag status of a root if starting transaction fails
Filipe Manana <[email protected]>
btrfs: send: fix invalid path for unlink operations after parent orphanization
Ludovic Desroches <[email protected]>
ARM: dts: at91: sama5d4: fix pinctrl muxing
Yang Jihong <[email protected]>
arm_pmu: Fix write counter incorrect in ARMv7 big-endian mode
Alexander Larkin <[email protected]>
Input: joydev - prevent use of not validated data in JSIOCSBTNMAP ioctl
Al Viro <[email protected]>
iov_iter_fault_in_readable() should do nothing in xarray case
Al Viro <[email protected]>
copy_page_to_iter(): fix ITER_DISCARD case
Desmond Cheong Zhi Xi <[email protected]>
ntfs: fix validity check for file name attribute
Zhangjiantao (Kirin, nanjing) <[email protected]>
xhci: solve a double free problem while doing s4
Jing Xiangfeng <[email protected]>
usb: typec: Add the missed altmode_id_remove() in typec_register_altmode()
Minas Harutyunyan <[email protected]>
usb: dwc3: Fix debugfs creation flow
Hannu Hartikainen <[email protected]>
USB: cdc-acm: blacklist Heimann USB Appset device
Linyu Yuan <[email protected]>
usb: gadget: eem: fix echo command packet response issue
Pavel Skripkin <[email protected]>
net: can: ems_usb: fix use-after-free in ems_usb_disconnect()
Johan Hovold <[email protected]>
Input: usbtouchscreen - fix control-request directions
Pavel Skripkin <[email protected]>
media: dvb-usb: fix wrong definition
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Apply LED fixup for HP Dragonfly G1, too
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Fix bass speaker DAC mapping for Asus UM431D
Elia Devito <[email protected]>
ALSA: hda/realtek: Improve fixup for HP Spectre x360 15-df0xxx
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add another ALC236 variant support
Takashi Iwai <[email protected]>
ALSA: intel8x0: Fix breakage at ac97 clock measurement
Takashi Iwai <[email protected]>
ALSA: usb-audio: scarlett2: Fix wrong resume call
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix OOB access at proc output
Daehwan Jung <[email protected]>
ALSA: usb-audio: fix rate on Ozone Z90 USB headset
-------------
Diffstat:
Documentation/ABI/testing/evm | 26 ++++- Documentation/admin-guide/kernel-parameters.txt | 6 ++ Documentation/hwmon/max31790.rst | 5 +- Makefile | 6 +- arch/arm/boot/dts/sama5d4.dtsi | 2 +- arch/arm/kernel/perf_event_v7.c | 4 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- arch/arm64/include/asm/asm-uaccess.h | 4 +- arch/arm64/include/asm/kernel-pgtable.h | 6 -- arch/arm64/include/asm/mmu_context.h | 8 +- arch/arm64/include/asm/pgtable.h | 1 + arch/arm64/include/asm/uaccess.h | 4 +- arch/arm64/kernel/entry.S | 6 +- arch/arm64/kernel/setup.c | 2 +- arch/arm64/kernel/vmlinux.lds.S | 8 +- arch/arm64/mm/proc.S | 2 +- arch/ia64/kernel/mca_drv.c | 2 +- arch/m68k/Kconfig.machine | 3 + arch/mips/include/asm/highmem.h | 2 +- arch/powerpc/include/asm/cputhreads.h | 30 ++++++ arch/powerpc/kernel/smp.c | 11 ++ arch/powerpc/kernel/stacktrace.c | 26 +++-- arch/powerpc/kvm/book3s_hv.c | 13 +-- arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- arch/powerpc/kvm/book3s_hv_nested.c | 3 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +- arch/s390/Kconfig | 2 +- arch/s390/kvm/kvm-s390.c | 18 ++-- arch/x86/kvm/vmx/nested.c | 2 +- block/blk-merge.c | 8 +- block/blk-rq-qos.h | 24 +++++ block/blk-wbt.c | 11 +- block/blk-wbt.h | 1 + crypto/shash.c | 18 +++- drivers/acpi/Makefile | 5 + drivers/acpi/acpi_pad.c | 24 ++--- drivers/acpi/acpi_tad.c | 14 +-- drivers/acpi/acpica/nsrepair2.c | 7 ++ drivers/acpi/bgrt.c | 57 ++++------ drivers/acpi/bus.c | 1 + drivers/acpi/device_sysfs.c | 46 ++++---- drivers/acpi/dock.c | 26 ++--- drivers/acpi/ec.c | 16 +++ drivers/acpi/power.c | 9 +- drivers/acpi/processor_idle.c | 40 +++++++ drivers/acpi/resource.c | 9 +- drivers/ata/pata_ep93xx.c | 2 +- drivers/ata/pata_octeon_cf.c | 5 +- drivers/ata/pata_rb532_cf.c | 6 +- drivers/ata/sata_highbank.c | 6 +- drivers/char/hw_random/exynos-trng.c | 4 +- drivers/char/pcmcia/cm4000_cs.c | 4 + drivers/clk/actions/owl-s500.c | 62 ++++++----- drivers/clk/clk-si5341.c | 19 +++- drivers/clk/meson/g12a.c | 2 +- drivers/cpufreq/cpufreq.c | 11 +- drivers/crypto/cavium/nitrox/nitrox_isr.c | 4 + drivers/crypto/ccp/sp-pci.c | 6 +- drivers/crypto/ixp4xx_crypto.c | 2 +- drivers/crypto/nx/nx-842-pseries.c | 9 +- drivers/crypto/omap-sham.c | 4 +- drivers/crypto/qat/qat_common/qat_hal.c | 6 +- drivers/crypto/qat/qat_common/qat_uclo.c | 1 - drivers/crypto/ux500/hash/hash_core.c | 1 + drivers/edac/i10nm_base.c | 3 + drivers/edac/pnd2_edac.c | 3 + drivers/edac/sb_edac.c | 3 + drivers/edac/skx_base.c | 3 + drivers/edac/ti_edac.c | 1 + drivers/extcon/extcon-max8997.c | 3 +- drivers/extcon/extcon-sm5502.c | 1 - drivers/firmware/stratix10-svc.c | 22 ++-- drivers/fsi/fsi-core.c | 4 +- drivers/fsi/fsi-occ.c | 1 + drivers/fsi/fsi-sbefifo.c | 10 +- drivers/fsi/fsi-scom.c | 16 +-- drivers/gpu/drm/qxl/qxl_dumb.c | 2 + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 36 +++++-- drivers/hid/hid-core.c | 10 +- drivers/hid/wacom_wac.h | 2 +- drivers/hv/hv_util.c | 4 +- drivers/hwmon/max31722.c | 9 -- drivers/hwmon/max31790.c | 49 +++++---- drivers/iio/accel/bma180.c | 10 +- drivers/iio/accel/bma220_spi.c | 10 +- drivers/iio/accel/hid-sensor-accel-3d.c | 13 ++- drivers/iio/accel/kxcjk-1013.c | 24 +++-- drivers/iio/accel/mxc4005.c | 12 ++- drivers/iio/accel/stk8312.c | 12 ++- drivers/iio/accel/stk8ba50.c | 17 ++- drivers/iio/adc/at91-sama5d2_adc.c | 33 +++--- drivers/iio/adc/hx711.c | 4 +- drivers/iio/adc/mxs-lradc-adc.c | 3 +- drivers/iio/adc/ti-ads1015.c | 12 ++- drivers/iio/adc/ti-ads8688.c | 3 +- drivers/iio/adc/vf610_adc.c | 10 +- drivers/iio/gyro/bmg160_core.c | 10 +- drivers/iio/humidity/am2315.c | 16 +-- drivers/iio/imu/adis16400.c | 3 - drivers/iio/imu/adis_buffer.c | 3 - drivers/iio/light/isl29125.c | 10 +- drivers/iio/light/ltr501.c | 15 ++- drivers/iio/light/tcs3414.c | 10 +- drivers/iio/light/tcs3472.c | 16 ++- drivers/iio/light/vcnl4035.c | 3 +- drivers/iio/magnetometer/bmc150_magn.c | 11 +- drivers/iio/magnetometer/hmc5843.h | 8 +- drivers/iio/magnetometer/hmc5843_core.c | 4 +- drivers/iio/magnetometer/rm3100-core.c | 3 +- drivers/iio/potentiostat/lmp91000.c | 4 +- drivers/iio/proximity/as3935.c | 10 +- drivers/iio/proximity/isl29501.c | 2 +- drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 10 +- drivers/iio/proximity/srf08.c | 14 +-- drivers/infiniband/core/uverbs_cmd.c | 21 +++- drivers/infiniband/hw/mlx4/qp.c | 9 +- drivers/infiniband/hw/mlx5/main.c | 4 +- drivers/infiniband/hw/mlx5/qp.c | 6 +- drivers/infiniband/sw/rxe/rxe_net.c | 10 +- drivers/infiniband/sw/rxe/rxe_qp.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 2 - drivers/input/joydev.c | 2 +- drivers/input/keyboard/Kconfig | 3 - drivers/input/keyboard/hil_kbd.c | 1 + drivers/input/touchscreen/usbtouchscreen.c | 8 +- drivers/iommu/dma-iommu.c | 6 +- drivers/leds/Kconfig | 1 + drivers/leds/leds-as3645a.c | 1 + drivers/leds/leds-ktd2692.c | 27 +++-- drivers/leds/leds-lm36274.c | 82 +++++++------- drivers/leds/leds-lm3692x.c | 8 +- drivers/media/common/siano/smscoreapi.c | 22 ++-- drivers/media/common/siano/smscoreapi.h | 4 +- drivers/media/common/siano/smsdvb-main.c | 4 + drivers/media/dvb-core/dvb_net.c | 25 +++-- drivers/media/i2c/ir-kbd-i2c.c | 4 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +- drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- drivers/media/i2c/s5k4ecgx.c | 10 +- drivers/media/i2c/s5k5baf.c | 6 +- drivers/media/i2c/s5k6aa.c | 10 +- drivers/media/i2c/tc358743.c | 1 + drivers/media/mc/Makefile | 2 +- drivers/media/pci/bt8xx/bt878.c | 3 + drivers/media/pci/cobalt/cobalt-driver.c | 1 + drivers/media/pci/cobalt/cobalt-driver.h | 7 +- drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 7 +- drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +- .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 4 +- .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 8 +- .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 2 +- drivers/media/platform/s5p-cec/s5p_cec.c | 7 +- drivers/media/platform/s5p-g2d/g2d.c | 3 + drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +- drivers/media/platform/sh_vou.c | 6 +- drivers/media/platform/sti/bdisp/Makefile | 2 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 +- drivers/media/platform/sti/delta/Makefile | 2 +- drivers/media/platform/sti/hva/Makefile | 2 +- drivers/media/platform/sti/hva/hva-hw.c | 3 +- drivers/media/usb/au0828/au0828-core.c | 4 +- drivers/media/usb/cpia2/cpia2.h | 1 + drivers/media/usb/cpia2/cpia2_core.c | 12 +++ drivers/media/usb/cpia2/cpia2_usb.c | 13 +-- drivers/media/usb/dvb-usb/cinergyT2-core.c | 2 + drivers/media/usb/dvb-usb/cxusb.c | 2 +- drivers/media/usb/em28xx/em28xx-input.c | 8 +- drivers/media/usb/gspca/gl860/gl860.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 +- drivers/media/v4l2-core/v4l2-fh.c | 1 + drivers/memstick/host/rtsx_usb_ms.c | 10 +- drivers/misc/eeprom/idt_89hpesx.c | 8 +- drivers/mmc/core/block.c | 8 ++ drivers/mmc/host/sdhci-sprd.c | 1 + drivers/mmc/host/usdhi6rol0.c | 1 + drivers/mmc/host/via-sdmmc.c | 3 + drivers/mmc/host/vub300.c | 2 +- drivers/mtd/nand/raw/marvell_nand.c | 4 +- drivers/mtd/parsers/redboot.c | 7 +- drivers/net/can/peak_canfd/peak_canfd.c | 4 +- drivers/net/can/usb/ems_usb.c | 3 +- drivers/net/ethernet/aeroflex/greth.c | 3 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 + drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +- drivers/net/ethernet/emulex/benet/be_main.c | 2 + drivers/net/ethernet/ezchip/nps_enet.c | 4 +- drivers/net/ethernet/faraday/ftgmac100.c | 6 +- drivers/net/ethernet/google/gve/gve_main.c | 4 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +- drivers/net/ethernet/ibm/ibmvnic.c | 10 +- drivers/net/ethernet/intel/e1000e/netdev.c | 24 +++-- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 10 +- drivers/net/ieee802154/mac802154_hwsim.c | 11 +- drivers/net/vrf.c | 14 +-- drivers/net/vxlan.c | 2 + drivers/net/wireless/ath/ath10k/mac.c | 1 + drivers/net/wireless/ath/ath10k/pci.c | 14 ++- drivers/net/wireless/ath/ath9k/main.c | 5 + drivers/net/wireless/ath/carl9170/Kconfig | 8 +- drivers/net/wireless/ath/wcn36xx/main.c | 21 ++-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 37 ++++--- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 + drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +- drivers/net/wireless/rsi/rsi_91x_hal.c | 6 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 - drivers/net/wireless/rsi/rsi_91x_mgmt.c | 3 +- drivers/net/wireless/rsi/rsi_main.h | 1 - drivers/nvme/target/fc.c | 10 +- drivers/of/fdt.c | 8 +- drivers/of/of_reserved_mem.c | 8 +- drivers/pci/controller/pci-hyperv.c | 3 + drivers/perf/arm_smmuv3_pmu.c | 18 ++-- drivers/perf/fsl_imx8_ddr_perf.c | 6 +- drivers/phy/socionext/phy-uniphier-pcie.c | 11 +- drivers/phy/ti/phy-dm816x-usb.c | 17 ++- drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 3 +- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 8 +- drivers/platform/x86/toshiba_acpi.c | 1 + drivers/regulator/da9052-regulator.c | 3 +- drivers/regulator/hi655x-regulator.c | 16 +-- drivers/regulator/mt6358-regulator.c | 2 +- drivers/regulator/uniphier-regulator.c | 1 + drivers/rtc/rtc-stm32.c | 6 +- drivers/s390/cio/chp.c | 3 + drivers/s390/cio/chsc.c | 2 - drivers/scsi/FlashPoint.c | 32 +++--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +- drivers/scsi/scsi_lib.c | 1 + drivers/soundwire/stream.c | 13 ++- drivers/spi/spi-loopback-test.c | 2 +- drivers/spi/spi-omap-100k.c | 2 +- drivers/spi/spi-sun6i.c | 6 +- drivers/spi/spi-topcliff-pch.c | 4 +- drivers/spi/spi.c | 1 + drivers/ssb/scan.c | 1 + drivers/ssb/sdio.c | 1 - drivers/staging/fbtft/fb_agm1264k-fl.c | 20 ++-- drivers/staging/fbtft/fb_bd663474.c | 4 - drivers/staging/fbtft/fb_ili9163.c | 4 - drivers/staging/fbtft/fb_ili9320.c | 1 - drivers/staging/fbtft/fb_ili9325.c | 4 - drivers/staging/fbtft/fb_ili9340.c | 1 - drivers/staging/fbtft/fb_s6d1121.c | 4 - drivers/staging/fbtft/fb_sh1106.c | 1 - drivers/staging/fbtft/fb_ssd1289.c | 4 - drivers/staging/fbtft/fb_ssd1325.c | 2 - drivers/staging/fbtft/fb_ssd1331.c | 6 +- drivers/staging/fbtft/fb_ssd1351.c | 1 - drivers/staging/fbtft/fb_upd161704.c | 4 - drivers/staging/fbtft/fb_watterott.c | 1 - drivers/staging/fbtft/fbtft-bus.c | 3 +- drivers/staging/fbtft/fbtft-core.c | 13 ++- drivers/staging/fbtft/fbtft-io.c | 12 +-- drivers/staging/gdm724x/gdm_lte.c | 20 +++- drivers/staging/media/imx/imx-media-csi.c | 14 ++- drivers/staging/media/imx/imx7-mipi-csis.c | 6 +- drivers/staging/mt7621-dts/mt7621.dtsi | 2 +- drivers/staging/rtl8712/hal_init.c | 3 + drivers/staging/rtl8712/usb_intf.c | 10 +- drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 19 ++-- drivers/target/iscsi/cxgbit/cxgbit_target.c | 21 +++- drivers/tty/nozomi.c | 9 +- drivers/tty/serial/8250/8250_port.c | 19 +++- drivers/tty/serial/8250/serial_cs.c | 2 +- drivers/tty/serial/mvebu-uart.c | 18 ++-- drivers/tty/serial/sh-sci.c | 8 ++ drivers/usb/class/cdc-acm.c | 5 + drivers/usb/dwc2/core.c | 30 ++++-- drivers/usb/dwc3/core.c | 3 +- drivers/usb/gadget/function/f_eem.c | 43 +++++++- drivers/usb/gadget/function/f_fs.c | 65 ++++++----- drivers/usb/host/xhci-mem.c | 1 + drivers/usb/typec/class.c | 4 +- drivers/vfio/pci/vfio_pci.c | 29 +++-- drivers/video/backlight/lm3630a_bl.c | 4 +- drivers/video/fbdev/imxfb.c | 2 +- drivers/visorbus/visorchipset.c | 6 +- fs/btrfs/Kconfig | 2 + fs/btrfs/delayed-inode.c | 18 ++-- fs/btrfs/send.c | 11 ++ fs/btrfs/transaction.c | 6 +- fs/btrfs/tree-log.c | 1 + fs/cifs/cifsglob.h | 3 +- fs/cifs/connect.c | 5 +- fs/configfs/file.c | 10 +- fs/dax.c | 3 +- fs/dlm/config.c | 9 ++ fs/dlm/lowcomms.c | 2 +- fs/ext4/extents.c | 3 + fs/ext4/extents_status.c | 4 +- fs/ext4/ialloc.c | 11 +- fs/ext4/mballoc.c | 9 +- fs/ext4/super.c | 10 +- fs/fs-writeback.c | 39 ++----- fs/fuse/dev.c | 12 ++- fs/ntfs/inode.c | 2 +- fs/ocfs2/filecheck.c | 6 +- fs/ocfs2/stackglue.c | 8 +- include/crypto/internal/hash.h | 8 +- include/linux/bio.h | 12 +-- include/linux/iio/common/cros_ec_sensors_core.h | 2 +- include/linux/prandom.h | 2 +- include/linux/tracepoint.h | 10 ++ include/media/media-dev-allocator.h | 2 +- include/net/ip.h | 12 ++- include/net/ip6_route.h | 16 ++- include/net/sch_generic.h | 12 +++ include/net/tc_act/tc_vlan.h | 1 + include/net/xfrm.h | 1 + kernel/kthread.c | 19 ++-- kernel/locking/lockdep.c | 120 ++++++++++++++++++++- kernel/rcu/tree.c | 2 +- kernel/sched/core.c | 43 ++++---- kernel/sched/deadline.c | 2 + kernel/sched/fair.c | 8 +- kernel/sched/rt.c | 17 ++- kernel/time/clocksource.c | 53 +++++++-- kernel/trace/bpf_trace.c | 3 +- kernel/trace/trace_events_hist.c | 7 ++ kernel/tracepoint.c | 33 +++++- lib/iov_iter.c | 9 +- lib/kstrtox.c | 13 ++- lib/kstrtox.h | 2 + lib/seq_buf.c | 4 +- lib/vsprintf.c | 82 ++++++++------ mm/huge_memory.c | 2 +- mm/z3fold.c | 1 + net/bluetooth/hci_event.c | 13 ++- net/bluetooth/mgmt.c | 3 + net/bpfilter/main.c | 2 +- net/can/bcm.c | 7 +- net/can/gw.c | 3 + net/can/j1939/main.c | 4 + net/can/j1939/socket.c | 3 + net/core/filter.c | 4 - net/ipv4/esp4.c | 2 +- net/ipv4/fib_frontend.c | 2 + net/ipv4/route.c | 3 +- net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs.c | 31 +++--- net/mac80211/mlme.c | 9 -- net/mac80211/sta_info.c | 5 - net/netfilter/nft_exthdr.c | 3 + net/netfilter/nft_osf.c | 5 + net/netfilter/nft_tproxy.c | 9 +- net/netlabel/netlabel_mgmt.c | 19 ++-- net/sched/act_vlan.c | 7 +- net/sched/cls_tcindex.c | 2 +- net/sched/sch_qfq.c | 8 +- net/sunrpc/sched.c | 12 ++- net/tls/tls_sw.c | 2 +- net/xfrm/xfrm_state.c | 14 ++- samples/bpf/xdp_redirect_user.c | 2 +- scripts/Makefile.build | 9 +- scripts/tools-support-relr.sh | 3 +- security/integrity/evm/evm_main.c | 5 +- security/integrity/evm/evm_secfs.c | 13 +-- sound/pci/hda/patch_realtek.c | 43 ++++++-- sound/pci/intel8x0.c | 2 +- sound/soc/atmel/atmel-i2s.c | 34 ++++-- sound/soc/codecs/cs42l42.h | 2 +- sound/soc/codecs/rk3328_codec.c | 28 +++-- sound/soc/hisilicon/hi6210-i2s.c | 14 +-- sound/soc/mediatek/common/mtk-btcvsd.c | 24 +++-- sound/soc/sh/rcar/adg.c | 4 +- sound/usb/format.c | 2 + sound/usb/mixer.c | 8 +- sound/usb/mixer.h | 1 + sound/usb/mixer_scarlett_gen2.c | 7 +- tools/bpf/bpftool/main.c | 4 +- tools/perf/util/llvm-utils.c | 2 + .../selftests/tc-testing/plugin-lib/scapyPlugin.py | 2 +- tools/testing/selftests/x86/protection_keys.c | 3 +- 379 files changed, 2313 insertions(+), 1244 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 24/348 btrfs: clear defrag status of a root if starting transaction fails
From: David Sterba <[email protected]>
commit 6819703f5a365c95488b07066a8744841bf14231 upstream.
The defrag loop processes leaves in batches and starting transaction for each. The whole defragmentation on a given root is protected by a bit but in case the transaction fails, the bit is not cleared
In case the transaction fails the bit would prevent starting defragmentation again, so make sure it's cleared.
--- fs/btrfs/transaction.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/transaction.c +4 -2
@@ -1274,8 +1274,10 @@ int btrfs_defrag_root(struct btrfs_rootwhile (1 ) { trans =btrfs_start_transaction (root,0 ); -if (IS_ERR (trans)) -return PTR_ERR (trans); +if (IS_ERR (trans)) { + ret =PTR_ERR (trans); +break ; + } ret =btrfs_defrag_leaves (trans, root);
Greg Kroah-Hartman
maintainerPATCH 33/348 can: gw: synchronize rcu operations before removing gw job entry
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
commit fb8696ab14adadb2e3f6c17c18ed26b3ecd96691 upstream.
can_can_gw_rcv() is called under RCU protection, so after calling can_rx_unregister(), we have to call synchronize_rcu in order to wait for any RCU read-side critical sections to finish before removing the kmem_cache entry with the referenced gw job entry.
--- net/can/gw.c | 3 +++ 1 file changed, 3 insertions(+)
net/can/gw.c +3 -0
@@ -535,6 +535,7 @@ static int cgw_notifier(struct notifier_if (gwj->src.dev == dev || gwj->dst.dev == dev) {hlist_del (&gwj->list);cgw_unregister_filter (net, gwj); +synchronize_rcu ();kmem_cache_free (cgw_cache, gwj); } }
@@ -1093,6 +1094,7 @@ static void cgw_remove_all_jobs(struct nhlist_for_each_entry_safe (gwj, nx, &net->can.cgw_list, list) {hlist_del (&gwj->list);cgw_unregister_filter (net, gwj); +synchronize_rcu ();kmem_cache_free (cgw_cache, gwj); } }
@@ -1161,6 +1163,7 @@ static int cgw_remove_job(struct sk_buffhlist_del (&gwj->list);cgw_unregister_filter (net, gwj); +synchronize_rcu ();kmem_cache_free (cgw_cache, gwj); err =0 ;break ;
Greg Kroah-Hartman
maintainerPATCH 34/348 can: j1939: j1939_sk_init(): set SOCK_RCU_FREE to call sk_destruct() after RCU is done
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
commit 22c696fed25c63c7f67508309820358b94a96b6d upstream.
Set SOCK_RCU_FREE to let RCU to call sk_destruct() on completion. Without this patch, we will run in to j1939_can_recv() after priv was freed by j1939_sk_release()->j1939_sk_sock_destruct()
--- net/can/j1939/main.c | 4 ++++ net/can/j1939/socket.c | 3 +++ 2 files changed, 7 insertions(+)
net/can/j1939/main.c +4 -0
@@ -193,6 +193,10 @@ static void j1939_can_rx_unregister(strucan_rx_unregister (dev_net (ndev), ndev,J1939_CAN_ID ,J1939_CAN_MASK , j1939_can_recv, priv); +/* The last reference of priv is dropped by the RCU deferred +* j1939_sk_sock_destruct() of the last socket, so we can +* safely drop this reference here. +*/ j1939_priv_put (priv); }
net/can/j1939/socket.c +3 -0
@@ -398,6 +398,9 @@ static int j1939_sk_init(struct sock *skatomic_set (&jsk->skb_pending,0 );spin_lock_init (&jsk->sk_session_queue_lock);INIT_LIST_HEAD (&jsk->sk_session_queue); + +/* j1939_sk_sock_destruct() depends on SOCK_RCU_FREE flag */ +sock_set_flag (sk,SOCK_RCU_FREE ); sk->sk_destruct = j1939_sk_sock_destruct; sk->sk_protocol =CAN_J1939 ;
Greg Kroah-Hartman
maintainerPATCH 35/348 can: peak_pciefd: pucan_handle_status(): fix a potential starvation issue in TX path
In reply to Greg Kroah-HartmanFrom: Stephane Grosjean <[email protected]>
commit b17233d385d0b6b43ecf81d43008cb1bbb008166 upstream.
Rather than just indicating that transmission can start, this patch requires the explicit flushing of the network TX queue when the driver is informed by the device that it can transmit, next to its configuration.
In this way, if frames have already been written by the application, they will actually be transmitted.
--- drivers/net/can/peak_canfd/peak_canfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/can/peak_canfd/peak_canfd.c +2 -2
@@ -338,8 +338,8 @@ static int pucan_handle_status(struct pereturn err; } -/* start network queue (echo_skb array is empty) */ -netif_start_queue (ndev); +/* wake network queue up (echo_skb array is empty) */ +netif_wake_queue (ndev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 36/348 mac80211: remove iwlwifi specific workaround that broke sta NDP tx
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
commit e41eb3e408de27982a5f8f50b2dd8002bed96908 upstream.
Sending nulldata packets is important for sw AP link probing and detecting 4-address mode links. The checks that dropped these packets were apparently added to work around an iwlwifi firmware bug with multi-TID aggregation.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ net/mac80211/mlme.c | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +3 -0
@@ -1091,6 +1091,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvif (WARN_ON_ONCE (mvmsta->sta_id ==IWL_MVM_INVALID_STA ))return -1 ; +if (unlikely (ieee80211_is_any_nullfunc (fc)) && sta->he_cap.has_he) +return -1 ; +if (unlikely (ieee80211_is_probe_resp (fc)))iwl_mvm_probe_resp_set_noa (mvm, skb);
net/mac80211/mlme.c +0 -9
@@ -1014,11 +1014,6 @@ void ieee80211_send_nullfunc(struct ieeestruct ieee80211_hdr_3addr *nullfunc;struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; -/* Don't send NDPs when STA is connected HE */ -if (sdata->vif.type ==NL80211_IFTYPE_STATION && - !(ifmgd->flags &IEEE80211_STA_DISABLE_HE )) -return ; - skb =ieee80211_nullfunc_get (&local->hw, &sdata->vif, !ieee80211_hw_check (&local->hw,DOESNT_SUPPORT_QOS_NDP ));if (!skb)
@@ -1050,10 +1045,6 @@ static void ieee80211_send_4addr_nullfunif (WARN_ON (sdata->vif.type !=NL80211_IFTYPE_STATION ))return ; -/* Don't send NDPs when connected HE */ -if (!(sdata->u.mgd.flags &IEEE80211_STA_DISABLE_HE )) -return ; - skb =dev_alloc_skb (local->hw.extra_tx_headroom +30 );if (!skb)return ;
Greg Kroah-Hartman
maintainerPATCH 37/348 SUNRPC: Fix the batch tasks count wraparound.
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
commit fcb170a9d825d7db4a3fb870b0300f5a40a8d096 upstream.
The 'queue->nr' will wraparound from 0 to 255 when only current priority queue has tasks. This maybe lead a deadlock same as commit dfe1fe75e00e ("NFSv4: Fix deadlock between nfs4_evict_inode() and nfs4_opendata_get_inode()"):
Privileged delegreturn task is queued to privileged list because all the slots are assigned. When non-privileged task complete and release the slot, a non-privileged maybe picked out. It maybe allocate slot failed when the session on draining.
If the 'queue->nr' has wraparound to 255, and no enough slot to service it, then the privileged delegreturn will lost to wake up.
So we should avoid the wraparound on 'queue->nr'.
--- net/sunrpc/sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sunrpc/sched.c +2 -1
@@ -617,7 +617,8 @@ static struct rpc_task *__rpc_find_next_* Service a batch of tasks from a single owner. */ q = &queue->tasks[queue->priority]; -if (!list_empty (q) && --queue->nr) { +if (!list_empty (q) && queue->nr) { + queue->nr--; task = list_first_entry(q, struct rpc_task, u.tk_wait.list); goto out; }
Greg Kroah-Hartman
maintainerPATCH 38/348 SUNRPC: Should wake up the privileged task firstly.
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
commit 5483b904bf336948826594610af4c9bbb0d9e3aa upstream.
When find a task from wait queue to wake up, a non-privileged task may be found out, rather than the privileged. This maybe lead a deadlock same as commit dfe1fe75e00e ("NFSv4: Fix deadlock between nfs4_evict_inode() and nfs4_opendata_get_inode()"):
Privileged delegreturn task is queued to privileged list because all the slots are assigned. If there has no enough slot to wake up the non-privileged batch tasks(session less than 8 slot), then the privileged delegreturn task maybe lost waked up because the found out task can't get slot since the session is on draining.
So we should treate the privileged task as the emergency task, and execute it as for as we can.
--- net/sunrpc/sched.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/sunrpc/sched.c +9 -0
@@ -614,6 +614,15 @@ static struct rpc_task *__rpc_find_next_struct rpc_task *task;/* +* Service the privileged queue. +*/ + q = &queue->tasks[RPC_NR_PRIORITY -1 ]; +if (queue->maxpriority >RPC_PRIORITY_PRIVILEGED && !list_empty (q)) { + task = list_first_entry(q, struct rpc_task, u.tk_wait.list); + goto out; + } + +/* * Service a batch of tasks from a single owner. */ q = &queue->tasks[queue->priority];
Greg Kroah-Hartman
maintainerPATCH 39/348 perf/smmuv3: Dont trample existing events with global filter
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 4c1daba15c209b99d192f147fea3dade30f72ed2 upstream.
With global filtering, we only allow an event to be scheduled if its filter settings exactly match those of any existing events, therefore it is pointless to reapply the filter in that case. Much worse, though, is that in doing that we trample the event type of counter 0 if it's already active, and never touch the appropriate PMEVTYPERn so the new event is likely not counting the right thing either. Don't do that.
--- drivers/perf/arm_smmuv3_pmu.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/perf/arm_smmuv3_pmu.c +10 -8
@@ -275,7 +275,7 @@ static int smmu_pmu_apply_event_filter(s struct perf_event *event, int idx) {u32 span, sid; -unsigned int num_ctrs = smmu_pmu->num_counters; +unsigned int cur_idx, num_ctrs = smmu_pmu->num_counters;bool filter_en = !!get_filter_enable (event); span = filter_en ? get_filter_span(event) :
@@ -283,17 +283,19 @@ static int smmu_pmu_apply_event_filter(s sid = filter_en ?get_filter_stream_id (event) :SMMU_PMCG_DEFAULT_FILTER_SID ; -/* Support individual filter settings */ -if (!smmu_pmu->global_filter) { + cur_idx =find_first_bit (smmu_pmu->used_counters, num_ctrs); +/* +* Per-counter filtering, or scheduling the first globally-filtered +* event into an empty PMU so idx == 0 and it works out equivalent. +*/ +if (!smmu_pmu->global_filter || cur_idx == num_ctrs) {smmu_pmu_set_event_filter (event, idx, span, sid);return 0 ; } -/* Requested settings same as current global settings*/ - idx =find_first_bit (smmu_pmu->used_counters, num_ctrs); -if (idx == num_ctrs || -smmu_pmu_check_global_filter (smmu_pmu->events[idx], event)) { -smmu_pmu_set_event_filter (event,0 , span, sid); +/* Otherwise, must match whatever's currently scheduled */ +if (smmu_pmu_check_global_filter (smmu_pmu->events[cur_idx], event)) { +smmu_pmu_set_evtyper (smmu_pmu, idx,get_event (event));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 40/348 KVM: PPC: Book3S HV: Workaround high stack usage with clang
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 51696f39cbee5bb684e7959c0c98b5f54548aa34 upstream.
LLVM does not emit optimal byteswap assembly, which results in high stack usage in kvmhv_enter_nested_guest() due to the inlining of byteswap_pt_regs(). With LLVM 12.0.0:
arch/powerpc/kvm/book3s_hv_nested.c:289:6: error: stack frame size of 2512 bytes in function 'kvmhv_enter_nested_guest' [-Werror,-Wframe-larger-than=] long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu)
^
1 error generated.
While this gets fixed in LLVM, mark byteswap_pt_regs() as noinline_for_stack so that it does not get inlined and break the build due to -Werror by default in arch/powerpc/. Not inlining saves approximately 800 bytes with LLVM 12.0.0:
arch/powerpc/kvm/book3s_hv_nested.c:290:6: warning: stack frame size of 1728 bytes in function 'kvmhv_enter_nested_guest' [-Wframe-larger-than=] long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu)
^
1 warning generated.
--- arch/powerpc/kvm/book3s_hv_nested.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv_nested.c +2 -1
@@ -51,7 +51,8 @@ void kvmhv_save_hv_regs(struct kvm_vcpu hr->ppr = vcpu->arch.ppr; } -static void byteswap_pt_regs (struct pt_regs *regs) +/* Use noinline_for_stack due to https://bugs.llvm.org/show_bug.cgi?id=49610 */ +static noinline_for_stack void byteswap_pt_regs(struct pt_regs *regs) {unsigned long *addr = (unsigned long *) regs;
Greg Kroah-Hartman
maintainerPATCH 41/348 s390/cio: dont call css_wait_for_slow_path() inside a lock
In reply to Greg Kroah-HartmanFrom: Vineeth Vijayan <[email protected]>
commit c749d8c018daf5fba6dfac7b6c5c78b27efd7d65 upstream.
Currently css_wait_for_slow_path() gets called inside the chp->lock. The path-verification-loop of slowpath inside this lock could lead to deadlock as reported by the lockdep validator.
The ccw_device_get_chp_desc() during the instance of a device-set-online would try to acquire the same 'chp->lock' to read the chp->desc. The instance of this function can get called from multiple scenario, like probing or setting-device online manually. This could, in some corner-cases lead to the deadlock.
lockdep validator reported this as,
CPU0 CPU1
---- ----
lock(&chp->lock);
lock(kn->active#43);
lock(&chp->lock);lock((wq_completion)cio);
The chp->lock was introduced to serialize the access of struct channel_path. This lock is not needed for the css_wait_for_slow_path() function, so invoke the slow-path function outside this lock.
--- drivers/s390/cio/chp.c | 3 +++ drivers/s390/cio/chsc.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/s390/cio/chp.c +3 -0
@@ -255,6 +255,9 @@ static ssize_t chp_status_write(struct dif (!num_args)return count; +/* Wait until previous actions have settled. */ +css_wait_for_slow_path (); +if (!strncasecmp (cmd,"on" ,2 ) || !strcmp (cmd,"1" )) {mutex_lock (&cp->lock); error =s390_vary_chpid (cp->chpid,1 );
drivers/s390/cio/chsc.c +0 -2
@@ -753,8 +753,6 @@ int chsc_chp_vary(struct chp_id chpid, i {struct channel_path *chp =chpid_to_chp (chpid); -/* Wait until previous actions have settled. */ -css_wait_for_slow_path ();/* * Redo PathVerification on the devices the chpid connects to */
Greg Kroah-Hartman
maintainerPATCH 25/348 ext4: cleanup in-core orphan list if ext4_truncate() failed to get a transaction handle
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
commit b9a037b7f3c401d3c63e0423e56aef606b1ffaaf upstream.
In ext4_orphan_cleanup(), if ext4_truncate() failed to get a transaction handle, it didn't remove the inode from the in-core orphan list, which may probably trigger below error dump in ext4_destroy_inode() during the final iput() and could lead to memory corruption on the later orphan list changes.
EXT4-fs (sda): Inode 6291467 (00000000b8247c67): orphan list check failed!
00000000b8247c67: 0001f30a 00000004 00000000 00000023 ............#... 00000000e24cde71: 00000006 014082a3 00000000 00000000 ......@......... 0000000072c6a5ee: 00000000 00000000 00000000 00000000 ................
...
This patch fix this by cleanup in-core orphan list manually if ext4_truncate() return error.
--- fs/ext4/super.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/ext4/super.c +8 -1
@@ -2735,8 +2735,15 @@ static void ext4_orphan_cleanup(struct sinode_lock (inode);truncate_inode_pages (inode->i_mapping, inode->i_size); ret =ext4_truncate (inode); -if (ret) +if (ret) { +/* +* We need to clean up the in-core orphan list +* manually if ext4_truncate() failed to get a +* transaction handle. +*/ +ext4_orphan_del (NULL , inode);ext4_std_error (inode->i_sb, ret); + }inode_unlock (inode); nr_truncates++; }else {
Greg Kroah-Hartman
maintainerPATCH 42/348 rtc: stm32: Fix unbalanced clk_disable_unprepare() on probe error path
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit 950ac33dbe6ff656a623d862022f0762ec061ba7 upstream.
The STM32MP1 RTC may have 2 clocks, the pclk and the rtc_ck.
If clk_prepare_enable() fails for the second clock (rtc_ck) we must only call clk_disable_unprepare() for the first clock (pclk) but currently we call it on both leading to a WARN:
[ 15.629568] WARNING: CPU: 0 PID: 146 at drivers/clk/clk.c:958 clk_core_disable+0xb0/0xc8 [ 15.637620] ck_rtc already disabled [ 15.663322] CPU: 0 PID: 146 Comm: systemd-udevd Not tainted 5.4.77-pknbsp-svn5759-atag-v5.4.77-204-gea4235203137-dirty #2413 [ 15.674510] Hardware name: STM32 (Device Tree Support) [ 15.679658] [<c0111148>] (unwind_backtrace) from [<c010c0b8>] (show_stack+0x10/0x14) [ 15.687371] [<c010c0b8>] (show_stack) from [<c0ab3d28>] (dump_stack+0xc0/0xe0) [ 15.694574] [<c0ab3d28>] (dump_stack) from [<c012360c>] (__warn+0xc8/0xf0) [ 15.701428] [<c012360c>] (__warn) from [<c0123694>] (warn_slowpath_fmt+0x60/0x94) [ 15.708894] [<c0123694>] (warn_slowpath_fmt) from [<c053b518>] (clk_core_disable+0xb0/0xc8) [ 15.717230] [<c053b518>] (clk_core_disable) from [<c053c190>] (clk_core_disable_lock+0x18/0x24) [ 15.725924] [<c053c190>] (clk_core_disable_lock) from [<bf0adc44>] (stm32_rtc_probe+0x124/0x5e4 [rtc_stm32]) [ 15.735739] [<bf0adc44>] (stm32_rtc_probe [rtc_stm32]) from [<c05f7d4c>] (platform_drv_probe+0x48/0x98) [ 15.745095] [<c05f7d4c>] (platform_drv_probe) from [<c05f5cec>] (really_probe+0x1f0/0x458) [ 15.753338] [<c05f5cec>] (really_probe) from [<c05f61c4>] (driver_probe_device+0x70/0x1c4) [ 15.761584] [<c05f61c4>] (driver_probe_device) from [<c05f6580>] (device_driver_attach+0x58/0x60) [ 15.770439] [<c05f6580>] (device_driver_attach) from [<c05f6654>] (__driver_attach+0xcc/0x170) [ 15.779032] [<c05f6654>] (__driver_attach) from [<c05f40d8>] (bus_for_each_dev+0x58/0x7c) [ 15.787191] [<c05f40d8>] (bus_for_each_dev) from [<c05f4ffc>] (bus_add_driver+0xdc/0x1f8) [ 15.795352] [<c05f4ffc>] (bus_add_driver) from [<c05f6ed8>] (driver_register+0x7c/0x110) [ 15.803425] [<c05f6ed8>] (driver_register) from [<c01027bc>] (do_one_initcall+0x70/0x1b8) [ 15.811588] [<c01027bc>] (do_one_initcall) from [<c01a1094>] (do_init_module+0x58/0x1f8) [ 15.819660] [<c01a1094>] (do_init_module) from [<c01a0074>] (load_module+0x1e58/0x23c8) [ 15.827646] [<c01a0074>] (load_module) from [<c01a0860>] (sys_finit_module+0xa0/0xd4) [ 15.835459] [<c01a0860>] (sys_finit_module) from [<c01011e0>] (__sys_trace_return+0x0/0x20)
--- drivers/rtc/rtc-stm32.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/rtc/rtc-stm32.c +4 -2
@@ -756,7 +756,7 @@ static int stm32_rtc_probe(struct platfo ret =clk_prepare_enable (rtc->rtc_ck);if (ret) - goto err; + goto err_no_rtc_ck;if (rtc->data->need_dbp) regmap_update_bits(rtc->dbp, rtc->dbp_reg,
@@ -832,10 +832,12 @@ static int stm32_rtc_probe(struct platfo }return 0 ; + err: +clk_disable_unprepare (rtc->rtc_ck); +err_no_rtc_ck:if (rtc->data->has_pclk)clk_disable_unprepare (rtc->pclk); -clk_disable_unprepare (rtc->rtc_ck);if (rtc->data->need_dbp)regmap_update_bits (rtc->dbp, rtc->dbp_reg, rtc->dbp_mask,0 );
Greg Kroah-Hartman
maintainerPATCH 43/348 iio: light: tcs3472: do not free unallocated IRQ
In reply to Greg Kroah-HartmanFrom: frank zago <[email protected]>
commit 7cd04c863f9e1655d607705455e7714f24451984 upstream.
Allocating an IRQ is conditional to the IRQ existence, but freeing it was not. If no IRQ was allocate, the driver would still try to free IRQ 0. Add the missing checks.
This fixes the following trace when the driver is removed:
[ 100.667788] Trying to free already-free IRQ 0 [ 100.667793] WARNING: CPU: 0 PID: 2315 at kernel/irq/manage.c:1826 free_irq+0x1fd/0x370 ... [ 100.667914] Call Trace: [ 100.667920] tcs3472_remove+0x3a/0x90 [tcs3472] [ 100.667927] i2c_device_remove+0x2b/0xa0
--- drivers/iio/light/tcs3472.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iio/light/tcs3472.c +4 -2
@@ -532,7 +532,8 @@ static int tcs3472_probe(struct i2c_cliereturn 0 ; free_irq: -free_irq (client->irq, indio_dev); +if (client->irq) +free_irq (client->irq, indio_dev); buffer_cleanup:iio_triggered_buffer_cleanup (indio_dev);return ret;
@@ -560,7 +561,8 @@ static int tcs3472_remove(struct i2c_clistruct iio_dev *indio_dev =i2c_get_clientdata (client);iio_device_unregister (indio_dev); -free_irq (client->irq, indio_dev); +if (client->irq) +free_irq (client->irq, indio_dev);iio_triggered_buffer_cleanup (indio_dev);tcs3472_powerdown (iio_priv (indio_dev));
Greg Kroah-Hartman
maintainerPATCH 44/348 iio: ltr501: mark register holding upper 8 bits of ALS_DATA{0,1} and PS_DATA as volatile, too
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit 2ac0b029a04b673ce83b5089368f467c5dca720c upstream.
The regmap is configured for 8 bit registers, uses a RB-Tree cache and marks several registers as volatile (i.e. do not cache).
The ALS and PS data registers in the chip are 16 bit wide and spans two regmap registers. In the current driver only the base register is marked as volatile, resulting in the upper register only read once.
Further the data sheet notes:
| When the I2C read operation starts, all four ALS data registers are | locked until the I2C read operation of register 0x8B is completed.
Which results in the registers never update after the 2nd read.
This patch fixes the problem by marking the upper 8 bits of the ALS and PS registers as volatile, too.
--- drivers/iio/light/ltr501.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iio/light/ltr501.c +6 -0
@@ -32,9 +32,12 @@#define LTR501_PART_ID 0x86#define LTR501_MANUFAC_ID 0x87#define LTR501_ALS_DATA1 0x88/* 16-bit, little endian */ +#define LTR501_ALS_DATA1_UPPER 0x89/* upper 8 bits of LTR501_ALS_DATA1 */ #define LTR501_ALS_DATA0 0x8a/* 16-bit, little endian */ +#define LTR501_ALS_DATA0_UPPER 0x8b/* upper 8 bits of LTR501_ALS_DATA0 */ #define LTR501_ALS_PS_STATUS 0x8c#define LTR501_PS_DATA 0x8d/* 16-bit, little endian */ +#define LTR501_PS_DATA_UPPER 0x8e/* upper 8 bits of LTR501_PS_DATA */ #define LTR501_INTR 0x8f/* output mode, polarity, mode */ #define LTR501_PS_THRESH_UP 0x90/* 11 bit, ps upper threshold */ #define LTR501_PS_THRESH_LOW 0x92/* 11 bit, ps lower threshold */
@@ -1353,9 +1356,12 @@ static bool ltr501_is_volatile_reg(struc {switch (reg) {case LTR501_ALS_DATA1 : +case LTR501_ALS_DATA1_UPPER :case LTR501_ALS_DATA0 : +case LTR501_ALS_DATA0_UPPER :case LTR501_ALS_PS_STATUS :case LTR501_PS_DATA : +case LTR501_PS_DATA_UPPER :return true;default :return false;
Greg Kroah-Hartman
maintainerPATCH 45/348 iio: ltr501: ltr559: fix initialization of LTR501_ALS_CONTR
In reply to Greg Kroah-HartmanFrom: Oliver Lang <[email protected]>
commit 421a26f3d7a7c3ca43f3a9dc0f3cb0f562d5bd95 upstream.
The ltr559 chip uses only the lowest bit of the ALS_CONTR register to configure between active and stand-by mode. In the original driver BIT(1) is used, which does a software reset instead.
This patch fixes the problem by using BIT(0) as als_mode_active for the ltr559 chip.
--- drivers/iio/light/ltr501.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/light/ltr501.c +1 -1
@@ -1207,7 +1207,7 @@ static struct ltr501_chip_info ltr501_ch .als_gain_tbl_size = ARRAY_SIZE(ltr559_als_gain_tbl), .ps_gain = ltr559_ps_gain_tbl, .ps_gain_tbl_size = ARRAY_SIZE(ltr559_ps_gain_tbl), - .als_mode_active = BIT(1), + .als_mode_active = BIT(0), .als_gain_mask = BIT(2) | BIT(3) | BIT(4), .als_gain_shift = 2, .info = <r501_info,
Greg Kroah-Hartman
maintainerPATCH 47/348 serial: mvebu-uart: fix calculation of clock divisor
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 9078204ca5c33ba20443a8623a41a68a9995a70d upstream.
The clock divisor should be rounded to the closest value.
--- drivers/tty/serial/mvebu-uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/mvebu-uart.c +1 -1
@@ -463,7 +463,7 @@ static int mvebu_uart_baud_rate_set(stru* makes use of D to configure the desired baudrate. */ m_divisor =OSAMP_DEFAULT_DIVISOR ; - d_divisor =DIV_ROUND_UP (port->uartclk, baud * m_divisor); + d_divisor =DIV_ROUND_CLOSEST (port->uartclk, baud * m_divisor); brdv =readl (port->membase +UART_BRDV ); brdv &= ~BRDV_BAUD_MASK ;
Greg Kroah-Hartman
maintainerPATCH 48/348 serial: sh-sci: Stop dmaengine transfer in sci_stop_tx()
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit 08a84410a04f05c7c1b8e833f552416d8eb9f6fe upstream.
Stop dmaengine transfer in sci_stop_tx(). Otherwise, the following message is possible output when system enters suspend and while transferring data, because clearing TIE bit in SCSCR is not able to stop any dmaengine transfer.
sh-sci e6550000.serial: ttySC1: Unable to drain transmitter
Note that this driver has already used some #ifdef in the .c file so that this patch also uses #ifdef to fix the issue. Otherwise, build errors happens if the CONFIG_SERIAL_SH_SCI_DMA is disabled.
--- drivers/tty/serial/sh-sci.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/tty/serial/sh-sci.c +8 -0
@@ -613,6 +613,14 @@ static void sci_stop_tx(struct uart_port ctrl &= ~SCSCR_TIE ;serial_port_out (port,SCSCR , ctrl); + +#ifdef CONFIG_SERIAL_SH_SCI_DMA +if (to_sci_port (port)->chan_tx && + !dma_submit_error (to_sci_port (port)->cookie_tx)) { +dmaengine_terminate_async (to_sci_port (port)->chan_tx); +to_sci_port (port)->cookie_tx = -EINVAL ; + } +#endif }static void sci_start_rx (struct uart_port *port)
Greg Kroah-Hartman
maintainerPATCH 49/348 serial_cs: Add Option International GSM-Ready 56K/ISDN modem
In reply to Greg Kroah-HartmanFrom: Ondrej Zary <[email protected]>
commit d495dd743d5ecd47288156e25c4d9163294a0992 upstream.
Add support for Option International GSM-Ready 56K/ISDN PCMCIA modem card.
--- drivers/tty/serial/8250/serial_cs.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/8250/serial_cs.c +1 -0
@@ -780,6 +780,7 @@ static const struct pcmcia_device_id serPCMCIA_DEVICE_PROD_ID12 ("Multi-Tech" ,"MT2834LT" ,0x5f73be51 ,0x4cd7c09e ),PCMCIA_DEVICE_PROD_ID12 ("OEM " ,"C288MX " ,0xb572d360 ,0xd2385b7a ),PCMCIA_DEVICE_PROD_ID12 ("Option International" ,"V34bis GSM/PSTN Data/Fax Modem" ,0x9d7cd6f5 ,0x5cb8bf41 ), +PCMCIA_DEVICE_PROD_ID12 ("Option International" ,"GSM-Ready 56K/ISDN" ,0x9d7cd6f5 ,0xb23844aa ),PCMCIA_DEVICE_PROD_ID12 ("PCMCIA " ,"C336MX " ,0x99bcafe9 ,0xaa25bcab ),PCMCIA_DEVICE_PROD_ID12 ("Quatech Inc" ,"PCMCIA Dual RS-232 Serial Port Card" ,0xc4420b35 ,0x92abc92f ), PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d),
Greg Kroah-Hartman
maintainerPATCH 50/348 serial_cs: remove wrong GLOBETROTTER.cis entry
In reply to Greg Kroah-HartmanFrom: Ondrej Zary <[email protected]>
commit 11b1d881a90fc184cc7d06e9804eb288c24a2a0d upstream.
The GLOBETROTTER.cis entry in serial_cs matches more devices than intended and breaks them. Remove it.
Example: # pccardctl info
PRODID_1="Option International
"
PRODID_2="GSM-Ready 56K/ISDN
"
PRODID_3="021
"
PRODID_4="A
"
MANFID=0013,0000
FUNCID=0
result:
pcmcia 0.0: Direct firmware load for cis/GLOBETROTTER.cis failed with error -2
The GLOBETROTTER.cis is nowhere to be found. There's GLOBETROTTER.cis.ihex at
https://netdev.vger.kernel.narkive.com/h4inqdxM/patch-axnet-cs-fix-phy-id-detection-for-bogus-asix-chip#post41
It's from completely diffetent card:vers_1 4.1, "Option International", "GSM/GPRS GlobeTrotter", "001", "A"
--- drivers/tty/serial/8250/serial_cs.c | 1 - 1 file changed, 1 deletion(-)
drivers/tty/serial/8250/serial_cs.c +0 -1
@@ -808,7 +808,6 @@ static const struct pcmcia_device_id serPCMCIA_DEVICE_CIS_PROD_ID12 ("ADVANTECH" ,"COMpad-32/85B-4" ,0x96913a85 ,0xcec8f102 ,"cis/COMpad4.cis" ),PCMCIA_DEVICE_CIS_PROD_ID123 ("ADVANTECH" ,"COMpad-32/85" ,"1.0" ,0x96913a85 ,0x8fbe92ae ,0x0877b627 ,"cis/COMpad2.cis" ),PCMCIA_DEVICE_CIS_PROD_ID2 ("RS-COM 2P" ,0xad20b156 ,"cis/RS-COM-2P.cis" ), -PCMCIA_DEVICE_CIS_MANF_CARD (0x0013 ,0x0000 ,"cis/GLOBETROTTER.cis" ),PCMCIA_DEVICE_PROD_ID12 ("ELAN DIGITAL SYSTEMS LTD, c1997." ,"SERIAL CARD: SL100 1.00." ,0x19ca78af ,0xf964f42b ),PCMCIA_DEVICE_PROD_ID12 ("ELAN DIGITAL SYSTEMS LTD, c1997." ,"SERIAL CARD: SL100" ,0x19ca78af ,0x71d98e83 ), PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232 1.00.", 0x19ca78af, 0x69fb7490),
Greg Kroah-Hartman
maintainerPATCH 51/348 ath9k: Fix kernel NULL pointer dereference during ath_reset_internal()
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit fb312ac5ccb007e843f982b38d4d6886ba4b32f2 upstream.
I got this crash more times during debugging of PCIe controller and crash happens somehow at the time when PCIe kernel code started link retraining (as part of ASPM code) when at the same time PCIe link went down and ath9k probably executed hw reset procedure.
Currently I'm not able to reproduce this issue as it looks like to be some race condition between link training, ASPM, link down and reset path. And as always, race conditions which depends on more input parameters are hard to reproduce as it depends on precise timings.
But it is clear that pointers are zero in this case and should be properly filled as same code pattern is used in ath9k_stop() function. Anyway I was able to reproduce this crash by manually triggering ath reset worker prior putting card up. I created simple patch to export reset functionality via debugfs and use it to "simulate" of triggering
reset. s proved that NULL-pointer dereference issue is there.
Function ath9k_hw_reset() is dereferencing chan structure pointer, so it needs to be non-NULL pointer.
Function ath9k_stop() already contains code which sets ah->curchan to valid non-NULL pointer prior calling ath9k_hw_reset() function.
Add same code pattern also into ath_reset_internal() function to prevent kernel NULL pointer dereference in ath9k_hw_reset() function.
This change fixes kernel NULL pointer dereference in ath9k_hw_reset() which is caused by calling ath9k_hw_reset() from ath_reset_internal() with NULL chan structure.
[ 45.334305] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008
[ 45.344417] Mem abort info:
[ 45.347301] ESR = 0x96000005
[ 45.350448] EC = 0x25: DABT (current EL), IL = 32 bits
[ 45.356166] SET = 0, FnV = 0
[ 45.359350] EA = 0, S1PTW = 0
[ 45.362596] Data abort info:
[ 45.365756] ISV = 0, ISS = 0x00000005
[ 45.369735] CM = 0, WnR = 0
[ 45.372814] user pgtable: 4k pages, 39-bit VAs, pgdp=000000000685d000
[ 45.379663] [0000000000000008] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
[ 45.388856] Internal error: Oops: 96000005 [#1] SMP
[ 45.393897] Modules linked in: ath9k ath9k_common ath9k_hw
[ 45.399574] CPU: 1 PID: 309 Comm: kworker/u4:2 Not tainted 5.12.0-rc2-dirty #785
[ 45.414746] Workqueue: phy0 ath_reset_work [ath9k]
[ 45.419713] pstate: 40000005 (nZcv daif -PAN -UAO -TCO BTYPE=--)
[ 45.425910] pc : ath9k_hw_reset+0xc4/0x1c48 [ath9k_hw]
[ 45.431234] lr : ath9k_hw_reset+0xc0/0x1c48 [ath9k_hw]
[ 45.436548] sp : ffffffc0118dbca0
[ 45.439961] x29: ffffffc0118dbca0 x28: 0000000000000000
[ 45.445442] x27: ffffff800dee4080 x26: 0000000000000000
[ 45.450923] x25: ffffff800df9b9d8 x24: 0000000000000000
[ 45.456404] x23: ffffffc0115f6000 x22: ffffffc008d0d408
[ 45.461885] x21: ffffff800dee5080 x20: ffffff800df9b9d8
[ 45.467366] x19: 0000000000000000 x18: 0000000000000000
[ 45.472846] x17: 0000000000000000 x16: 0000000000000000
[ 45.478326] x15: 0000000000000010 x14: ffffffffffffffff
[ 45.483807] x13: ffffffc0918db94f x12: ffffffc011498720
[ 45.489289] x11: 0000000000000003 x10: ffffffc0114806e0
[ 45.494770] x9 : ffffffc01014b2ec x8 : 0000000000017fe8
[ 45.500251] x7 : c0000000ffffefff x6 : 0000000000000001
[ 45.505733] x5 : 0000000000000000 x4 : 0000000000000000
[ 45.511213] x3 : 0000000000000000 x2 : ffffff801fece870
[ 45.516693] x1 : ffffffc00eded000 x0 : 000000000000003f
[ 45.522174] Call trace:
[ 45.524695] ath9k_hw_reset+0xc4/0x1c48 [ath9k_hw]
[ 45.529653] ath_reset_internal+0x1a8/0x2b8 [ath9k]
[ 45.534696] ath_reset_work+0x2c/0x40 [ath9k]
[ 45.539198] process_one_work+0x210/0x480
[ 45.543339] worker_thread+0x5c/0x510
[ 45.547115] kthread+0x12c/0x130
[ 45.550445] ret_from_fork+0x10/0x1c
[ 45.554138] Code: 910922c2 9117e021 95ff0398 b4000294 (b9400a61)
[ 45.560430] ---[ end trace 566410ba90b50e8b ]---
[ 45.565193] Kernel panic - not syncing: Oops: Fatal exception in interrupt
[ 45.572282] SMP: stopping secondary CPUs
[ 45.576331] Kernel Offset: disabled
[ 45.579924] CPU features: 0x00040002,0000200c
[ 45.584416] Memory Limit: none
[ 45.587564] Rebooting in 3 seconds..--- drivers/net/wireless/ath/ath9k/main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath9k/main.c +5 -0
@@ -304,6 +304,11 @@ static int ath_reset_internal(struct ath hchan = ah->curchan; } +if (!hchan) { + fastcc = false; + hchan =ath9k_cmn_get_channel (sc->hw, ah, &sc->cur_chan->chandef); + } +if (!ath_prepare_reset (sc)) fastcc = false;
Greg Kroah-Hartman
maintainerPATCH 52/348 ssb: sdio: Dont overwrite const buffer if block_write fails
In reply to Greg Kroah-HartmanFrom: Michael Buesch <[email protected]>
commit 47ec636f7a25aa2549e198c48ecb6b1c25d05456 upstream.
It doesn't make sense to clobber the const driver-side buffer, if a write-to-device attempt failed. All other SSB variants (PCI, PCMCIA and SoC) also don't corrupt the buffer on any failure in block_write. Therefore, remove this memset from the SDIO variant.
--- drivers/ssb/sdio.c | 1 - 1 file changed, 1 deletion(-)
drivers/ssb/sdio.c +0 -1
@@ -411,7 +411,6 @@ static void ssb_sdio_block_write(structsdio_claim_host (bus->host_sdio);if (unlikely (ssb_sdio_switch_core (bus, dev))) { error = -EIO ; -memset ((void *)buffer,0xff , count); goto err_out; } offset |= bus->sdio_sbaddr &0xffff ;
Greg Kroah-Hartman
maintainerPATCH 26/348 ext4: fix kernel infoleak via ext4_extent_header
In reply to Greg Kroah-HartmanFrom: Anirudh Rayabharam <[email protected]>
commit ce3aba43599f0b50adbebff133df8d08a3d5fffe upstream.
Initialize eh_generation of struct ext4_extent_header to prevent leaking info to userspace. Fixes KMSAN kernel-infoleak bug reported by syzbot at:
http://syzkaller.appspot.com/bug?id=78e9ad0e6952a3ca16e8234724b2fa92d041b9b8
--- fs/ext4/extents.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/extents.c +3 -0
@@ -862,6 +862,7 @@ int ext4_ext_tree_init(handle_t *handle, eh->eh_entries =0 ; eh->eh_magic =EXT4_EXT_MAGIC ; eh->eh_max =cpu_to_le16 (ext4_ext_space_root (inode,0 )); + eh->eh_generation =0 ;ext4_mark_inode_dirty (handle, inode);return 0 ; }
@@ -1118,6 +1119,7 @@ static int ext4_ext_split(handle_t *hand neh->eh_max =cpu_to_le16 (ext4_ext_space_block (inode,0 )); neh->eh_magic =EXT4_EXT_MAGIC ; neh->eh_depth =0 ; + neh->eh_generation =0 ;/* move remainder of path[depth] to the new leaf */ if (unlikely(path[depth].p_hdr->eh_entries !=
@@ -1195,6 +1197,7 @@ static int ext4_ext_split(handle_t *hand neh->eh_magic =EXT4_EXT_MAGIC ; neh->eh_max =cpu_to_le16 (ext4_ext_space_block_idx (inode,0 )); neh->eh_depth =cpu_to_le16 (depth - i); + neh->eh_generation =0 ; fidx =EXT_FIRST_INDEX (neh); fidx->ei_block = border;ext4_idx_store_pblock (fidx, oldblock);
Greg Kroah-Hartman
maintainerPATCH 53/348 rsi: Assign beacon rate settings to the correct rate_info descriptor field
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
commit b1c3a24897bd528f2f4fda9fea7da08a84ae25b6 upstream.
The RSI_RATE_x bits must be assigned to struct rsi_data_desc rate_info field. The rest of the driver does it correctly, except this one place, so fix it. This is also aligned with the RSI downstream vendor driver. Without this patch, an AP operating at 5 GHz does not transmit any beacons at all, this patch fixes that.
--- drivers/net/wireless/rsi/rsi_91x_hal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/rsi/rsi_91x_hal.c +2 -2
@@ -470,9 +470,9 @@ int rsi_prepare_beacon(struct rsi_common }if (common->band ==NL80211_BAND_2GHZ ) - bcn_frm->bbp_info |=cpu_to_le16 (RSI_RATE_1 ); + bcn_frm->rate_info |=cpu_to_le16 (RSI_RATE_1 );else - bcn_frm->bbp_info |=cpu_to_le16 (RSI_RATE_6 ); + bcn_frm->rate_info |=cpu_to_le16 (RSI_RATE_6 );if (mac_bcn->data[tim_offset +2 ] ==0 ) bcn_frm->frame_info |=cpu_to_le16 (RSI_DATA_DESC_DTIM_BEACON );
Greg Kroah-Hartman
maintainerPATCH 54/348 rsi: fix AP mode with WPA failure due to encrypted EAPOL
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit 314538041b5632ffaf64798faaeabaf2793fe029 upstream.
In AP mode WPA2-PSK connections were not established.
The reason was that the AP was sending the first message of the 4 way handshake encrypted, even though no pairwise key had (correctly) yet been set.
Encryption was enabled if the "security_enable" driver flag was set and encryption was not explicitly disabled by IEEE80211_TX_INTFL_DONT_ENCRYPT.
However security_enable was set when *any* key, including the AP GTK key, had been set which was causing unwanted encryption even if no key was avaialble for the unicast packet to be sent.
Fix this by adding a check that we have a key and drop the old security_enable driver flag which is insufficient and redundant.
The Redpine downstream out of tree driver does it this way too.
Regarding the Fixes tag the actual code being modified was introduced earlier, with the original driver submission, in dad0d04fa7ba ("rsi: Add RS9113 wireless driver"), however at that time AP mode was not yet supported so there was no bug at that point.
So I have tagged the introduction of AP support instead which was part of the patch set "rsi: support for AP mode" [1]
It is not clear whether AP WPA has ever worked, I can see nothing on the kernel side that broke it afterwards yet the AP support patch series says "Tests are performed to confirm aggregation, connections in WEP and WPA/WPA2 security."
One possibility is that the initial tests were done with a modified userspace (hostapd).
[1] https://www.spinics.net/lists/linux-wireless/msg165302.html
--- drivers/net/wireless/rsi/rsi_91x_hal.c | 2 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 --- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 3 +-- drivers/net/wireless/rsi/rsi_main.h | 1 - 4 files changed, 2 insertions(+), 7 deletions(-)
drivers/net/wireless/rsi/rsi_91x_hal.c +1 -1
@@ -203,7 +203,7 @@ int rsi_prepare_data_desc(struct rsi_com wh->frame_control |=cpu_to_le16 (RSI_SET_PS_ENABLE );if ((!(info->flags &IEEE80211_TX_INTFL_DONT_ENCRYPT )) && - (common->secinfo.security_enable)) { + info->control.hw_key) {if (rsi_is_cipher_wep (common)) ieee80211_size +=4 ;else
drivers/net/wireless/rsi/rsi_91x_mac80211.c +0 -3
@@ -1027,7 +1027,6 @@ static int rsi_mac80211_set_key(struct imutex_lock (&common->mutex);switch (cmd) {case SET_KEY : - secinfo->security_enable = true; status =rsi_hal_key_config (hw, vif, key, sta);if (status) {mutex_unlock (&common->mutex);
@@ -1046,8 +1045,6 @@ static int rsi_mac80211_set_key(struct ibreak ;case DISABLE_KEY : -if (vif->type ==NL80211_IFTYPE_STATION ) - secinfo->security_enable = false;rsi_dbg (ERR_ZONE ,"%s: RSI del key\n" , __func__);memset (key,0 ,sizeof (struct ieee80211_key_conf )); status =rsi_hal_key_config (hw, vif, key, sta);
drivers/net/wireless/rsi/rsi_91x_mgmt.c +1 -2
@@ -1788,8 +1788,7 @@ int rsi_send_wowlan_request(struct rsi_c RSI_WIFI_MGMT_Q); cmd_frame->desc.desc_dword0.frame_type =WOWLAN_CONFIG_PARAMS ; cmd_frame->host_sleep_status = sleep_status; -if (common->secinfo.security_enable && - common->secinfo.gtk_cipher) +if (common->secinfo.gtk_cipher) flags |=RSI_WOW_GTK_REKEY ;if (sleep_status) cmd_frame->wow_flags = flags;
drivers/net/wireless/rsi/rsi_main.h +0 -1
@@ -151,7 +151,6 @@ enum edca_queue { };struct security_info { -bool security_enable;u32 ptk_cipher;u32 gtk_cipher; };
Greg Kroah-Hartman
maintainerPATCH 55/348 tracing/histograms: Fix parsing of "sym-offset" modifier
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 26c563731056c3ee66f91106c3078a8c36bb7a9e upstream.
With the addition of simple mathematical operations (plus and minus), the parsing of the "sym-offset" modifier broke, as it took the '-' part of the "sym-offset" as a minus, and tried to break it up into a mathematical operation of "field.sym - offset", in which case it failed to parse (unless the event had a field called "offset").
Both .sym and .sym-offset modifiers should not be entered into mathematical calculations anyway. If ".sym-offset" is found in the modifier, then simply make it not an operation that can be calculated on.
--- kernel/trace/trace_events_hist.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/trace/trace_events_hist.c +7 -0
@@ -2437,6 +2437,13 @@ static int contains_operator(char *str)switch (*op) {case '-' : +/* +* Unfortunately, the modifier ".sym-offset" +* can confuse things. +*/ +if (op - str >=4 && !strncmp (op -4 ,".sym-offset" ,11 )) +return FIELD_OP_NONE ; +if (*str =='-' ) field_op =FIELD_OP_UNARY_MINUS ;else
Greg Kroah-Hartman
maintainerPATCH 56/348 tracepoint: Add tracepoint_probe_register_may_exist() for BPF tracing
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 9913d5745bd720c4266805c8d29952a3702e4eca upstream.
All internal use cases for tracepoint_probe_register() is set to not ever be called with the same function and data. If it is, it is considered a bug, as that means the accounting of handling tracepoints is corrupted. If the function and data for a tracepoint is already registered when tracepoint_probe_register() is called, it will call WARN_ON_ONCE() and return with EEXISTS.
The BPF system call can end up calling tracepoint_probe_register() with the same data, which now means that this can trigger the warning because of a user space process. As WARN_ON_ONCE() should not be called because user space called a system call with bad data, there needs to be a way to register a tracepoint without triggering a warning.
Enter tracepoint_probe_register_may_exist(), which can be called, but will not cause a WARN_ON() if the probe already exists. It will still error out with EEXIST, which will then be sent to the user space that performed the BPF system call.
This keeps the previous testing for issues with other users of the tracepoint code, while letting BPF call it with duplicated data and not warn about it.
--- include/linux/tracepoint.h | 10 ++++++++++ kernel/trace/bpf_trace.c | 3 ++- kernel/tracepoint.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 4 deletions(-)
include/linux/tracepoint.h +10 -0
@@ -40,7 +40,17 @@ extern int tracepoint_probe_register_prio(struct tracepoint *tp, void *probe, void *data, int prio);extern int +tracepoint_probe_register_prio_may_exist (struct tracepoint *tp,void *probe,void *data, +int prio); +extern int tracepoint_probe_unregister (struct tracepoint *tp,void *probe,void *data); +static inline int +tracepoint_probe_register_may_exist (struct tracepoint *tp,void *probe, +void *data) +{ +return tracepoint_probe_register_prio_may_exist (tp, probe, data, +TRACEPOINT_DEFAULT_PRIO ); +}extern void for_each_kernel_tracepoint (void (*fct)(struct tracepoint *tp,void *priv),void *priv);
kernel/trace/bpf_trace.c +2 -1
@@ -1397,7 +1397,8 @@ static int __bpf_probe_register(struct bif (prog->aux->max_tp_access > btp->writable_size)return -EINVAL ; -return tracepoint_probe_register (tp, (void *)btp->bpf_func, prog); +return tracepoint_probe_register_may_exist (tp, (void *)btp->bpf_func, + prog); }int bpf_probe_register (struct bpf_raw_event_map *btp,struct bpf_prog *prog)
kernel/tracepoint.c +30 -3
@@ -271,7 +271,8 @@ static void *func_remove(struct tracepoi* Add the probe function to a tracepoint. */ static int tracepoint_add_func (struct tracepoint *tp, -struct tracepoint_func *func,int prio) +struct tracepoint_func *func,int prio, +bool warn) {struct tracepoint_func *old, *tp_funcs;int ret;
@@ -286,7 +287,7 @@ static int tracepoint_add_func(struct tr lockdep_is_held(&tracepoints_mutex)); old =func_add (&tp_funcs, func, prio);if (IS_ERR (old)) { -WARN_ON_ONCE (PTR_ERR (old) != -ENOMEM ); +WARN_ON_ONCE (warn &&PTR_ERR (old) != -ENOMEM );return PTR_ERR (old); }
@@ -338,6 +339,32 @@ static int tracepoint_remove_func(struct }/** +* tracepoint_probe_register_prio_may_exist - Connect a probe to a tracepoint with priority +* @tp: tracepoint +* @probe: probe handler +* @data: tracepoint data +* @prio: priority of this function over other registered functions +* +* Same as tracepoint_probe_register_prio() except that it will not warn +* if the tracepoint is already registered. +*/ +int tracepoint_probe_register_prio_may_exist (struct tracepoint *tp,void *probe, +void *data,int prio) +{ +struct tracepoint_func tp_func; +int ret; + +mutex_lock (&tracepoints_mutex); + tp_func.func = probe; + tp_func.data = data; + tp_func.prio = prio; + ret =tracepoint_add_func (tp, &tp_func, prio, false); +mutex_unlock (&tracepoints_mutex); +return ret; +} +EXPORT_SYMBOL_GPL (tracepoint_probe_register_prio_may_exist); + +/** * tracepoint_probe_register_prio - Connect a probe to a tracepoint with priority * @tp: tracepoint * @probe: probe handler
@@ -360,7 +387,7 @@ int tracepoint_probe_register_prio(struc tp_func.func = probe; tp_func.data = data; tp_func.prio = prio; - ret =tracepoint_add_func (tp, &tp_func, prio); + ret =tracepoint_add_func (tp, &tp_func, prio, true);mutex_unlock (&tracepoints_mutex);return ret; }
Greg Kroah-Hartman
maintainerPATCH 57/348 seq_buf: Make trace_seq_putmem_hex() support data longer than 8
In reply to Greg Kroah-HartmanFrom: Yun Zhou <[email protected]>
commit 6a2cbc58d6c9d90cd74288cc497c2b45815bc064 upstream.
Since the raw memory 'data' does not go forward, it will dump repeated data if the data length is more than 8. If we want to dump longer data blocks, we need to repeatedly call macro SEQ_PUT_HEX_FIELD. I think it is a bit redundant, and multiple function calls also affect the performance.
--- lib/seq_buf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/seq_buf.c +3 -1
@@ -242,12 +242,14 @@ int seq_buf_putmem_hex(struct seq_buf *sbreak ;/* j increments twice per loop */ - len -= j /2 ; hex[j++] =' ' ;seq_buf_putmem (s, hex, j);if (seq_buf_has_overflowed (s))return -1 ; + + len -= start_len; + data += start_len; }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 58/348 powerpc/stacktrace: Fix spurious "stale" traces in raise_backtrace_ipi()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 7c6986ade69e3c81bac831645bc72109cd798a80 upstream.
In raise_backtrace_ipi() we iterate through the cpumask of CPUs, sending each an IPI asking them to do a backtrace, but we don't wait for the backtrace to happen.
We then iterate through the CPU mask again, and if any CPU hasn't done the backtrace and cleared itself from the mask, we print a trace on its behalf, noting that the trace may be "stale".
This works well enough when a CPU is not responding, because in that case it doesn't receive the IPI and the sending CPU is left to print the trace. But when all CPUs are responding we are left with a race between the sending and receiving CPUs, if the sending CPU wins the race then it will erroneously print a trace.
This leads to spurious "stale" traces from the sending CPU, which can then be interleaved messily with the receiving CPU, note the CPU numbers, eg:
[ 1658.929157][ C7] rcu: Stack dump where RCU GP kthread last ran: [ 1658.929223][ C7] Sending NMI from CPU 7 to CPUs 1: [ 1658.929303][ C1] NMI backtrace for cpu 1 [ 1658.929303][ C7] CPU 1 didn't respond to backtrace IPI, inspecting paca. [ 1658.929362][ C1] CPU: 1 PID: 325 Comm: kworker/1:1H Tainted: G W E 5.13.0-rc2+ #46 [ 1658.929405][ C7] irq_soft_mask: 0x01 in_mce: 0 in_nmi: 0 current: 325 (kworker/1:1H) [ 1658.929465][ C1] Workqueue: events_highpri test_work_fn [test_lockup] [ 1658.929549][ C7] Back trace of paca->saved_r1 (0xc0000000057fb400) (possibly stale): [ 1658.929592][ C1] NIP: c00000000002cf50 LR: c008000000820178 CTR: c00000000002cfa0
To fix it, change the logic so that the sending CPU waits 5s for the receiving CPU to print its trace. If the receiving CPU prints its trace successfully then the sending CPU just continues, avoiding any spurious "stale" trace.
This has the added benefit of allowing all CPUs to print their traces in order and avoids any interleaving of their output.
--- arch/powerpc/kernel/stacktrace.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
arch/powerpc/kernel/stacktrace.c +20 -6
@@ -230,17 +230,31 @@ static void handle_backtrace_ipi(structstatic void raise_backtrace_ipi (cpumask_t *mask) { +struct paca_struct *p;unsigned int cpu; +u64 delay_us;for_each_cpu (cpu, mask) { -if (cpu ==smp_processor_id ()) +if (cpu ==smp_processor_id ()) {handle_backtrace_ipi (NULL ); -else -smp_send_safe_nmi_ipi (cpu, handle_backtrace_ipi,5 *USEC_PER_SEC ); - } +continue ; + } -for_each_cpu (cpu, mask) { -struct paca_struct *p = paca_ptrs[cpu]; + delay_us =5 *USEC_PER_SEC ; + +if (smp_send_safe_nmi_ipi (cpu, handle_backtrace_ipi, delay_us)) { +// Now wait up to 5s for the other CPU to do its backtrace +while (cpumask_test_cpu (cpu, mask) && delay_us) { +udelay (1 ); + delay_us--; + } + +// Other CPU cleared itself from the mask +if (delay_us) +continue ; + } + + p = paca_ptrs[cpu];cpumask_clear_cpu (cpu, mask);
Greg Kroah-Hartman
maintainerPATCH 59/348 evm: Execute evm_inode_init_security() only when an HMAC key is loaded
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
commit 9eea2904292c2d8fa98df141d3bf7c41ec9dc1b5 upstream.
evm_inode_init_security() requires an HMAC key to calculate the HMAC on initial xattrs provided by LSMs. However, it checks generically whether a key has been loaded, including also public keys, which is not correct as public keys are not suitable to calculate the HMAC.
Originally, support for signature verification was introduced to verify a possibly immutable initial ram disk, when no new files are created, and to switch to HMAC for the root filesystem. By that time, an HMAC key should have been loaded and usable to calculate HMACs for new files.
More recently support for requiring an HMAC key was removed from the kernel, so that signature verification can be used alone. Since this is a legitimate use case, evm_inode_init_security() should not return an error when no HMAC key has been loaded.
This patch fixes this problem by replacing the evm_key_loaded() check with a check of the EVM_INIT_HMAC flag in evm_initialized.
--- security/integrity/evm/evm_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
security/integrity/evm/evm_main.c +3 -2
@@ -520,7 +520,7 @@ void evm_inode_post_setattr(struct dentr }/* -* evm_inode_init_security - initializes security.evm +* evm_inode_init_security - initializes security.evm HMAC value */ int evm_inode_init_security(struct inode *inode, const struct xattr *lsm_xattr,
@@ -529,7 +529,8 @@ int evm_inode_init_security(struct inodestruct evm_xattr *xattr_data;int rc; -if (!evm_key_loaded () || !evm_protected_xattr (lsm_xattr->name)) +if (!(evm_initialized &EVM_INIT_HMAC ) || + !evm_protected_xattr (lsm_xattr->name))return 0 ; xattr_data =kzalloc (sizeof (*xattr_data),GFP_NOFS );
Greg Kroah-Hartman
maintainerPATCH 60/348 evm: Refuse EVM_ALLOW_METADATA_WRITES only if an HMAC key is loaded
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
commit 9acc89d31f0c94c8e573ed61f3e4340bbd526d0c upstream.
EVM_ALLOW_METADATA_WRITES is an EVM initialization flag that can be set to temporarily disable metadata verification until all xattrs/attrs necessary to verify an EVM portable signature are copied to the file. This flag is cleared when EVM is initialized with an HMAC key, to avoid that the HMAC is calculated on unverified xattrs/attrs.
Currently EVM unnecessarily denies setting this flag if EVM is initialized with a public key, which is not a concern as it cannot be used to trust xattrs/attrs updates. This patch removes this limitation.
--- Documentation/ABI/testing/evm | 26 ++++++++++++++++++++++++-- security/integrity/evm/evm_secfs.c | 8 ++++---- 2 files changed, 28 insertions(+), 6 deletions(-)
Documentation/ABI/testing/evm +24 -2
@@ -42,8 +42,30 @@ Description: modification of EVM-protected metadata and disable all further modification of policy - Note that once a key has been loaded, it will no longer be - possible to enable metadata modification. + Echoing a value is additive, the new value is added to the + existing initialization flags. + + For example, after:: + + echo 2 ><securityfs>/evm + + another echo can be performed:: + + echo 1 ><securityfs>/evm + + and the resulting value will be 3. + + Note that once an HMAC key has been loaded, it will no longer + be possible to enable metadata modification. Signaling that an + HMAC key has been loaded will clear the corresponding flag. + For example, if the current value is 6 (2 and 4 set):: + + echo 1 ><securityfs>/evm + + will set the new value to 3 (4 cleared). + + Loading an HMAC key is the only way to disable metadata + modification. Until key loading has been signaled EVM can not create or validate the 'security.evm' xattr, but returns
security/integrity/evm/evm_secfs.c +4 -4
@@ -82,12 +82,12 @@ static ssize_t evm_write_key(struct fileif (!i || (i & ~EVM_INIT_MASK ) !=0 )return -EINVAL ; -/* Don't allow a request to freshly enable metadata writes if -* keys are loaded. +/* +* Don't allow a request to enable metadata writes if +* an HMAC key is loaded. */ if ((i &EVM_ALLOW_METADATA_WRITES ) && - ((evm_initialized &EVM_KEY_MASK ) !=0 ) && - !(evm_initialized &EVM_ALLOW_METADATA_WRITES )) + (evm_initialized &EVM_INIT_HMAC ) !=0 )return -EPERM ;if (i &EVM_INIT_HMAC ) {
Greg Kroah-Hartman
maintainerPATCH 27/348 ext4: return error code when ext4_fill_flex_info() fails
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
commit 8f6840c4fd1e7bd715e403074fb161c1a04cda73 upstream.
After commit c89128a00838 ("ext4: handle errors on ext4_commit_super"), 'ret' may be set to 0 before calling ext4_fill_flex_info(), if ext4_fill_flex_info() fails ext4_mount() doesn't return error code, it makes 'root' is null which causes crash in legacy_get_tree().
--- fs/ext4/super.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/super.c +1 -0
@@ -4618,6 +4618,7 @@ no_journal:ext4_msg (sb,KERN_ERR ,"unable to initialize " "flex_bg meta info!" ); + ret = -ENOMEM ; goto failed_mount6; }
Greg Kroah-Hartman
maintainerPATCH 62/348 fuse: check connected before queueing on fpq->io
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 80ef08670d4c28a06a3de954bd350368780bcfef upstream.
A request could end up on the fpq->io list after fuse_abort_conn() has reset fpq->connected and aborted requests on that list:
Thread-1 Thread-2
======== ========
->fuse_simple_request() ->shutdown
->__fuse_request_send()
->queue_request() ->fuse_abort_conn() ->fuse_dev_do_read() ->acquire(fpq->lock) ->wait_for(fpq->lock) ->set err to all req's in fpq->io ->release(fpq->lock)
->acquire(fpq->lock)
->add req to fpq->io
After the userspace copy is done the request will be ended, but req->out.h.error will remain uninitialized. Also the copy might block despite being already aborted.
Fix both issues by not allowing the request to be queued on the fpq->io list after fuse_abort_conn() has processed this list.
--- fs/fuse/dev.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/fuse/dev.c +9 -0
@@ -1264,6 +1264,15 @@ static ssize_t fuse_dev_do_read(struct f goto restart; }spin_lock (&fpq->lock); +/* +* Must not put request on fpq->io queue after having been shut down by +* fuse_abort_conn() +*/ +if (!fpq->connected) { + req->out.h.error = err = -ECONNABORTED ; + goto out_end; + + }list_add (&req->list, &fpq->io);spin_unlock (&fpq->lock); cs->req = req;
Greg Kroah-Hartman
maintainerPATCH 61/348 fuse: ignore PG_workingset after stealing
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit b89ecd60d38ec042d63bdb376c722a16f92bcb88 upstream.
Fix the "fuse: trying to steal weird page" warning.
Description from Johannes Weiner:
"Think of it as similar to PG_active. It's just another usage/heat
indicator of file and anon pages on the reclaim LRU that, unlike PG_active, persists across deactivation and even reclaim (we store it in the page cache / swapper cache tree until the page refaults).
So if fuse accepts pages that can legally have PG_active set, PG_workingset is fine too."
--- fs/fuse/dev.c | 1 + 1 file changed, 1 insertion(+)
fs/fuse/dev.c +1 -0
@@ -770,6 +770,7 @@ static int fuse_check_page(struct page * 1 << PG_uptodate | 1 << PG_lru | 1 << PG_active | + 1 << PG_workingset | 1 << PG_reclaim | 1 << PG_waiters))) {pr_warn ("trying to steal weird page\n" );
Greg Kroah-Hartman
maintainerPATCH 63/348 fuse: reject internal errno
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 49221cf86d18bb66fe95d3338cb33bd4b9880ca5 upstream.
Don't allow userspace to report errors that could be kernel-internal.
--- fs/fuse/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/dev.c +1 -1
@@ -1869,7 +1869,7 @@ static ssize_t fuse_dev_do_write(struct } err = -EINVAL ; -if (oh.error <=-1000 || oh.error >0 ) +if (oh.error <=-512 || oh.error >0 ) goto copy_finish;spin_lock (&fpq->lock);
Greg Kroah-Hartman
maintainerPATCH 64/348 spi: Make of_register_spi_device also set the fwnode
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit 0e793ba77c18382f08e440260fe72bc6fce2a3cb ]
Currently, the SPI core doesn't set the struct device fwnode pointer when it creates a new SPI device. This means when the device is registered the fwnode is NULL and the check in device_add which sets the fwnode->dev pointer is skipped. This wasn't previously an issue, however these two patches:
commit 4731210c09f5 ("gpiolib: Bind gpio_device to a driver to enable fw_devlink=on by default")
commit ced2af419528 ("gpiolib: Don't probe gpio_device if it's not the primary device")
Added some code to the GPIO core which relies on using that fwnode->dev pointer to determine if a driver is bound to the fwnode and if not bind a stub GPIO driver. This means the GPIO providers behind SPI will get both the expected driver and this stub driver causing the stub driver to fail if it attempts to request any pin configuration. For example on my system:
madera-pinctrl madera-pinctrl: pin gpio5 already requested by madera-pinctrl; cannot claim for gpiochip3 madera-pinctrl madera-pinctrl: pin-4 (gpiochip3) status -22
madera-pinctrl madera-pinctrl: could not request pin 4 (gpio5) from group aif1 on device madera-pinctrl gpio_stub_drv gpiochip3: Error applying setting, reverse things backgpio_stub_drv: probe of gpiochip3 failed with error -22
The firmware node on the device created by the GPIO framework is set through the of_node pointer hence things generally actually work, however that fwnode->dev is never set, as the check was skipped at device_add time. This fix appears to match how the I2C subsystem handles the same situation.
--- drivers/spi/spi.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi.c +1 -0
@@ -1849,6 +1849,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc)/* Store a pointer to the node in the device structure */ of_node_get (nc); spi->dev.of_node = nc; + spi->dev.fwnode =of_fwnode_handle (nc);/* Register the new device */ rc =spi_add_device (spi);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 65/348 media: mdk-mdp: fix pm_runtime_get_sync() usage count
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit d07bb9702cf5f5ccf3fb661e6cab54bbc33cd23f ]
The pm_runtime_get_sync() internally increments thedev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.
While here, fix the return contition of mtk_mdp_m2m_start_streaming(), as it doesn't make any sense to return 0 if the PM runtime failed to resume.
--- drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c +3 -3
@@ -402,12 +402,12 @@ static int mtk_mdp_m2m_start_streaming(struct vb2_queue *q, unsigned int count)struct mtk_mdp_ctx *ctx = q->drv_priv;int ret; - ret =pm_runtime_get_sync (&ctx->mdp_dev->pdev->dev); + ret =pm_runtime_resume_and_get (&ctx->mdp_dev->pdev->dev);if (ret <0 ) -mtk_mdp_dbg (1 ,"[%d] pm_runtime_get_sync failed:%d" , +mtk_mdp_dbg (1 ,"[%d] pm_runtime_resume_and_get failed:%d" , ctx->id, ret); -return 0 ; +return ret; } static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 66/348 media: s5p: fix pm_runtime_get_sync() usage count
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit fdc34e82c0f968ac4c157bd3d8c299ebc24c9c63 ]
The pm_runtime_get_sync() internally increments thedev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.
While here, check if the PM runtime error was caught at s5p_cec_adap_enable().
--- drivers/media/platform/s5p-cec/s5p_cec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/s5p-cec/s5p_cec.c +4 -1
@@ -35,10 +35,13 @@ MODULE_PARM_DESC(debug, "debug level (0-2)");static int s5p_cec_adap_enable (struct cec_adapter *adap,bool enable) { +int ret;struct s5p_cec_dev *cec =cec_get_drvdata (adap);if (enable) { -pm_runtime_get_sync (cec->dev); + ret =pm_runtime_resume_and_get (cec->dev); +if (ret <0 ) +return ret;s5p_cec_reset (cec);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 67/348 media: sh_vou: fix pm_runtime_get_sync() usage count
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 6e8b1526db164c9d4b9dacfb9bc48e365d7c4860 ]
The pm_runtime_get_sync() internally increments thedev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.
While here, check if the PM runtime error was caught at open time.
--- drivers/media/platform/sh_vou.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/sh_vou.c +5 -1
@@ -1133,7 +1133,11 @@ static int sh_vou_open(struct file *file)if (v4l2_fh_is_singular_file (file) && vou_dev->status ==SH_VOU_INITIALISING ) {/* First open */ -pm_runtime_get_sync (vou_dev->v4l2_dev.dev); + err =pm_runtime_resume_and_get (vou_dev->v4l2_dev.dev); +if (err <0 ) { +v4l2_fh_release (file); + goto done_open; + } err =sh_vou_hw_init (vou_dev);if (err <0 ) {pm_runtime_put (vou_dev->v4l2_dev.dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 68/348 media: mtk-vcodec: fix PM runtime get logic
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 908711f542c17fe61e5d653da1beb8e5ab5c7b50 ]
Currently, the driver just assumes that PM runtime logic succeded resuming the device.
That may not be the case, as pm_runtime_get_sync() can fail (but keeping the usage count incremented).
Replace the code to use pm_runtime_resume_and_get(), and letting it return the error code.
This way, if mtk_vcodec_dec_pw_on() fails, the logic under fops_vcodec_open() will do the right thing and return an error, instead of just assuming that the device is ready to be used.
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 4 +++- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 8 +++++--- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +3 -1
@@ -142,7 +142,9 @@ static int fops_vcodec_open(struct file *file)mtk_vcodec_dec_set_default_params (ctx);if (v4l2_fh_is_singular (&ctx->fh)) { -mtk_vcodec_dec_pw_on (&dev->pm); + ret =mtk_vcodec_dec_pw_on (&dev->pm); +if (ret <0 ) + goto err_load_fw;/* * vpu_load_firmware checks if it was loaded already and * does nothing in that case
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +5 -3
@@ -89,13 +89,15 @@ void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev)put_device (dev->pm.larbvdec); } -void mtk_vcodec_dec_pw_on (struct mtk_vcodec_pm *pm) +int mtk_vcodec_dec_pw_on (struct mtk_vcodec_pm *pm) {int ret; - ret =pm_runtime_get_sync (pm->dev); + ret =pm_runtime_resume_and_get (pm->dev);if (ret) -mtk_v4l2_err ("pm_runtime_get_sync fail %d" , ret); +mtk_v4l2_err ("pm_runtime_resume_and_get fail %d" , ret); + +return ret; }void mtk_vcodec_dec_pw_off (struct mtk_vcodec_pm *pm)
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +1 -1
@@ -12,7 +12,7 @@int mtk_vcodec_init_dec_pm (struct mtk_vcodec_dev *dev);void mtk_vcodec_release_dec_pm (struct mtk_vcodec_dev *dev); -void mtk_vcodec_dec_pw_on (struct mtk_vcodec_pm *pm); +int mtk_vcodec_dec_pw_on (struct mtk_vcodec_pm *pm);void mtk_vcodec_dec_pw_off (struct mtk_vcodec_pm *pm);void mtk_vcodec_dec_clock_on (struct mtk_vcodec_pm *pm);void mtk_vcodec_dec_clock_off (struct mtk_vcodec_pm *pm);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 28/348 ext4: correct the cache_nr in tracepoint ext4_es_shrink_exit
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
commit 4fb7c70a889ead2e91e184895ac6e5354b759135 upstream.
The cache_cnt parameter of tracepoint ext4_es_shrink_exit means the remaining cache count after shrink, but now it is the cache count before shrink, fix it by read sbi->s_extent_cache_cnt again.
--- fs/ext4/extents_status.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/extents_status.c +1 -0
@@ -1558,6 +1558,7 @@ static unsigned long ext4_es_scan(struct nr_shrunk =__es_shrink (sbi, nr_to_scan,NULL ); + ret =percpu_counter_read_positive (&sbi->s_es_stats.es_stats_shk_cnt);trace_ext4_es_shrink_scan_exit (sbi->s_sb, nr_shrunk, ret);return nr_shrunk; }
Greg Kroah-Hartman
maintainerPATCH 29/348 ext4: remove check for zero nr_to_scan in ext4_es_scan()
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
commit e5e7010e5444d923e4091cafff61d05f2d19cada upstream.
After converting fs shrinkers to new scan/count API, we are no longer pass zero nr_to_scan parameter to detect the number of objects to free, just remove this check.
--- fs/ext4/extents_status.c | 3 --- 1 file changed, 3 deletions(-)
fs/ext4/extents_status.c +0 -3
@@ -1553,9 +1553,6 @@ static unsigned long ext4_es_scan(struct ret =percpu_counter_read_positive (&sbi->s_es_stats.es_stats_shk_cnt);trace_ext4_es_shrink_scan_enter (sbi->s_sb, nr_to_scan, ret); -if (!nr_to_scan) -return ret; - nr_shrunk =__es_shrink (sbi, nr_to_scan,NULL ); ret =percpu_counter_read_positive (&sbi->s_es_stats.es_stats_shk_cnt);
Greg Kroah-Hartman
maintainerPATCH 30/348 ext4: fix avefreec in find_group_orlov
In reply to Greg Kroah-HartmanFrom: Pan Dong <[email protected]>
commit c89849cc0259f3d33624cc3bd127685c3c0fa25d upstream.
The avefreec should be average free clusters instead of average free blocks, otherwize Orlov's allocator will not work properly when bigalloc enabled.
--- fs/ext4/ialloc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
fs/ext4/ialloc.c +5 -6
@@ -394,7 +394,7 @@ static void get_orlov_stats(struct super* * We always try to spread first-level directories. * -* If there are blockgroups with both free inodes and free blocks counts +* If there are blockgroups with both free inodes and free clusters counts * not worse than average we return one with smallest directory count. * Otherwise we simply return a random group. *
@@ -403,7 +403,7 @@ static void get_orlov_stats(struct super* It's OK to put directory into a group unless * it has too many directories already (max_dirs) or * it has too few free inodes left (min_inodes) or -* it has too few free blocks left (min_blocks) or +* it has too few free clusters left (min_clusters) or * Parent's group is preferred, if it doesn't satisfy these * conditions we search cyclically through the rest. If none * of the groups look good we just look for a group with more
@@ -419,7 +419,7 @@ static int find_group_orlov(struct superext4_group_t real_ngroups =ext4_get_groups_count (sb);int inodes_per_group =EXT4_INODES_PER_GROUP (sb);unsigned int freei, avefreei, grp_free; -ext4_fsblk_t freeb, avefreec; +ext4_fsblk_t freec, avefreec;unsigned int ndirs;int max_dirs, min_inodes;ext4_grpblk_t min_clusters;
@@ -438,9 +438,8 @@ static int find_group_orlov(struct super freei =percpu_counter_read_positive (&sbi->s_freeinodes_counter); avefreei = freei / ngroups; - freeb =EXT4_C2B (sbi, -percpu_counter_read_positive (&sbi->s_freeclusters_counter)); - avefreec = freeb; + freec =percpu_counter_read_positive (&sbi->s_freeclusters_counter); + avefreec = freec;do_div (avefreec, ngroups); ndirs =percpu_counter_read_positive (&sbi->s_dirs_counter);
Greg Kroah-Hartman
maintainerPATCH 31/348 ext4: use ext4_grp_locked_error in mb_find_extent
In reply to Greg Kroah-HartmanFrom: Stephen Brennan <[email protected]>
commit cd84bbbac12a173a381a64c6ec8b76a5277b87b5 upstream.
Commit 5d1b1b3f492f ("ext4: fix BUG when calling ext4_error with locked block group") introduces ext4_grp_locked_error to handle unlocking a group in error cases. Otherwise, there is a possibility of a sleep while atomic. However, since 43c73221b3b1 ("ext4: replace BUG_ON with WARN_ON in mb_find_extent()"), mb_find_extent() has contained a ext4_error() call while a group spinlock is held. Replace this with ext4_grp_locked_error.
--- fs/ext4/mballoc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/ext4/mballoc.c +5 -4
@@ -1542,10 +1542,11 @@ static int mb_find_extent(struct ext4_buif (ex->fe_start + ex->fe_len >EXT4_CLUSTERS_PER_GROUP (e4b->bd_sb)) {/* Should never happen! (but apparently sometimes does?!?) */ WARN_ON (1 ); -ext4_error (e4b->bd_sb,"corruption or bug in mb_find_extent " -"block=%d, order=%d needed=%d ex=%u/%d/%d@%u" , - block, order, needed, ex->fe_group, ex->fe_start, - ex->fe_len, ex->fe_logical); +ext4_grp_locked_error (e4b->bd_sb, e4b->bd_group,0 ,0 , +"corruption or bug in mb_find_extent " +"block=%d, order=%d needed=%d ex=%u/%d/%d@%u" , + block, order, needed, ex->fe_group, ex->fe_start, + ex->fe_len, ex->fe_logical); ex->fe_len =0 ; ex->fe_start =0 ; ex->fe_group =0 ;
Greg Kroah-Hartman
maintainerPATCH 32/348 can: bcm: delay release of struct bcm_op after synchronize_rcu()
In reply to Greg Kroah-HartmanFrom: Thadeu Lima de Souza Cascardo <[email protected]>
commit d5f9023fa61ee8b94f37a93f08e94b136cf1e463 upstream.
can_rx_register() callbacks may be called concurrently to the call to can_rx_unregister(). The callbacks and callback data, though, are protected by RCU and the struct sock reference count.
So the callback data is really attached to the life of sk, meaning that it should be released on sk_destruct. However, bcm_remove_op() calls tasklet_kill(), and RCU callbacks may be called under RCU softirq, so that cannot be used on kernels before the introduction of HRTIMER_MODE_SOFT.
However, bcm_rx_handler() is called under RCU protection, so after calling can_rx_unregister(), we may call synchronize_rcu() in order to wait for any RCU read-side critical sections to finish. That is, bcm_rx_handler() won't be called anymore for those ops. So, we only free them, after we do that synchronize_rcu().
--- net/can/bcm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/can/bcm.c +6 -1
@@ -787,6 +787,7 @@ static int bcm_delete_rx_op(struct list_ bcm_rx_handler, op);list_del (&op->list); +synchronize_rcu ();bcm_remove_op (op);return 1 ;/* done */ }
@@ -1535,9 +1536,13 @@ static int bcm_release(struct socket *soREGMASK (op->can_id), bcm_rx_handler, op); -bcm_remove_op (op); } +synchronize_rcu (); + +list_for_each_entry_safe (op, next, &bo->rx_ops, list) +bcm_remove_op (op); +#if IS_ENABLED (CONFIG_PROC_FS )/* remove procfs entry */ if (net->can.bcmproc_dir && bo->bcm_proc_read)
Greg Kroah-Hartman
maintainerPATCH 46/348 iio: ltr501: ltr501_read_ps(): add missing endianness conversion
In reply to Greg Kroah-HartmanFrom: Oliver Lang <[email protected]>
commit 71b33f6f93ef9462c84560e2236ed22209d26a58 upstream.
The PS ADC Channel data is spread over 2 registers in little-endian form. This patch adds the missing endianness conversion.
--- drivers/iio/light/ltr501.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/light/ltr501.c +4 -3
@@ -408,18 +408,19 @@ static int ltr501_read_als(struct ltr501static int ltr501_read_ps (struct ltr501_data *data) { -int ret, status; +__le16 status; +int ret; ret =ltr501_drdy (data,LTR501_STATUS_PS_RDY );if (ret <0 )return ret; ret =regmap_bulk_read (data->regmap,LTR501_PS_DATA , - &status,2 ); + &status,sizeof (status));if (ret <0 )return ret; -return status; +return le16_to_cpu (status); } static int ltr501_read_intr_prst(struct ltr501_data *data,
Greg Kroah-Hartman
maintainerPATCH 23/348 btrfs: send: fix invalid path for unlink operations after parent orphanization
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit d8ac76cdd1755b21e8c008c28d0b7251c0b14986 upstream.
During an incremental send operation, when processing the new references for the current inode, we might send an unlink operation for another inode that has a conflicting path and has more than one hard link. However this path was computed and cached before we processed previous new references for the current inode. We may have orphanized a directory of that path while processing a previous new reference, in which case the path will be invalid and cause the receiver process to fail.
The following reproducer triggers the problem and explains how/why it happens in its comments:
$ cat test-send-unlink.sh #!/bin/bash
DEV=/dev/sdi
MNT=/mnt/sdi
mkfs.btrfs -f $DEV >/dev/null
mount $DEV $MNT
# Create our test files and directory. Inode 259 (file3) has two hard
# links. touch $MNT/file1 touch $MNT/file2 touch $MNT/file3
mkdir $MNT/A
ln $MNT/file3 $MNT/A/hard_link
# Filesystem looks like:
#
# . (ino 256) # |----- file1 (ino 257) # |----- file2 (ino 258) # |----- file3 (ino 259) # |----- A/ (ino 260) # |---- hard_link (ino 259) #
# Now create the base snapshot, which is going to be the parent snapshot
# for a later incremental send. btrfs subvolume snapshot -r $MNT $MNT/snap1 btrfs send -f /tmp/snap1.send $MNT/snap1
# Move inode 257 into directory inode 260. This results in computing the
# path for inode 260 as "/A" and caching it. mv $MNT/file1 $MNT/A/file1
# Move inode 258 (file2) into directory inode 260, with a name of # "hard_link", moving first inode 259 away since it currently has that
# location and name. mv $MNT/A/hard_link $MNT/tmp mv $MNT/file2 $MNT/A/hard_link
# Now rename inode 260 to something else (B for example) and then create
# a hard link for inode 258 that has the old name and location of inode
# 260 ("/A").
mv $MNT/A $MNT/B
ln $MNT/B/hard_link $MNT/A # Filesystem now looks like:
#
# . (ino 256) # |----- tmp (ino 259) # |----- file3 (ino 259) # |----- B/ (ino 260) # | |---- file1 (ino 257) # | |---- hard_link (ino 258) # | # |----- A (ino 258)
# Create another snapshot of our subvolume and use it for an incremental
# send. btrfs subvolume snapshot -r $MNT $MNT/snap2 btrfs send -f /tmp/snap2.send -p $MNT/snap1 $MNT/snap2
# Now unmount the filesystem, create a new one, mount it and try to
# apply both send streams to recreate both snapshots. umount $DEV
mkfs.btrfs -f $DEV >/dev/null
mount $DEV $MNT
# First add the first snapshot to the new filesystem by applying the
# first send stream. btrfs receive -f /tmp/snap1.send $MNT
# The incremental receive operation below used to fail with the
# following error: # # ERROR: unlink A/hard_link failed: No such file or directory # # This is because when send is processing inode 257, it generates the # path for inode 260 as "/A", since that inode is its parent in the send # snapshot, and caches that path. # # Later when processing inode 258, it first processes its new reference # that has the path of "/A", which results in orphanizing inode 260 # because there is a a path collision. This results in issuing a rename # operation from "/A" to "/o260-6-0". # # Finally when processing the new reference "B/hard_link" for inode 258, # it notices that it collides with inode 259 (not yet processed, because # it has a higher inode number), since that inode has the name # "hard_link" under the directory inode 260. It also checks that inode # 259 has two hardlinks, so it decides to issue a unlink operation for # the name "hard_link" for inode 259. However the path passed to the # unlink operation is "/A/hard_link", which is incorrect since currently # "/A" does not exists, due to the orphanization of inode 260 mentioned # before. The path is incorrect because it was computed and cached # before the orphanization. This results in the receiver to fail with # the above error. btrfs receive -f /tmp/snap2.send $MNT
umount $MNT
When running the test, it fails like this:
$ ./test-send-unlink.sh Create a readonly snapshot of '/mnt/sdi' in '/mnt/sdi/snap1' At subvol /mnt/sdi/snap1 Create a readonly snapshot of '/mnt/sdi' in '/mnt/sdi/snap2' At subvol /mnt/sdi/snap2 At subvol snap1 At snapshot snap2 ERROR: unlink A/hard_link failed: No such file or directory
Fix this by recomputing a path before issuing an unlink operation when processing the new references for the current inode if we previously have orphanized a directory.
A test case for fstests will follow soon.
--- fs/btrfs/send.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/btrfs/send.c +11 -0
@@ -4087,6 +4087,17 @@ static int process_recorded_refs(structif (ret <0 ) goto out; }else { +/* +* If we previously orphanized a directory that +* collided with a new reference that we already +* processed, recompute the current path because +* that directory may be part of the path. +*/ +if (orphanized_dir) { + ret =refresh_ref_path (sctx, cur); +if (ret <0 ) + goto out; + } ret =send_unlink (sctx, cur->full_path);if (ret <0 ) goto out;
Greg Kroah-Hartman
maintainerPATCH 70/348 media: sti/bdisp: fix pm_runtime_get_sync() usage count
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit c44eac5b72e23c31eefc0e10a71d9650036b8341 ]
The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors.
The bdisp_start_streaming() doesn't take it into account, which would unbalance PM usage counter at bdisp_stop_streaming().
The logic at bdisp_probe() is correct, but the best is to use the same call along the driver.
So, replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.
--- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/media/platform/sti/bdisp/bdisp-v4l2.c +4 -3
@@ -499,7 +499,7 @@ static int bdisp_start_streaming(struct vb2_queue *q, unsigned int count) {struct bdisp_ctx *ctx = q->drv_priv;struct vb2_v4l2_buffer *buf; -int ret =pm_runtime_get_sync (ctx->bdisp_dev->dev); +int ret =pm_runtime_resume_and_get (ctx->bdisp_dev->dev);if (ret <0 ) {dev_err (ctx->bdisp_dev->dev,"failed to set runtime PM\n" );
@@ -1364,10 +1364,10 @@ static int bdisp_probe(struct platform_device *pdev)/* Power management */ pm_runtime_enable (dev); - ret =pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 ) {dev_err (dev,"failed to set PM\n" ); - goto err_pm; + goto err_remove; }/* Filters */
@@ -1395,6 +1395,7 @@ err_filter:bdisp_hw_free_filters (bdisp->dev); err_pm:pm_runtime_put (dev); +err_remove:bdisp_debugfs_remove (bdisp); err_v4l2:v4l2_device_unregister (&bdisp->v4l2_dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 79/348 media: cpia2: fix memory leak in cpia2_usb_probe
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit be8656e62e9e791837b606a027802b504a945c97 ]
syzbot reported leak in cpia2 usb driver. The problem was in invalid error handling.
v4l2_device_register() is called in cpia2_init_camera_struct(), but all error cases after cpia2_init_camera_struct() did not call the v4l2_device_unregister()
--- drivers/media/usb/cpia2/cpia2.h | 1 + drivers/media/usb/cpia2/cpia2_core.c | 12 ++++++++++++ drivers/media/usb/cpia2/cpia2_usb.c | 13 +++++++------ 3 files changed, 20 insertions(+), 6 deletions(-)
drivers/media/usb/cpia2/cpia2.h +1 -0
@@ -429,6 +429,7 @@ int cpia2_send_command(struct camera_data *cam, struct cpia2_command *cmd);int cpia2_do_command (struct camera_data *cam,unsigned int command,unsigned char direction,unsigned char param); +void cpia2_deinit_camera_struct (struct camera_data *cam,struct usb_interface *intf);struct camera_data *cpia2_init_camera_struct (struct usb_interface *intf);int cpia2_init_camera (struct camera_data *cam);int cpia2_allocate_buffers (struct camera_data *cam);
drivers/media/usb/cpia2/cpia2_core.c +12 -0
@@ -2163,6 +2163,18 @@ static void reset_camera_struct(struct camera_data *cam) cam->height = cam->params.roi.height; } +/****************************************************************************** +* +* cpia2_init_camera_struct +* +* Deinitialize camera struct +*****************************************************************************/ +void cpia2_deinit_camera_struct (struct camera_data *cam,struct usb_interface *intf) +{ +v4l2_device_unregister (&cam->v4l2_dev); +kfree (cam); +} +/****************************************************************************** * * cpia2_init_camera_struct
drivers/media/usb/cpia2/cpia2_usb.c +7 -6
@@ -844,15 +844,13 @@ static int cpia2_usb_probe(struct usb_interface *intf, ret =set_alternate (cam,USBIF_CMDONLY );if (ret <0 ) {ERR ("%s: usb_set_interface error (ret = %d)\n" , __func__, ret); -kfree (cam); -return ret; + goto alt_err; }if ((ret =cpia2_init_camera (cam)) <0 ) {ERR ("%s: failed to initialize cpia2 camera (ret = %d)\n" , __func__, ret); -kfree (cam); -return ret; + goto alt_err; } LOG(" CPiA Version: %d.%02d (%d.%d)\n", cam->params.version.firmware_revision_hi,
@@ -872,11 +870,14 @@ static int cpia2_usb_probe(struct usb_interface *intf, ret =cpia2_register_camera (cam);if (ret <0 ) {ERR ("%s: Failed to register cpia2 camera (ret = %d)\n" , __func__, ret); -kfree (cam); -return ret; + goto alt_err; }return 0 ; + +alt_err: +cpia2_deinit_camera_struct (cam, intf); +return ret; }/******************************************************************************
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 80/348 media: cobalt: fix race condition in setting HPD
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 3d37ef41bed0854805ab9af22c422267510e1344 ]
The cobalt_s_bit_sysctrl reads the old register value over PCI, then changes a bit and sets writes the new value to the register.
This is used among other things for setting the HPD output pin.
But if the HPD is changed for multiple inputs at the same time, then this causes a race condition where a stale value is read.
Serialize this function with a mutex.
--- drivers/media/pci/cobalt/cobalt-driver.c | 1 + drivers/media/pci/cobalt/cobalt-driver.h | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/media/pci/cobalt/cobalt-driver.c +1 -0
@@ -667,6 +667,7 @@ static int cobalt_probe(struct pci_dev *pci_dev,return -ENOMEM ; cobalt->pci_dev = pci_dev; cobalt->instance = i; +mutex_init (&cobalt->pci_lock); retval =v4l2_device_register (&pci_dev->dev, &cobalt->v4l2_dev);if (retval) {
drivers/media/pci/cobalt/cobalt-driver.h +6 -1
@@ -251,6 +251,8 @@ struct cobalt {int instance;struct pci_dev *pci_dev;struct v4l2_device v4l2_dev; +/* serialize PCI access in cobalt_s_bit_sysctrl() */ +struct mutex pci_lock;void __iomem *bar0, *bar1;
@@ -320,10 +322,13 @@ static inline u32 cobalt_g_sysctrl(struct cobalt *cobalt)static inline void cobalt_s_bit_sysctrl (struct cobalt *cobalt,int bit,int val) { -u32 ctrl =cobalt_read_bar1 (cobalt,COBALT_SYS_CTRL_BASE ); +u32 ctrl; +mutex_lock (&cobalt->pci_lock); + ctrl =cobalt_read_bar1 (cobalt,COBALT_SYS_CTRL_BASE );cobalt_write_bar1 (cobalt,COBALT_SYS_CTRL_BASE , (ctrl & ~(1UL << bit)) | (val << bit)); +mutex_unlock (&cobalt->pci_lock); }static inline u32 cobalt_g_sysstat (struct cobalt *cobalt)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 81/348 media: pvrusb2: fix warning in pvr2_i2c_core_done
In reply to Greg Kroah-HartmanFrom: Anirudh Rayabharam <[email protected]>
[ Upstream commit f8194e5e63fdcb349e8da9eef9e574d5b1d687cb ]
syzbot has reported the following warning in pvr2_i2c_done:
sysfs group 'power' not found for kobject '1-0043'
When the device is disconnected (pvr_hdw_disconnect), the i2c adapter is not unregistered along with the USB and v4l2 teardown. As part of the USB device disconnect, the sysfs files of the subdevices are also deleted. So, by the time pvr_i2c_core_done is called by pvr_context_destroy, the sysfs files have been deleted.
To fix this, unregister the i2c adapter too in pvr_hdw_disconnect. Make the device deregistration code shared by calling pvr_hdw_disconnect from pvr2_hdw_destroy.
--- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +2 -2
@@ -2677,9 +2677,8 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)pvr2_stream_destroy (hdw->vid_stream); hdw->vid_stream =NULL ; } -pvr2_i2c_core_done (hdw);v4l2_device_unregister (&hdw->v4l2_dev); -pvr2_hdw_remove_usb_stuff (hdw); +pvr2_hdw_disconnect (hdw);mutex_lock (&pvr2_unit_mtx); do { if ((hdw->unit_number >= 0) &&
@@ -2706,6 +2705,7 @@ void pvr2_hdw_disconnect(struct pvr2_hdw *hdw) {pvr2_trace (PVR2_TRACE_INIT ,"pvr2_hdw_disconnect(hdw=%p)" ,hdw);LOCK_TAKE (hdw->big_lock); +pvr2_i2c_core_done (hdw);LOCK_TAKE (hdw->ctl_lock);pvr2_hdw_remove_usb_stuff (hdw);LOCK_GIVE (hdw->ctl_lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 82/348 media: imx: imx7_mipi_csis: Fix logging of only error event counters
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit d2fcc9c2de1191ea80366e3658711753738dd10a ]
The mipi_csis_events array ends with 6 non-error events, not 4. Update mipi_csis_log_counters() accordingly. While at it, log event counters in forward order, as there's no reason to log them backward.
--- drivers/staging/media/imx/imx7-mipi-csis.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/media/imx/imx7-mipi-csis.c +4 -2
@@ -528,13 +528,15 @@ static void mipi_csis_clear_counters(struct csi_state *state)static void mipi_csis_log_counters (struct csi_state *state,bool non_errors) { -int i = non_errors ?MIPI_CSIS_NUM_EVENTS :MIPI_CSIS_NUM_EVENTS -4 ; +unsigned int num_events = non_errors ?MIPI_CSIS_NUM_EVENTS + :MIPI_CSIS_NUM_EVENTS -6 ;struct device *dev = &state->pdev->dev;unsigned long flags; +unsigned int i;spin_lock_irqsave (&state->slock, flags); -for (i--; i >=0 ; i--) { +for (i =0 ; i < num_events; ++i) {if (state->events[i].counter >0 || state->debug)dev_info (dev,"%s events: %d\n" , state->events[i].name, state->events[i].counter);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 83/348 crypto: qat - check return code of qat_hal_rd_rel_reg()
In reply to Greg Kroah-HartmanFrom: Jack Xu <[email protected]>
[ Upstream commit 96b57229209490c8bca4335b01a426a96173dc56 ]
Check the return code of the function qat_hal_rd_rel_reg() and return it to the caller.
This is to fix the following warning when compiling the driver with clang scan-build:
drivers/crypto/qat/qat_common/qat_hal.c:1436:2: warning: 6th function call argument is an uninitialized value
--- drivers/crypto/qat/qat_common/qat_hal.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/crypto/qat/qat_common/qat_hal.c +5 -1
@@ -1256,7 +1256,11 @@ static int qat_hal_put_rel_wr_xfer(struct icp_qat_fw_loader_handle *handle,pr_err ("QAT: bad xfrAddr=0x%x\n" , xfr_addr);return -EINVAL ; } -qat_hal_rd_rel_reg (handle, ae, ctx,ICP_GPB_REL , gprnum, &gprval); + status =qat_hal_rd_rel_reg (handle, ae, ctx,ICP_GPB_REL , gprnum, &gprval); +if (status) { +pr_err ("QAT: failed to read register" ); +return status; + } gpr_addr =qat_hal_get_reg_addr (ICP_GPB_REL , gprnum); data16low =0xffff & data; data16hi =0xffff & (data >>0x10 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 84/348 crypto: qat - remove unused macro in FW loader
In reply to Greg Kroah-HartmanFrom: Jack Xu <[email protected]>
[ Upstream commit 9afe77cf25d9670e61b489fd52cc6f75fd7f6803 ]
Remove the unused macro ICP_DH895XCC_PESRAM_BAR_SIZE in the firmware loader.
This is to fix the following warning when compiling the driver using the clang compiler with CC=clang W=2:
drivers/crypto/qat/qat_common/qat_uclo.c:345:9: warning: macro is not used [-Wunused-macros]
--- drivers/crypto/qat/qat_common/qat_uclo.c | 1 - 1 file changed, 1 deletion(-)
drivers/crypto/qat/qat_common/qat_uclo.c +0 -1
@@ -385,7 +385,6 @@ static int qat_uclo_init_umem_seg(struct icp_qat_fw_loader_handle *handle,return 0 ; } -#define ICP_DH895XCC_PESRAM_BAR_SIZE 0x80000static int qat_uclo_init_ae_memory (struct icp_qat_fw_loader_handle *handle,struct icp_qat_uof_initmem *init_mem) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 85/348 sched/fair: Fix ascii art by relpacing tabs
In reply to Greg Kroah-HartmanFrom: Odin Ugedal <[email protected]>
[ Upstream commit 08f7c2f4d0e9f4283f5796b8168044c034a1bfcb ]
When using something other than 8 spaces per tab, this ascii art makes not sense, and the reader might end up wondering what this advanced equation "is".
--- kernel/sched/fair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/sched/fair.c +4 -4
@@ -2927,7 +2927,7 @@ void reweight_task(struct task_struct *p, int prio)* * tg->weight * grq->load.weight * ge->load.weight = ----------------------------- (1) -* \Sum grq->load.weight +* \Sum grq->load.weight * * Now, because computing that sum is prohibitively expensive to compute (been * there, done that) we approximate it with this average stuff. The average
@@ -2941,7 +2941,7 @@ void reweight_task(struct task_struct *p, int prio)* * tg->weight * grq->avg.load_avg * ge->load.weight = ------------------------------ (3) -* tg->load_avg +* tg->load_avg * * Where: tg->load_avg ~= \Sum grq->avg.load_avg *
@@ -2957,7 +2957,7 @@ void reweight_task(struct task_struct *p, int prio)* * tg->weight * grq->load.weight * ge->load.weight = ----------------------------- = tg->weight (4) -* grp->load.weight +* grp->load.weight * * That is, the sum collapses because all other CPUs are idle; the UP scenario. *
@@ -2976,7 +2976,7 @@ void reweight_task(struct task_struct *p, int prio)* * tg->weight * grq->load.weight * ge->load.weight = ----------------------------- (6) -* tg_load_avg' +* tg_load_avg' * * Where: *
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 86/348 media: em28xx: Fix possible memory leak of em28xx struct
In reply to Greg Kroah-HartmanFrom: Igor Matheus Andrade Torrente <[email protected]>
[ Upstream commit ac5688637144644f06ed1f3c6d4dd8bb7db96020 ]
The em28xx struct kref isn't being decreased after an error in the em28xx_ir_init, leading to a possible memory leak.
A kref_put and em28xx_shutdown_buttons is added to the error handler code.
--- drivers/media/usb/em28xx/em28xx-input.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/usb/em28xx/em28xx-input.c +6 -2
@@ -720,7 +720,8 @@ static int em28xx_ir_init(struct em28xx *dev) dev->board.has_ir_i2c =0 ;dev_warn (&dev->intf->dev,"No i2c IR remote control device found.\n" ); -return -ENODEV ; + err = -ENODEV ; + goto ref_put; } }
@@ -735,7 +736,7 @@ static int em28xx_ir_init(struct em28xx *dev) ir =kzalloc (sizeof (*ir),GFP_KERNEL );if (!ir) -return -ENOMEM ; + goto ref_put; rc =rc_allocate_device (RC_DRIVER_SCANCODE );if (!rc) goto error;
@@ -839,6 +840,9 @@ error: dev->ir =NULL ;rc_free_device (rc);kfree (ir); +ref_put: +em28xx_shutdown_buttons (dev); +kref_put (&dev->ref, em28xx_free_device);return err; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 87/348 media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
[ Upstream commit 7dd0c9e547b6924e18712b6b51aa3cba1896ee2c ]
A use after free bug caused by the dangling pointer filp->privitate_data in v4l2_fh_release.
See https://lore.kernel.org/patchwork/patch/1419058/.
My patch sets the dangling pointer to NULL to provide robust.
--- drivers/media/v4l2-core/v4l2-fh.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/v4l2-core/v4l2-fh.c +1 -0
@@ -96,6 +96,7 @@ int v4l2_fh_release(struct file *filp)v4l2_fh_del (fh);v4l2_fh_exit (fh);kfree (fh); + filp->private_data =NULL ; }return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 88/348 media: bt8xx: Fix a missing check bug in bt878_probe
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 1a4520090681853e6b850cbe54b27247a013e0e5 ]
In 'bt878_irq', the driver calls 'tasklet_schedule', but this tasklet is set in 'dvb_bt8xx_load_card' of another driver 'dvb-bt8xx'. However, this two drivers are separate. The user may not load the 'dvb-bt8xx' driver when loading the 'bt8xx' driver, that is, the tasklet has not been initialized when 'tasklet_schedule' is called, so it is necessary to check whether the tasklet is initialized in 'bt878_probe'.
Fix this by adding a check at the end of bt878_probe.
The KASAN's report reveals it:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 PGD 800000006aab2067 P4D 800000006aab2067 PUD 6b2ea067 PMD 0 Oops: 0010 [#1] PREEMPT SMP KASAN PTI CPU: 2 PID: 8724 Comm: syz-executor.0 Not tainted 4.19.177- gdba4159c14ef-dirty #40 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59- gc9ba5276e321-prebuilt.qemu.org 04/01/2014 RIP: 0010: (null) Code: Bad RIP value. RSP: 0018:ffff88806c287ea0 EFLAGS: 00010246 RAX: fffffbfff1b01774 RBX: dffffc0000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 1ffffffff1b01775 RDI: 0000000000000000 RBP: ffff88806c287f00 R08: fffffbfff1b01774 R09: fffffbfff1b01774 R10: 0000000000000001 R11: fffffbfff1b01773 R12: 0000000000000000 R13: ffff88806c29f530 R14: ffffffff8d80bb88 R15: ffffffff8d80bb90 FS: 00007f6b550e6700(0000) GS:ffff88806c280000(0000) knlGS: 0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 000000005ec98000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> tasklet_action_common.isra.17+0x141/0x420 kernel/softirq.c:522 tasklet_action+0x50/0x70 kernel/softirq.c:540 __do_softirq+0x224/0x92c kernel/softirq.c:292 invoke_softirq kernel/softirq.c:372 [inline] irq_exit+0x15a/0x180 kernel/softirq.c:412 exiting_irq arch/x86/include/asm/apic.h:535 [inline] do_IRQ+0x123/0x1e0 arch/x86/kernel/irq.c:260 common_interrupt+0xf/0xf arch/x86/entry/entry_64.S:670 </IRQ> RIP: 0010:__do_sys_interrupt kernel/sys.c:2593 [inline] RIP: 0010:__se_sys_interrupt kernel/sys.c:2584 [inline] RIP: 0010:__x64_sys_interrupt+0x5b/0x80 kernel/sys.c:2584 Code: ba 00 04 00 00 48 c7 c7 c0 99 31 8c e8 ae 76 5e 01 48 85 c0 75 21 e8
14 ae 24 00 48 c7 c3 c0 99 31 8c b8 0c 00 00 00 0f 01 c1 <31> db e8 fe ad 24 00 48 89 d8 5b 5d c3 48 c7 c3 ea ff ff ff eb ec
RSP: 0018:ffff888054167f10 EFLAGS: 00000212 ORIG_RAX: ffffffffffffffde
RAX: 000000000000000c RBX: ffffffff8c3199c0 RCX: ffffc90001ca6000
RDX: 000000000000001a RSI: ffffffff813478fc RDI: ffffffff8c319dc0
RBP: ffff888054167f18 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000080 R11: fffffbfff18633b7 R12: ffff888054167f58
R13: ffff88805f638000 R14: 0000000000000000 R15: 0000000000000000
do_syscall_64+0xb0/0x4e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x4692a9 Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7
48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f6b550e5c48 EFLAGS: 00000246 ORIG_RAX: 000000000000014f
RAX: ffffffffffffffda RBX: 000000000077bf60 RCX: 00000000004692a9
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020000140
RBP: 00000000004cf7eb R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 000000000077bf60
R13: 0000000000000000 R14: 000000000077bf60 R15: 00007fff55a1dca0
Modules linked in: Dumping ftrace buffer: (ftrace buffer empty) CR2: 0000000000000000 ---[ end trace 68e5849c3f77cbb6 ]--- RIP: 0010: (null) Code: Bad RIP value. RSP: 0018:ffff88806c287ea0 EFLAGS: 00010246 RAX: fffffbfff1b01774 RBX: dffffc0000000000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 1ffffffff1b01775 RDI: 0000000000000000 RBP: ffff88806c287f00 R08: fffffbfff1b01774 R09: fffffbfff1b01774 R10: 0000000000000001 R11: fffffbfff1b01773 R12: 0000000000000000 R13: ffff88806c29f530 R14: ffffffff8d80bb88 R15: ffffffff8d80bb90 FS: 00007f6b550e6700(0000) GS:ffff88806c280000(0000) knlGS: 0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 000000005ec98000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
--- drivers/media/pci/bt8xx/bt878.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/bt8xx/bt878.c +3 -0
@@ -477,6 +477,9 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)btwrite (0 ,BT878_AINT_MASK ); bt878_num++; +if (!bt->tasklet.func) +tasklet_disable (&bt->tasklet); +return 0 ; fail2:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 71/348 media: exynos-gsc: fix pm_runtime_get_sync() usage count
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 59087b66ea6730c130c57d23bd9fd139b78c1ba5 ]
The pm_runtime_get_sync() internally increments thedev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.
As a bonus, as pm_runtime_get_sync() always return 0 on success, the logic can be simplified.
--- drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/platform/exynos-gsc/gsc-m2m.c +1 -3
@@ -56,10 +56,8 @@ static void __gsc_m2m_job_abort(struct gsc_ctx *ctx)static int gsc_m2m_start_streaming (struct vb2_queue *q,unsigned int count) {struct gsc_ctx *ctx = q->drv_priv; -int ret; - ret =pm_runtime_get_sync (&ctx->gsc_dev->pdev->dev); -return ret >0 ?0 : ret; +return pm_runtime_resume_and_get (&ctx->gsc_dev->pdev->dev); }static void __gsc_m2m_cleanup_queue (struct gsc_ctx *ctx)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 89/348 media: st-hva: Fix potential NULL pointer dereferences
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit b7fdd208687ba59ebfb09b2199596471c63b69e3 ]
When ctx_id >= HVA_MAX_INSTANCES in hva_hw_its_irq_thread() it tries to access fields of ctx that is NULL at that point. The patch gets rid of these accesses.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/sti/hva/hva-hw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/platform/sti/hva/hva-hw.c +1 -2
@@ -130,8 +130,7 @@ static irqreturn_t hva_hw_its_irq_thread(int irq, void *arg) ctx_id = (hva->sts_reg &0xFF00 ) >>8 ;if (ctx_id >=HVA_MAX_INSTANCES ) {dev_err (dev,"%s %s: bad context identifier: %d\n" , - ctx->name, __func__, ctx_id); - ctx->hw_err = true; +HVA_PREFIX , __func__, ctx_id); goto out; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 90/348 Makefile: fix GDB warning with CONFIG_RELR
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
[ Upstream commit 27f2a4db76e8d8a8b601fc1c6a7a17f88bd907ab ]
GDB produces the following warning when debugging kernels built with CONFIG_RELR:
BFD: /android0/linux-next/vmlinux: unknown type [0x13] section `.relr.dyn'
when loading a kernel built with CONFIG_RELR into GDB. It can also prevent debugging symbols using such relocations.
Peter sugguests:
[That flag] means that lld will use dynamic tags and section type numbers in the OS-specific range rather than the generic range. The kernel itself doesn't care about these numbers; it determines the location of the RELR section using symbols defined by a linker script.
--- Makefile | 2 +- scripts/tools-support-relr.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Makefile +1 -1
@@ -937,7 +937,7 @@ LDFLAGS_vmlinux += $(call ld-option, -X,) endif ifeq ($(CONFIG_RELR),y) -LDFLAGS_vmlinux += --pack-dyn-relocs=relr +LDFLAGS_vmlinux += --pack-dyn-relocs=relr --use-android-relr-tags endif # make the checker run with the right architecture
scripts/tools-support-relr.sh +2 -1
@@ -7,7 +7,8 @@ trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT cat << "END" | $CC -c -x c - -o $tmp_file.o >/dev/null 2>&1 void *p = &p; END -$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file +$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr \ + --use-android-relr-tags -o $tmp_file # Despite printing an error message, GNU nm still exits with exit code 0 if it # sees a relr section. So we need to check that nothing is printed to stderr.
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 91/348 media: dvd_usb: memory leak in cinergyt2_fe_attach
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 9ad1efee086e0e913914fa2b2173efb830bad68c ]
When the driver fails to talk with the hardware with dvb_usb_generic_rw, it will return an error to dvb_usb_adapter_frontend_init. However, the driver forgets to free the resource (e.g., struct cinergyt2_fe_state), which leads to a memory leak.
Fix this by freeing struct cinergyt2_fe_state when dvb_usb_generic_rw fails in cinergyt2_frontend_attach.
backtrace:
[<0000000056e17b1a>] kmalloc include/linux/slab.h:552 [inline] [<0000000056e17b1a>] kzalloc include/linux/slab.h:682 [inline] [<0000000056e17b1a>] cinergyt2_fe_attach+0x21/0x80 drivers/media/usb/dvb-usb/cinergyT2-fe.c:271 [<00000000ae0b1711>] cinergyt2_frontend_attach+0x21/0x70 drivers/media/usb/dvb-usb/cinergyT2-core.c:74 [<00000000d0254861>] dvb_usb_adapter_frontend_init+0x11b/0x1b0 drivers/media/usb/dvb-usb/dvb-usb-dvb.c:290 [<0000000002e08ac6>] dvb_usb_adapter_init drivers/media/usb/dvb-usb/dvb-usb-init.c:84 [inline] [<0000000002e08ac6>] dvb_usb_init drivers/media/usb/dvb-usb/dvb-usb-init.c:173 [inline] [<0000000002e08ac6>] dvb_usb_device_init.cold+0x4d0/0x6ae drivers/media/usb/dvb-usb/dvb-usb-init.c:287
--- drivers/media/usb/dvb-usb/cinergyT2-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/usb/dvb-usb/cinergyT2-core.c +2 -0
@@ -78,6 +78,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap) ret =dvb_usb_generic_rw (d, st->data,1 , st->data,3 ,0 );if (ret <0 ) { +if (adap->fe_adap[0 ].fe) + adap->fe_adap[0 ].fe->ops.release (adap->fe_adap[0 ].fe);deb_rc ("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n" ); }mutex_unlock (&d->data_mutex);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 92/348 memstick: rtsx_usb_ms: fix UAF
In reply to Greg Kroah-HartmanFrom: Tong Zhang <[email protected]>
[ Upstream commit 42933c8aa14be1caa9eda41f65cde8a3a95d3e39 ]
This patch fixes the following issues:
1. memstick_free_host() will free the host, so the use of ms_dev(host) after it will be a problem. To fix this, move memstick_free_host() after when we are done with ms_dev(host).
2. In rtsx_usb_ms_drv_remove(), pm need to be disabled before we remove and free host otherwise memstick_check will be called and UAF will happen.
[ 11.351173] BUG: KASAN: use-after-free in rtsx_usb_ms_drv_remove+0x94/0x140 [rtsx_usb_ms] [ 11.357077] rtsx_usb_ms_drv_remove+0x94/0x140 [rtsx_usb_ms] [ 11.357376] platform_remove+0x2a/0x50 [ 11.367531] Freed by task 298: [ 11.368537] kfree+0xa4/0x2a0 [ 11.368711] device_release+0x51/0xe0 [ 11.368905] kobject_put+0xa2/0x120 [ 11.369090] rtsx_usb_ms_drv_remove+0x8c/0x140 [rtsx_usb_ms] [ 11.369386] platform_remove+0x2a/0x50
[ 12.038408] BUG: KASAN: use-after-free in __mutex_lock.isra.0+0x3ec/0x7c0 [ 12.045432] mutex_lock+0xc9/0xd0 [ 12.046080] memstick_check+0x6a/0x578 [memstick] [ 12.046509] process_one_work+0x46d/0x750 [ 12.052107] Freed by task 297: [ 12.053115] kfree+0xa4/0x2a0 [ 12.053272] device_release+0x51/0xe0 [ 12.053463] kobject_put+0xa2/0x120 [ 12.053647] rtsx_usb_ms_drv_remove+0xc4/0x140 [rtsx_usb_ms] [ 12.053939] platform_remove+0x2a/0x50
--- drivers/memstick/host/rtsx_usb_ms.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/memstick/host/rtsx_usb_ms.c +4 -6
@@ -799,9 +799,9 @@ static int rtsx_usb_ms_drv_probe(struct platform_device *pdev)return 0 ; err_out: -memstick_free_host (msh);pm_runtime_disable (ms_dev (host));pm_runtime_put_noidle (ms_dev (host)); +memstick_free_host (msh);return err; }
@@ -828,9 +828,6 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev) }mutex_unlock (&host->host_mutex); -memstick_remove_host (msh); -memstick_free_host (msh); -/* Balance possible unbalanced usage count * e.g. unconditional module removal */
@@ -838,10 +835,11 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)pm_runtime_put (ms_dev (host));pm_runtime_disable (ms_dev (host)); -platform_set_drvdata (pdev,NULL ); - +memstick_remove_host (msh);dev_dbg (ms_dev (host),": Realtek USB Memstick controller has been removed\n" ); +memstick_free_host (msh); +platform_set_drvdata (pdev,NULL );return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 93/348 mmc: sdhci-sprd: use sdhci_sprd_writew
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 961470820021e6f9d74db4837bd6831a1a30341b ]
The sdhci_sprd_writew() was defined by never used in sdhci_ops:
drivers/mmc/host/sdhci-sprd.c:134:20: warning: unused function 'sdhci_sprd_writew'
--- drivers/mmc/host/sdhci-sprd.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/sdhci-sprd.c +1 -0
@@ -382,6 +382,7 @@ static unsigned int sdhci_sprd_get_ro(struct sdhci_host *host)static struct sdhci_ops sdhci_sprd_ops = { .read_l = sdhci_sprd_readl, .write_l = sdhci_sprd_writel, + .write_w = sdhci_sprd_writew, .write_b = sdhci_sprd_writeb, .set_clock = sdhci_sprd_set_clock, .get_max_clock = sdhci_sprd_get_max_clock,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 94/348 mmc: via-sdmmc: add a check against NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 45c8ddd06c4b729c56a6083ab311bfbd9643f4a6 ]
Before referencing 'host->data', the driver needs to check whether it is null pointer, otherwise it will cause a null pointer reference.
This log reveals it:
[ 29.355199] BUG: kernel NULL pointer dereference, address: 0000000000000014 [ 29.357323] #PF: supervisor write access in kernel mode [ 29.357706] #PF: error_code(0x0002) - not-present page [ 29.358088] PGD 0 P4D 0 [ 29.358280] Oops: 0002 [#1] PREEMPT SMP PTI [ 29.358595] CPU: 2 PID: 0 Comm: swapper/2 Not tainted 5.12.4- g70e7f0549188-dirty #102 [ 29.359164] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 [ 29.359978] RIP: 0010:via_sdc_isr+0x21f/0x410 [ 29.360314] Code: ff ff e8 84 aa d0 fd 66 45 89 7e 28 66 41 f7 c4 00 10 75 56 e8 72 aa d0 fd 66 41 f7 c4 00 c0 74 10 e8 65 aa d0 fd 48 8b 43 18 <c7> 40 14 ac ff ff ff e8 55 aa d0 fd 48 89 df e8 ad fb ff ff e9 77 [ 29.361661] RSP: 0018:ffffc90000118e98 EFLAGS: 00010046 [ 29.362042] RAX: 0000000000000000 RBX: ffff888107d77880 RCX: 0000000000000000 [ 29.362564] RDX: 0000000000000000 RSI: ffffffff835d20bb RDI: 00000000ffffffff [ 29.363085] RBP: ffffc90000118ed8 R08: 0000000000000001 R09: 0000000000000001 [ 29.363604] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000008600 [ 29.364128] R13: ffff888107d779c8 R14: ffffc90009c00200 R15: 0000000000008000 [ 29.364651] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) knlGS:0000000000000000 [ 29.365235] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.365655] CR2: 0000000000000014 CR3: 0000000005a2e000 CR4: 00000000000006e0 [ 29.366170] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 29.366683] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 29.367197] Call Trace: [ 29.367381] <IRQ> [ 29.367537] __handle_irq_event_percpu+0x53/0x3e0 [ 29.367916] handle_irq_event_percpu+0x35/0x90 [ 29.368247] handle_irq_event+0x39/0x60 [ 29.368632] handle_fasteoi_irq+0xc2/0x1d0 [ 29.368950] __common_interrupt+0x7f/0x150 [ 29.369254] common_interrupt+0xb4/0xd0 [ 29.369547] </IRQ> [ 29.369708] asm_common_interrupt+0x1e/0x40 [ 29.370016] RIP: 0010:native_safe_halt+0x17/0x20 [ 29.370360] Code: 07 0f 00 2d db 80 43 00 f4 5d c3 0f 1f 84 00 00 00 00 00 8b 05 c2 37 e5 01 55 48 89 e5 85 c0 7e 07 0f 00 2d bb 80 43 00 fb f4 <5d> c3 cc cc cc cc cc cc cc 55 48 89 e5 e8 67 53 ff ff 8b 0d f9 91 [ 29.371696] RSP: 0018:ffffc9000008fe90 EFLAGS: 00000246 [ 29.372079] RAX: 0000000000000000 RBX: 0000000000000002 RCX: 0000000000000000 [ 29.372595] RDX: 0000000000000000 RSI: ffffffff854f67a4 RDI: ffffffff85403406 [ 29.373122] RBP: ffffc9000008fe90 R08: 0000000000000001 R09: 0000000000000001 [ 29.373646] R10: 0000000000000000 R11: 0000000000000001 R12: ffffffff86009188 [ 29.374160] R13: 0000000000000000 R14: 0000000000000000 R15: ffff888100258000 [ 29.374690] default_idle+0x9/0x10 [ 29.374944] arch_cpu_idle+0xa/0x10 [ 29.375198] default_idle_call+0x6e/0x250 [ 29.375491] do_idle+0x1f0/0x2d0 [ 29.375740] cpu_startup_entry+0x18/0x20 [ 29.376034] start_secondary+0x11f/0x160 [ 29.376328] secondary_startup_64_no_verify+0xb0/0xbb [ 29.376705] Modules linked in: [ 29.376939] Dumping ftrace buffer: [ 29.377187] (ftrace buffer empty) [ 29.377460] CR2: 0000000000000014 [ 29.377712] ---[ end trace 51a473dffb618c47 ]--- [ 29.378056] RIP: 0010:via_sdc_isr+0x21f/0x410 [ 29.378380] Code: ff ff e8 84 aa d0 fd 66 45 89 7e 28 66 41 f7 c4 00 10 75 56 e8 72 aa d0 fd 66 41 f7 c4 00 c0 74 10 e8 65 aa d0 fd 48 8b 43 18 <c7> 40 14 ac ff ff ff e8 55 aa d0 fd 48 89 df e8 ad fb ff ff e9 77 [ 29.379714] RSP: 0018:ffffc90000118e98 EFLAGS: 00010046 [ 29.380098] RAX: 0000000000000000 RBX: ffff888107d77880 RCX: 0000000000000000 [ 29.380614] RDX: 0000000000000000 RSI: ffffffff835d20bb RDI: 00000000ffffffff [ 29.381134] RBP: ffffc90000118ed8 R08: 0000000000000001 R09: 0000000000000001 [ 29.381653] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000008600 [ 29.382176] R13: ffff888107d779c8 R14: ffffc90009c00200 R15: 0000000000008000 [ 29.382697] FS: 0000000000000000(0000) GS:ffff88817bc80000(0000) knlGS:0000000000000000 [ 29.383277] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.383697] CR2: 0000000000000014 CR3: 0000000005a2e000 CR4: 00000000000006e0 [ 29.384223] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 29.384736] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 29.385260] Kernel panic - not syncing: Fatal exception in interrupt [ 29.385882] Dumping ftrace buffer: [ 29.386135] (ftrace buffer empty) [ 29.386401] Kernel Offset: disabled [ 29.386656] Rebooting in 1 seconds..
--- drivers/mmc/host/via-sdmmc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/via-sdmmc.c +3 -0
@@ -857,6 +857,9 @@ static void via_sdc_data_isr(struct via_crdr_mmc_host *host, u16 intmask) {BUG_ON (intmask ==0 ); +if (!host->data) +return ; +if (intmask &VIA_CRDR_SDSTS_DT ) host->data->error = -ETIMEDOUT ;else if (intmask & (VIA_CRDR_SDSTS_RC |VIA_CRDR_SDSTS_WC ))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 95/348 crypto: shash - avoid comparing pointers to exported functions under CFI
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 22ca9f4aaf431a9413dcc115dd590123307f274f ]
crypto_shash_alg_has_setkey() is implemented by testing whether the .setkey() member of a struct shash_alg points to the default version, called shash_no_setkey(). As crypto_shash_alg_has_setkey() is a static inline, this requires shash_no_setkey() to be exported to modules.
Unfortunately, when building with CFI, function pointers are routed via CFI stubs which are private to each module (or to the kernel proper) and so this function pointer comparison may fail spuriously.
Let's fix this by turning crypto_shash_alg_has_setkey() into an out of line function.
--- crypto/shash.c | 18 +++++++++++++++--- include/crypto/internal/hash.h | 8 +------- 2 files changed, 16 insertions(+), 10 deletions(-)
crypto/shash.c +15 -3
@@ -20,12 +20,24 @@static const struct crypto_type crypto_shash_type; -int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, -unsigned int keylen) +static int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, +unsigned int keylen) {return -ENOSYS ; } -EXPORT_SYMBOL_GPL (shash_no_setkey); + +/* +* Check whether an shash algorithm has a setkey function. +* +* For CFI compatibility, this must not be an inline function. This is because +* when CFI is enabled, modules won't get the same address for shash_no_setkey +* (if it were exported, which inlining would require) as the core kernel will. +*/ +bool crypto_shash_alg_has_setkey (struct shash_alg *alg) +{ +return alg->setkey != shash_no_setkey; +} +EXPORT_SYMBOL_GPL (crypto_shash_alg_has_setkey);static int shash_setkey_unaligned (struct crypto_shash *tfm,const u8 *key,unsigned int keylen)
include/crypto/internal/hash.h +1 -7
@@ -77,13 +77,7 @@ int ahash_register_instance(struct crypto_template *tmpl, struct ahash_instance *inst);void ahash_free_instance (struct crypto_instance *inst); -int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, -unsigned int keylen); - -static inline bool crypto_shash_alg_has_setkey (struct shash_alg *alg) -{ -return alg->setkey != shash_no_setkey; -} +bool crypto_shash_alg_has_setkey (struct shash_alg *alg);bool crypto_hash_alg_has_setkey (struct hash_alg_common *halg);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 96/348 media: dvb_net: avoid speculation from net slot
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit abc0226df64dc137b48b911c1fe4319aec5891bb ]
The risk of especulation is actually almost-non-existing here, as there are very few users of TCP/IP using the DVB stack, as, this is mainly used with DVB-S/S2 cards, and only by people that receives TCP/IP from satellite connections, which limits a lot the number of users of such feature(*).
(*) In thesis, DVB-C cards could also benefit from it, but I'm yet to see a hardware that supports it.
Yet, fixing it is trivial.
--- drivers/media/dvb-core/dvb_net.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/media/dvb-core/dvb_net.c +19 -6
@@ -45,6 +45,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/netdevice.h> +#include <linux/nospec.h> #include <linux/etherdevice.h> #include <linux/dvb/net.h> #include <linux/uio.h>
@@ -1462,14 +1463,20 @@ static int dvb_net_do_ioctl(struct file *file,struct net_device *netdev;struct dvb_net_priv *priv_data;struct dvb_net_if *dvbnetif = parg; +int if_num = dvbnetif->if_num; -if (dvbnetif->if_num >=DVB_NET_DEVICES_MAX || - !dvbnet->state[dvbnetif->if_num]) { +if (if_num >=DVB_NET_DEVICES_MAX ) { ret = -EINVAL ; goto ioctl_error; } + if_num =array_index_nospec (if_num,DVB_NET_DEVICES_MAX ); - netdev = dvbnet->device[dvbnetif->if_num]; +if (!dvbnet->state[if_num]) { + ret = -EINVAL ; + goto ioctl_error; + } + + netdev = dvbnet->device[if_num]; priv_data =netdev_priv (netdev); dvbnetif->pid=priv_data->pid;
@@ -1522,14 +1529,20 @@ static int dvb_net_do_ioctl(struct file *file,struct net_device *netdev;struct dvb_net_priv *priv_data;struct __dvb_net_if_old *dvbnetif = parg; +int if_num = dvbnetif->if_num; + +if (if_num >=DVB_NET_DEVICES_MAX ) { + ret = -EINVAL ; + goto ioctl_error; + } + if_num =array_index_nospec (if_num,DVB_NET_DEVICES_MAX ); -if (dvbnetif->if_num >=DVB_NET_DEVICES_MAX || - !dvbnet->state[dvbnetif->if_num]) { +if (!dvbnet->state[if_num]) { ret = -EINVAL ; goto ioctl_error; } - netdev = dvbnet->device[dvbnetif->if_num]; + netdev = dvbnet->device[if_num]; priv_data =netdev_priv (netdev); dvbnetif->pid=priv_data->pid;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 97/348 media: siano: fix device register error path
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 5368b1ee2939961a16e74972b69088433fc52195 ]
As reported by smatch:
drivers/media/common/siano/smsdvb-main.c:1231 smsdvb_hotplug() warn: '&client->entry' not removed from list
If an error occur at the end of the registration logic, it won't drop the device from the list.
--- drivers/media/common/siano/smsdvb-main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/common/siano/smsdvb-main.c +4 -0
@@ -1176,6 +1176,10 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,return 0 ; media_graph_error: +mutex_lock (&g_smsdvb_clientslock); +list_del (&client->entry); +mutex_unlock (&g_smsdvb_clientslock); +smsdvb_debugfs_release (client); client_error:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 98/348 media: imx-csi: Skip first few frames from a BT.656 source
In reply to Greg Kroah-HartmanFrom: Steve Longerbeam <[email protected]>
[ Upstream commit e198be37e52551bb863d07d2edc535d0932a3c4f ]
Some BT.656 sensors (e.g. ADV718x) transmit frames with unstable BT.656 sync codes after initial power on. This confuses the imx CSI,resulting in vertical and/or horizontal sync issues. Skip the first 20 frames to avoid the unstable sync codes.
[fabio: fixed checkpatch warning and increased the frame skipping to 20]
--- drivers/staging/media/imx/imx-media-csi.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/staging/media/imx/imx-media-csi.c +13 -1
@@ -753,9 +753,10 @@ static int csi_setup(struct csi_priv *priv)static int csi_start (struct csi_priv *priv) { -struct v4l2_fract *output_fi; +struct v4l2_fract *input_fi, *output_fi;int ret; + input_fi = &priv->frame_interval[CSI_SINK_PAD ]; output_fi = &priv->frame_interval[priv->active_output_pad];/* start upstream */
@@ -764,6 +765,17 @@ static int csi_start(struct csi_priv *priv)if (ret)return ret; +/* Skip first few frames from a BT.656 source */ +if (priv->upstream_ep.bus_type ==V4L2_MBUS_BT656 ) { +u32 delay_usec, bad_frames =20 ; + + delay_usec =DIV_ROUND_UP_ULL ((u64 )USEC_PER_SEC * + input_fi->numerator * bad_frames, + input_fi->denominator); + +usleep_range (delay_usec, delay_usec +1000 ); + } +if (priv->dest ==IPU_CSI_DEST_IDMAC ) { ret =csi_idmac_start (priv);if (ret)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 72/348 spi: spi-loopback-test: Fix tx_buf might be rx_buf
In reply to Greg Kroah-HartmanFrom: Jay Fang <[email protected]>
[ Upstream commit 9e37a3ab0627011fb63875e9a93094b6fc8ddf48 ]
In function 'spi_test_run_iter': Value 'tx_buf' might be 'rx_buf'.
--- drivers/spi/spi-loopback-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-loopback-test.c +1 -1
@@ -868,7 +868,7 @@ static int spi_test_run_iter(struct spi_device *spi, test.transfers[i].len = len;if (test.transfers[i].tx_buf) test.transfers[i].tx_buf += tx_off; -if (test.transfers[i].tx_buf) +if (test.transfers[i].rx_buf) test.transfers[i].rx_buf += rx_off; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 99/348 hwmon: (max31790) Report correct current pwm duty cycles
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 897f6339893b741a5d68ae8e2475df65946041c2 ]
The MAX31790 has two sets of registers for pwm duty cycles, one to request a duty cycle and one to read the actual current duty cycle. Both do not have to be the same.
When reporting the pwm duty cycle to the user, the actual pwm duty cycle from pwm duty cycle registers needs to be reported. When setting it, the pwm target duty cycle needs to be written. Since we don't know the actual pwm duty cycle after a target pwm duty cycle has been written, set the valid flag to false to indicate that actual pwm duty cycle should be read from the chip instead of using cached values.
--- Documentation/hwmon/max31790.rst | 3 ++- drivers/hwmon/max31790.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
Documentation/hwmon/max31790.rst +2 -1
@@ -39,5 +39,6 @@ fan[1-12]_input RO fan tachometer speed in RPM fan[1-12]_fault RO fan experienced fault fan[1-6]_target RW desired fan speed in RPM pwm[1-6]_enable RW regulator mode, 0=disabled, 1=manual mode, 2=rpm mode -pwm[1-6] RW fan target duty cycle (0-255) +pwm[1-6] RW read: current pwm duty cycle, + write: target pwm duty cycle (0-255) ================== === =======================================================
drivers/hwmon/max31790.c +3 -3
@@ -104,7 +104,7 @@ static struct max31790_data *max31790_update_device(struct device *dev) data->tach[NR_CHANNEL + i] = rv; }else { rv =i2c_smbus_read_word_swapped (client, -MAX31790_REG_PWMOUT (i)); +MAX31790_REG_PWM_DUTY_CYCLE (i));if (rv <0 ) goto abort; data->pwm[i] = rv;
@@ -299,10 +299,10 @@ static int max31790_write_pwm(struct device *dev, u32 attr, int channel, err = -EINVAL ;break ; } - data->pwm[channel] = val <<8 ; + data->valid = false; err =i2c_smbus_write_word_swapped (client,MAX31790_REG_PWMOUT (channel), - data->pwm[channel]); + val <<8 );break ;case hwmon_pwm_enable: fan_config = data->fan_config[channel];
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 100/348 hwmon: (max31790) Fix pwmX_enable attributes
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 148c847c9e5a54b99850617bf9c143af9a344f92 ]
pwmX_enable supports three possible values:
0: Fan control disabled. Duty cycle is fixed to 0% 1: Fan control enabled, pwm mode. Duty cycle is determined by
values written into Target Duty Cycle registers.
2: Fan control enabled, rpm mode
Duty cycle is adjusted such that fan speed matches the values in Target Count registers
The current code does not do this; instead, it mixes pwm control configuration with fan speed monitoring configuration. Worse, it reports that pwm control would be disabled (pwmX_enable==0) when it is in fact enabled in pwm mode. Part of the problem may be that the chip sets the "TACH input enable" bit on its own whenever the mode bit is set to RPM mode, but that doesn't mean that "TACH input enable" accurately reflects the pwm mode.
Fix it up and only handle pwm control with the pwmX_enable attributes. In the documentation, clarify that disabling pwm control (pwmX_enable=0) sets the pwm duty cycle to 0%. In the code, explain why TACH_INPUT_EN is set together with RPM_MODE.
While at it, only update the configuration register if the configuration has changed, and only update the cached configuration if updating the chip configuration was successful.
--- Documentation/hwmon/max31790.rst | 2 +- drivers/hwmon/max31790.c | 41 ++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 16 deletions(-)
Documentation/hwmon/max31790.rst +1 -1
@@ -38,7 +38,7 @@ Sysfs entries fan[1-12]_input RO fan tachometer speed in RPM fan[1-12]_fault RO fan experienced fault fan[1-6]_target RW desired fan speed in RPM -pwm[1-6]_enable RW regulator mode, 0=disabled, 1=manual mode, 2=rpm mode +pwm[1-6]_enable RW regulator mode, 0=disabled (duty cycle=0%), 1=manual mode, 2=rpm mode pwm[1-6] RW read: current pwm duty cycle, write: target pwm duty cycle (0-255) ================== === =======================================================
drivers/hwmon/max31790.c +26 -15
67 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 102/348 KVM: PPC: Book3S HV: Fix TLB management on SMT8 POWER9 and POWER10 processors
In reply to Greg Kroah-HartmanFrom: Suraj Jitindar Singh <[email protected]>
[ Upstream commit 77bbbc0cf84834ed130838f7ac1988567f4d0288 ]
The POWER9 vCPU TLB management code assumes all threads in a core share a TLB, and that TLBIEL execued by one thread will invalidate TLBs for all threads. This is not the case for SMT8 capable POWER9 and POWER10 (big core) processors, where the TLB is split between groups of threads. This results in TLB multi-hits, random data corruption, etc.
Fix this by introducing cpu_first_tlb_thread_sibling etc., to determine which siblings share TLBs, and use that in the guest TLB flushing code.
[[email protected]: add changelog and comment]
--- arch/powerpc/include/asm/cputhreads.h | 30 +++++++++++++++++++++++++++ arch/powerpc/kvm/book3s_hv.c | 13 ++++++------ arch/powerpc/kvm/book3s_hv_builtin.c | 2 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +- 4 files changed, 39 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/cputhreads.h +30 -0
@@ -99,6 +99,36 @@ static inline int cpu_last_thread_sibling(int cpu)return cpu | (threads_per_core -1 ); } +/* +* tlb_thread_siblings are siblings which share a TLB. This is not +* architected, is not something a hypervisor could emulate and a future +* CPU may change behaviour even in compat mode, so this should only be +* used on PowerNV, and only with care. +*/ +static inline int cpu_first_tlb_thread_sibling (int cpu) +{ +if (cpu_has_feature (CPU_FTR_ARCH_300 ) && (threads_per_core ==8 )) +return cpu & ~0x6 ;/* Big Core */ +else +return cpu_first_thread_sibling (cpu); +} + +static inline int cpu_last_tlb_thread_sibling (int cpu) +{ +if (cpu_has_feature (CPU_FTR_ARCH_300 ) && (threads_per_core ==8 )) +return cpu |0x6 ;/* Big Core */ +else +return cpu_last_thread_sibling (cpu); +} + +static inline int cpu_tlb_thread_sibling_step (void ) +{ +if (cpu_has_feature (CPU_FTR_ARCH_300 ) && (threads_per_core ==8 )) +return 2 ;/* Big Core */ +else +return 1 ; +} +static inline u32 get_tensr (void ) {#ifdef CONFIG_BOOKE
arch/powerpc/kvm/book3s_hv.c +7 -6
@@ -2536,7 +2536,7 @@ static void radix_flush_cpu(struct kvm *kvm, int cpu, struct kvm_vcpu *vcpu)cpumask_t *cpu_in_guest;int i; - cpu =cpu_first_thread_sibling (cpu); + cpu =cpu_first_tlb_thread_sibling (cpu);if (nested) {cpumask_set_cpu (cpu, &nested->need_tlb_flush); cpu_in_guest = &nested->cpu_in_guest;
@@ -2550,9 +2550,10 @@ static void radix_flush_cpu(struct kvm *kvm, int cpu, struct kvm_vcpu *vcpu)* the other side is the first smp_mb() in kvmppc_run_core(). */ smp_mb (); -for (i =0 ; i < threads_per_core; ++i) -if (cpumask_test_cpu (cpu + i, cpu_in_guest)) -smp_call_function_single (cpu + i, do_nothing,NULL ,1 ); +for (i = cpu; i <=cpu_last_tlb_thread_sibling (cpu); + i +=cpu_tlb_thread_sibling_step ()) +if (cpumask_test_cpu (i, cpu_in_guest)) +smp_call_function_single (i, do_nothing,NULL ,1 ); }static void kvmppc_prepare_radix_vcpu (struct kvm_vcpu *vcpu,int pcpu)
@@ -2583,8 +2584,8 @@ static void kvmppc_prepare_radix_vcpu(struct kvm_vcpu *vcpu, int pcpu)*/ if (prev_cpu != pcpu) {if (prev_cpu >=0 && -cpu_first_thread_sibling (prev_cpu) != -cpu_first_thread_sibling (pcpu)) +cpu_first_tlb_thread_sibling (prev_cpu) != +cpu_first_tlb_thread_sibling (pcpu))radix_flush_cpu (kvm, prev_cpu, vcpu);if (nested) nested->prev_cpu[vcpu->arch.nested_vcpu_id] = pcpu;
arch/powerpc/kvm/book3s_hv_builtin.c +1 -1
@@ -847,7 +847,7 @@ void kvmppc_check_need_tlb_flush(struct kvm *kvm, int pcpu,* Thus we make all 4 threads use the same bit. */ if (cpu_has_feature (CPU_FTR_ARCH_300 )) - pcpu =cpu_first_thread_sibling (pcpu); + pcpu =cpu_first_tlb_thread_sibling (pcpu);if (nested) need_tlb_flush = &nested->need_tlb_flush;
arch/powerpc/kvm/book3s_hv_rm_mmu.c +1 -1
@@ -67,7 +67,7 @@ static int global_invalidates(struct kvm *kvm)* so use the bit for the first thread to represent the core. */ if (cpu_has_feature (CPU_FTR_ARCH_300 )) - cpu =cpu_first_thread_sibling (cpu); + cpu =cpu_first_tlb_thread_sibling (cpu);cpumask_clear_cpu (cpu, &kvm->arch.need_tlb_flush); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 101/348 drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()
In reply to Greg Kroah-HartmanFrom: Jing Xiangfeng <[email protected]>
[ Upstream commit d96b1b8c9f79b6bb234a31c80972a6f422079376 ]
ddr_perf_probe() misses to call ida_simple_remove() in an error path. Jump to cpuhp_state_err to fix it.
--- drivers/perf/fsl_imx8_ddr_perf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/perf/fsl_imx8_ddr_perf.c +4 -2
@@ -562,8 +562,10 @@ static int ddr_perf_probe(struct platform_device *pdev) name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,DDR_PERF_DEV_NAME "%d" , num); -if (!name) -return -ENOMEM ; +if (!name) { + ret = -ENOMEM ; + goto cpuhp_state_err; + } pmu->devtype_data =of_device_get_match_data (&pdev->dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 104/348 btrfs: abort transaction if we fail to update the delayed inode
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 04587ad9bef6ce9d510325b4ba9852b6129eebdb ]
If we fail to update the delayed inode we need to abort the transaction, because we could leave an inode with the improper counts or some other such corruption behind.
--- fs/btrfs/delayed-inode.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/btrfs/delayed-inode.c +8 -0
@@ -1074,6 +1074,14 @@ err_out:btrfs_delayed_inode_release_metadata (fs_info, node, (ret <0 ));btrfs_release_delayed_inode (node); +/* +* If we fail to update the delayed inode we need to abort the +* transaction, because we could leave the inode with the improper +* counts behind. +*/ +if (ret && ret != -ENOENT ) +btrfs_abort_transaction (trans, ret); +return ret; search:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 103/348 btrfs: fix error handling in __btrfs_update_delayed_inode
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit bb385bedded3ccbd794559600de4a09448810f4a ]
If we get an error while looking up the inode item we'll simply bail without cleaning up the delayed node. This results in this style of warning happening on commit:
WARNING: CPU: 0 PID: 76403 at fs/btrfs/delayed-inode.c:1365 btrfs_assert_delayed_root_empty+0x5b/0x90 CPU: 0 PID: 76403 Comm: fsstress Tainted: G W 5.13.0-rc1+ #373 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-2.fc32 04/01/2014 RIP: 0010:btrfs_assert_delayed_root_empty+0x5b/0x90 RSP: 0018:ffffb8bb815a7e50 EFLAGS: 00010286 RAX: 0000000000000000 RBX: ffff95d6d07e1888 RCX: ffff95d6c0fa3000 RDX: 0000000000000002 RSI: 000000000029e91c RDI: ffff95d6c0fc8060 RBP: ffff95d6c0fc8060 R08: 00008d6d701a2c1d R09: 0000000000000000 R10: ffff95d6d1760ea0 R11: 0000000000000001 R12: ffff95d6c15a4d00 R13: ffff95d6c0fa3000 R14: 0000000000000000 R15: ffffb8bb815a7e90 FS: 00007f490e8dbb80(0000) GS:ffff95d73bc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6e75555cb0 CR3: 00000001101ce001 CR4: 0000000000370ef0 Call Trace: btrfs_commit_transaction+0x43c/0xb00 ? finish_wait+0x80/0x80 ? vfs_fsync_range+0x90/0x90 iterate_supers+0x8c/0x100 ksys_sync+0x50/0x90 __do_sys_sync+0xa/0x10 do_syscall_64+0x3d/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae
Because the iref isn't dropped and this leaves an elevated node->count, so any release just re-queues it onto the delayed inodes list. Fix this by going to the out label to handle the proper cleanup of the delayed node.
--- fs/btrfs/delayed-inode.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/btrfs/delayed-inode.c +4 -6
@@ -1033,12 +1033,10 @@ static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans, nofs_flag =memalloc_nofs_save (); ret =btrfs_lookup_inode (trans, root, path, &key, mod);memalloc_nofs_restore (nofs_flag); -if (ret >0 ) { -btrfs_release_path (path); -return -ENOENT ; - }else if (ret <0 ) { -return ret; - } +if (ret >0 ) + ret = -ENOENT ; +if (ret <0 ) + goto out; leaf = path->nodes[0 ]; inode_item = btrfs_item_ptr(leaf, path->slots[0],
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 105/348 btrfs: disable build on platforms having page size 256K
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit b05fbcc36be1f8597a1febef4892053a0b2f3f60 ]
With a config having PAGE_SIZE set to 256K, BTRFS build fails with the following message
include/linux/compiler_types.h:326:38: error: call to '__compiletime_assert_791' declared with attribute error:
BUILD_BUG_ON failed: (BTRFS_MAX_COMPRESSED % PAGE_SIZE) != 0
BTRFS_MAX_COMPRESSED being 128K, BTRFS cannot support platforms with 256K pages at the time being.
There are two platforms that can select 256K pages:
- hexagon
- powerpc
Disable BTRFS when 256K page size is selected. Supporting this would require changes to the subpage mode that's currently being developed. Given that 256K is many times larger than page sizes commonly used and for what the algorithms and structures have been tuned, it's out of scope and disabling build is a reasonable option.
--- fs/btrfs/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/Kconfig +2 -0
@@ -14,6 +14,8 @@ config BTRFS_FS select RAID6_PQ select XOR_BLOCKS select SRCU + depends on !PPC_256K_PAGES # powerpc + depends on !PAGE_SIZE_256KB # hexagon help Btrfs is a general purpose copy-on-write filesystem with extents,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 106/348 locking/lockdep: Fix the dep path printing for backwards BFS
In reply to Greg Kroah-HartmanFrom: Boqun Feng <[email protected]>
[ Upstream commit 69c7a5fb2482636f525f016c8333fdb9111ecb9d ]
We use the same code to print backwards lock dependency path as the forwards lock dependency path, and this could result into incorrect printing because for a backwards lock_list ->trace is not the call trace where the lock of ->class is acquired.
Fix this by introducing a separate function on printing the backwards dependency path. Also add a few comments about the printing while we are at it.
--- kernel/locking/lockdep.c | 108 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 2 deletions(-)
kernel/locking/lockdep.c +106 -2
@@ -1941,7 +1941,56 @@ static void print_lock_class_header(struct lock_class *class, int depth) }/* -* printk the shortest lock dependencies from @start to @end in reverse order: +* Dependency path printing: +* +* After BFS we get a lock dependency path (linked via ->parent of lock_list), +* printing out each lock in the dependency path will help on understanding how +* the deadlock could happen. Here are some details about dependency path +* printing: +* +* 1) A lock_list can be either forwards or backwards for a lock dependency, +* for a lock dependency A -> B, there are two lock_lists: +* +* a) lock_list in the ->locks_after list of A, whose ->class is B and +* ->links_to is A. In this case, we can say the lock_list is +* "A -> B" (forwards case). +* +* b) lock_list in the ->locks_before list of B, whose ->class is A +* and ->links_to is B. In this case, we can say the lock_list is +* "B <- A" (bacwards case). +* +* The ->trace of both a) and b) point to the call trace where B was +* acquired with A held. +* +* 2) A "helper" lock_list is introduced during BFS, this lock_list doesn't +* represent a certain lock dependency, it only provides an initial entry +* for BFS. For example, BFS may introduce a "helper" lock_list whose +* ->class is A, as a result BFS will search all dependencies starting with +* A, e.g. A -> B or A -> C. +* +* The notation of a forwards helper lock_list is like "-> A", which means +* we should search the forwards dependencies starting with "A", e.g A -> B +* or A -> C. +* +* The notation of a bacwards helper lock_list is like "<- B", which means +* we should search the backwards dependencies ending with "B", e.g. +* B <- A or B <- C. +*/ + +/* +* printk the shortest lock dependencies from @root to @leaf in reverse order. +* +* We have a lock dependency path as follow: +* +* @root @leaf +* | | +* V V +* ->parent ->parent +* | lock_list | <--------- | lock_list | ... | lock_list | <--------- | lock_list | +* | -> L1 | | L1 -> L2 | ... |Ln-2 -> Ln-1| | Ln-1 -> Ln| +* +* , so it's natural that we start from @leaf and print every ->class and +* ->trace until we reach the @root. */ static void __used print_shortest_lock_dependencies(struct lock_list *leaf,
@@ -1969,6 +2018,61 @@ print_shortest_lock_dependencies(struct lock_list *leaf, }while (entry && (depth >=0 )); } +/* +* printk the shortest lock dependencies from @leaf to @root. +* +* We have a lock dependency path (from a backwards search) as follow: +* +* @leaf @root +* | | +* V V +* ->parent ->parent +* | lock_list | ---------> | lock_list | ... | lock_list | ---------> | lock_list | +* | L2 <- L1 | | L3 <- L2 | ... | Ln <- Ln-1 | | <- Ln | +* +* , so when we iterate from @leaf to @root, we actually print the lock +* dependency path L1 -> L2 -> .. -> Ln in the non-reverse order. +* +* Another thing to notice here is that ->class of L2 <- L1 is L1, while the +* ->trace of L2 <- L1 is the call trace of L2, in fact we don't have the call +* trace of L1 in the dependency path, which is alright, because most of the +* time we can figure out where L1 is held from the call trace of L2. +*/ +static void __used +print_shortest_lock_dependencies_backwards (struct lock_list *leaf, +struct lock_list *root) +{ +struct lock_list *entry = leaf; +const struct lock_trace *trace =NULL ; +int depth; + +/*compute depth from generated tree by BFS*/ + depth =get_lock_depth (leaf); + +do { +print_lock_class_header (entry->class, depth); +if (trace) { +printk ("%*s ... acquired at:\n" , depth,"" ); +print_lock_trace (trace,2 ); +printk ("\n" ); + } + +/* +* Record the pointer to the trace for the next lock_list +* entry, see the comments for the function. +*/ + trace = entry->trace; + +if (depth ==0 && (entry != root)) { +printk ("lockdep:%s bad path found in chain graph\n" , __func__); +break ; + } + + entry =get_lock_parent (entry); + depth--; + }while (entry && (depth >=0 )); +} + static void print_irq_lock_scenario(struct lock_list *safe_entry, struct lock_list *unsafe_entry,
@@ -2086,7 +2190,7 @@ print_bad_irq_dependency(struct task_struct *curr, prev_root->trace =save_trace ();if (!prev_root->trace)return ; -print_shortest_lock_dependencies (backwards_entry, prev_root); +print_shortest_lock_dependencies_backwards (backwards_entry, prev_root);pr_warn ("\nthe dependencies between the lock to be acquired" );pr_warn (" and %s-irq-unsafe lock:\n" , irqclass);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 107/348 lockding/lockdep: Avoid to find wrong lock dep path in check_irq_usage()
In reply to Greg Kroah-HartmanFrom: Boqun Feng <[email protected]>
[ Upstream commit 7b1f8c6179769af6ffa055e1169610b51d71edd5 ]
In the step #3 of check_irq_usage(), we seach backwards to find a lock whose usage conflicts the usage of @target_entry1 on safe/unsafe. However, we should only keep the irq-unsafe usage of @target_entry1 into consideration, because it could be a case where a lock is hardirq-unsafe but soft-safe, and in check_irq_usage() we find it because its hardirq-unsafe could result into a hardirq-safe-unsafe deadlock, but currently since we don't filter out the other usage bits, so we may find a lock dependency path softirq-unsafe -> softirq-safe, which in fact doesn't cause a deadlock. And this may cause misleading lockdep splats.
Fix this by only keeping LOCKF_ENABLED_IRQ_ALL bits when we try the backwards search.
--- kernel/locking/lockdep.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
kernel/locking/lockdep.c +11 -1
@@ -2377,8 +2377,18 @@ static int check_irq_usage(struct task_struct *curr, struct held_lock *prev,* Step 3: we found a bad match! Now retrieve a lock from the backward * list whose usage mask matches the exclusive usage mask from the * lock found on the forward list. +* +* Note, we should only keep the LOCKF_ENABLED_IRQ_ALL bits, considering +* the follow case: +* +* When trying to add A -> B to the graph, we find that there is a +* hardirq-safe L, that L -> ... -> A, and another hardirq-unsafe M, +* that B -> ... -> M. However M is **softirq-safe**, if we use exact +* invert bits of M's usage_mask, we will find another lock N that is +* **softirq-unsafe** and N -> ... -> A, however N -> .. -> M will not +* cause a inversion deadlock. */ - backward_mask =original_mask (target_entry1->class->usage_mask); + backward_mask =original_mask (target_entry1->class->usage_mask &LOCKF_ENABLED_IRQ_ALL ); ret =find_usage_backwards (&this, backward_mask, &target_entry);if (ret <0 ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 73/348 spi: spi-topcliff-pch: Fix potential double free in pch_spi_process_messages()
In reply to Greg Kroah-HartmanFrom: Jay Fang <[email protected]>
[ Upstream commit 026a1dc1af52742c5897e64a3431445371a71871 ]
pch_spi_set_tx() frees data->pkt_tx_buff on failure of kzalloc() for data->pkt_rx_buff, but its caller, pch_spi_process_messages(), will free data->pkt_tx_buff again. Set data->pkt_tx_buff to NULL after kfree() to avoid double free.
--- drivers/spi/spi-topcliff-pch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-topcliff-pch.c +3 -1
@@ -576,8 +576,10 @@ static void pch_spi_set_tx(struct pch_spi_data *data, int *bpw) data->pkt_tx_buff =kzalloc (size,GFP_KERNEL );if (data->pkt_tx_buff !=NULL ) { data->pkt_rx_buff =kzalloc (size,GFP_KERNEL ); -if (!data->pkt_rx_buff) +if (!data->pkt_rx_buff) {kfree (data->pkt_tx_buff); + data->pkt_tx_buff =NULL ; + } }if (!data->pkt_rx_buff) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 109/348 regulator: mt6358: Fix vdram2 .vsel_mask
In reply to Greg Kroah-HartmanFrom: Hsin-Hsiung Wang <[email protected]>
[ Upstream commit 50c9462edcbf900f3d5097ca3ad60171346124de ]
The valid vsel value are 0 and 12, so the .vsel_mask should be 0xf.
--- drivers/regulator/mt6358-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/mt6358-regulator.c +1 -1
@@ -457,7 +457,7 @@ static struct mt6358_regulator_info mt6358_regulators[] = {MT6358_REG_FIXED ("ldo_vaud28" ,VAUD28 ,MT6358_LDO_VAUD28_CON0 ,0 ,2800000 ),MT6358_LDO ("ldo_vdram2" ,VDRAM2 , vdram2_voltages, vdram2_idx, -MT6358_LDO_VDRAM2_CON0 ,0 ,MT6358_LDO_VDRAM2_ELR0 ,0x10 ,0 ), +MT6358_LDO_VDRAM2_CON0 ,0 ,MT6358_LDO_VDRAM2_ELR0 ,0xf ,0 ),MT6358_LDO ("ldo_vsim1" ,VSIM1 , vsim_voltages, vsim_idx,MT6358_LDO_VSIM1_CON0 ,0 ,MT6358_VSIM1_ANA_CON0 ,0xf00 ,8 ), MT6358_LDO("ldo_vibr", VIBR, vibr_voltages, vibr_idx,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 108/348 KVM: s390: get rid of register asm usage
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit 4fa3b91bdee1b08348c82660668ca0ca34e271ad ]
Using register asm statements has been proven to be very error prone, especially when using code instrumentation where gcc may add function calls, which clobbers register contents in an unexpected way.
Therefore get rid of register asm statements in kvm code, even though there is currently nothing wrong with them. This way we know for sure that this bug class won't be introduced here.
--- arch/s390/kvm/kvm-s390.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
arch/s390/kvm/kvm-s390.c +9 -9
@@ -318,31 +318,31 @@ static void allow_cpu_feat(unsigned long nr)static inline int plo_test_bit (unsigned char nr) { - register unsigned long r0 asm("0") = (unsigned long) nr | 0x100; +unsigned long function = (unsigned long )nr |0x100 ;int cc; asmvolatile ( +" lgr 0,%[function]\n" /* Parameter registers are ignored for "test bit" */ " plo 0,0,0,0(0)\n" " ipm %0\n" " srl %0,28\n" :"=d" (cc) - :"d" (r0) - :"cc" ); + : [function]"d" (function) + :"cc" ,"0" );return cc ==0 ; } static __always_inline void __insn32_query(unsigned int opcode, u8 *query) { - register unsigned long r0 asm("0") = 0; /* query function */ - register unsigned long r1 asm("1") = (unsigned long) query; - asmvolatile ( -/* Parameter regs are ignored */ +" lghi 0,0\n" +" lgr 1,%[query]\n" +/* Parameter registers are ignored */ " .insn rrf,%[opc] << 16,2,4,6,0\n" : - :"d" (r0),"a" (r1), [opc]"i" (opcode) - :"cc" ,"memory" ); + : [query]"d" ((unsigned long )query), [opc]"i" (opcode) + :"cc" ,"memory" ,"0" ,"1" ); }#define INSN_SORTL 0xb938
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 110/348 regulator: da9052: Ensure enough delay time for .set_voltage_time_sel
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit a336dc8f683e5be794186b5643cd34cb28dd2c53 ]
Use DIV_ROUND_UP to prevent truncation by integer division issue. This ensures we return enough delay time.
Also fix returning negative value when new_sel < old_sel.
--- drivers/regulator/da9052-regulator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/regulator/da9052-regulator.c +2 -1
@@ -250,7 +250,8 @@ static int da9052_regulator_set_voltage_time_sel(struct regulator_dev *rdev,case DA9052_ID_BUCK3 :case DA9052_ID_LDO2 :case DA9052_ID_LDO3 : - ret = (new_sel - old_sel) * info->step_uV /6250 ; + ret =DIV_ROUND_UP (abs (new_sel - old_sel) * info->step_uV, +6250 );break ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 111/348 media: Fix Media Controller API config checks
In reply to Greg Kroah-HartmanFrom: Shuah Khan <[email protected]>
[ Upstream commit 50e7a31d30e8221632675abed3be306382324ca2 ]
Smatch static checker warns that "mdev" can be null:
sound/usb/media.c:287 snd_media_device_create()
warn: 'mdev' can also be NULL
If CONFIG_MEDIA_CONTROLLER is disabled, this file should not be included in the build.
The below conditions in the sound/usb/Makefile are in place to ensure that media.c isn't included in the build.
sound/usb/Makefile:
snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER &&
(MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO)
The following config check in include/media/media-dev-allocator.h is in place to enable the API only when CONFIG_MEDIA_CONTROLLER and CONFIG_USB are enabled.
#if defined(CONFIG_MEDIA_CONTROLLER) && defined(CONFIG_USB)
This check doesn't work as intended when CONFIG_USB=m. When CONFIG_USB=m, CONFIG_USB_MODULE is defined and CONFIG_USB is not. The above config check doesn't catch that CONFIG_USB is defined as a module and disables the API. This results in sound/usb enabling Media Controller specific ALSA driver code, while Media disables the Media Controller API.
Fix the problem requires two changes:
1. Change the check to use IS_ENABLED to detect when CONFIG_USB is enabled as a module or static. Since CONFIG_MEDIA_CONTROLLER is a bool, leave the check unchanged to be consistent with drivers/media/Makefile.
2. Change the drivers/media/mc/Makefile to include mc-dev-allocator.o in mc-objs when CONFIG_USB is enabled.
--- drivers/media/mc/Makefile | 2 +- include/media/media-dev-allocator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/mc/Makefile +1 -1
@@ -3,7 +3,7 @@ mc-objs := mc-device.o mc-devnode.o mc-entity.o \ mc-request.o -ifeq ($(CONFIG_USB),y) +ifneq ($(CONFIG_USB),) mc-objs += mc-dev-allocator.o endif
include/media/media-dev-allocator.h +1 -1
@@ -19,7 +19,7 @@struct usb_device ; -#if defined(CONFIG_MEDIA_CONTROLLER ) && defined(CONFIG_USB ) +#if defined(CONFIG_MEDIA_CONTROLLER ) &&IS_ENABLED (CONFIG_USB )/** * media_device_usb_allocate() - Allocate and return struct &media device *
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 112/348 HID: do not use down_interruptible() when unbinding devices
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit f2145f8dc566c4f3b5a8deb58dcd12bed4e20194 ]
Action of unbinding driver from a device is not cancellable and should not fail, and driver core does not pay attention to the result of "remove" method, therefore using down_interruptible() in hid_device_remove() does not make sense.
--- drivers/hid/hid-core.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/hid/hid-core.c +3 -7
@@ -2299,12 +2299,8 @@ static int hid_device_remove(struct device *dev) {struct hid_device *hdev =to_hid_device (dev);struct hid_driver *hdrv; -int ret =0 ; -if (down_interruptible (&hdev->driver_input_lock)) { - ret = -EINTR ; - goto end; - } +down (&hdev->driver_input_lock); hdev->io_started = false; hdrv = hdev->driver;
@@ -2319,8 +2315,8 @@ static int hid_device_remove(struct device *dev)if (!hdev->io_started)up (&hdev->driver_input_lock); -end: -return ret; + +return 0 ; } static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 113/348 EDAC/ti: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Bixuan Cui <[email protected]>
[ Upstream commit 0a37f32ba5272b2d4ec8c8d0f6b212b81b578f7e ]
The module misses MODULE_DEVICE_TABLE() for of_device_id tables and thus never autoloads on ID matches.
Add the missing declaration.
--- drivers/edac/ti_edac.c | 1 + 1 file changed, 1 insertion(+)
drivers/edac/ti_edac.c +1 -0
@@ -197,6 +197,7 @@ static const struct of_device_id ti_edac_of_match[] = { { .compatible = "ti,emif-dra7xx", .data = (void *)EMIF_TYPE_DRA7 }, {}, }; +MODULE_DEVICE_TABLE (of, ti_edac_of_match);static int _emif_get_id (struct device_node *node) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 114/348 ACPI: processor idle: Fix up C-state latency if not ordered
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 65ea8f2c6e230bdf71fed0137cf9e9d1b307db32 ]
Generally, the C-state latency is provided by the _CST method or FADT, but some OEM platforms using AMD Picasso, Renoir, Van Gogh, and Cezanne set the C2 latency greater than C3's which causes the C2 state to be skipped.
That will block the core entering PC6, which prevents S0ix working properly on Linux systems.
In other operating systems, the latency values are not validated and this does not cause problems by skipping states.
To avoid this issue on Linux, detect when latencies are not an arithmetic progression and sort them.
--- drivers/acpi/processor_idle.c | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/acpi/processor_idle.c +40 -0
@@ -16,6 +16,7 @@#include <linux/acpi.h> #include <linux/dmi.h> #include <linux/sched.h> /* need_resched() */ +#include <linux/sort.h> #include <linux/tick.h> #include <linux/cpuidle.h> #include <linux/cpu.h>
@@ -540,10 +541,37 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,return ; } +static int acpi_cst_latency_cmp (const void *a,const void *b) +{ +const struct acpi_processor_cx *x = a, *y = b; + +if (!(x->valid && y->valid)) +return 0 ; +if (x->latency > y->latency) +return 1 ; +if (x->latency < y->latency) +return -1 ; +return 0 ; +} +static void acpi_cst_latency_swap (void *a,void *b,int n) +{ +struct acpi_processor_cx *x = a, *y = b; +u32 tmp; + +if (!(x->valid && y->valid)) +return ; + tmp = x->latency; + x->latency = y->latency; + y->latency = tmp; +} +static int acpi_processor_power_verify (struct acpi_processor *pr) {unsigned int i;unsigned int working =0 ; +unsigned int last_latency =0 ; +unsigned int last_type =0 ; +bool buggy_latency = false; pr->power.timer_broadcast_on_state =INT_MAX ;
@@ -567,12 +595,24 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) }if (!cx->valid)continue ; +if (cx->type >= last_type && cx->latency < last_latency) + buggy_latency = true; + last_latency = cx->latency; + last_type = cx->type;lapic_timer_check_state (i, pr, cx);tsc_check_state (cx->type); working++; } +if (buggy_latency) { +pr_notice ("FW issue: working around C-state latencies out of order\n" ); +sort (&pr->power.states[1 ], max_cstate, +sizeof (struct acpi_processor_cx ), + acpi_cst_latency_cmp, + acpi_cst_latency_swap); + } +lapic_timer_propagate_broadcast (pr);return (working);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 74/348 spi: omap-100k: Fix the length judgment problem
In reply to Greg Kroah-HartmanFrom: Tian Tao <[email protected]>
[ Upstream commit e7a1a3abea373e41ba7dfe0fbc93cb79b6a3a529 ]
word_len should be checked in the omap1_spi100k_setup_transfer function to see if it exceeds 32.
--- drivers/spi/spi-omap-100k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-omap-100k.c +1 -1
@@ -242,7 +242,7 @@ static int omap1_spi100k_setup_transfer(struct spi_device *spi,else word_len = spi->bits_per_word; -if (spi->bits_per_word >32 ) +if (word_len >32 )return -EINVAL ; cs->word_len = word_len;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 77/348 crypto: nx - add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Bixuan Cui <[email protected]>
[ Upstream commit 06676aa1f455c74e3ad1624cea3acb9ed2ef71ae ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/crypto/nx/nx-842-pseries.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/nx/nx-842-pseries.c +1 -0
@@ -1071,6 +1071,7 @@ static const struct vio_device_id nx842_vio_driver_ids[] = { {"ibm,compression-v1", "ibm,compression"}, {"", ""}, }; +MODULE_DEVICE_TABLE (vio, nx842_vio_driver_ids);static struct vio_driver nx842_vio_driver = { .name = KBUILD_MODNAME,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 75/348 regulator: uniphier: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit d019f38a1af3c6015cde6a47951a3ec43beeed80 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/regulator/uniphier-regulator.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/uniphier-regulator.c +1 -0
@@ -203,6 +203,7 @@ static const struct of_device_id uniphier_regulator_match[] = { }, { /* Sentinel */ }, }; +MODULE_DEVICE_TABLE (of, uniphier_regulator_match);static struct platform_driver uniphier_regulator_driver = { .probe = uniphier_regulator_probe,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 76/348 hwrng: exynos - Fix runtime PM imbalance on error
In reply to Greg Kroah-HartmanFrom: Łukasz Stelmach <[email protected]>
[ Upstream commit 0cdbabf8bb7a6147f5adf37dbc251e92a1bbc2c7 ]
pm_runtime_resume_and_get() wraps around pm_runtime_get_sync() and decrements the runtime PM usage counter in case the latter function fails and keeps the counter balanced.
--- drivers/char/hw_random/exynos-trng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/hw_random/exynos-trng.c +2 -2
@@ -134,7 +134,7 @@ static int exynos_trng_probe(struct platform_device *pdev)return PTR_ERR (trng->mem);pm_runtime_enable (&pdev->dev); - ret =pm_runtime_get_sync (&pdev->dev); + ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) {dev_err (&pdev->dev,"Could not get runtime PM.\n" ); goto err_pm_get;
@@ -167,7 +167,7 @@ err_register:clk_disable_unprepare (trng->clk); err_clock: -pm_runtime_put_sync (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); err_pm_get:pm_runtime_disable (&pdev->dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 78/348 media: sti: fix obj-$(config) targets
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 56c1f0876293888f686e31278d183d4af2cac3c3 ]
The right thing to do is to add a new object to the building system when a certain config option is selected, and *not* override them.
So, fix obj-$(config) logic at sti makefiles, using "+=", instead of ":=".
--- drivers/media/platform/sti/bdisp/Makefile | 2 +- drivers/media/platform/sti/delta/Makefile | 2 +- drivers/media/platform/sti/hva/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/sti/bdisp/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_STI_BDISP) := bdisp.o +obj-$(CONFIG_VIDEO_STI_BDISP) += bdisp.o bdisp-objs := bdisp-v4l2.o bdisp-hw.o bdisp-debug.o
drivers/media/platform/sti/delta/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_STI_DELTA_DRIVER) := st-delta.o +obj-$(CONFIG_VIDEO_STI_DELTA_DRIVER) += st-delta.o st-delta-y := delta-v4l2.o delta-mem.o delta-ipc.o delta-debug.o # MJPEG support
drivers/media/platform/sti/hva/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_STI_HVA) := st-hva.o +obj-$(CONFIG_VIDEO_STI_HVA) += st-hva.o st-hva-y := hva-v4l2.o hva-hw.o hva-mem.o hva-h264.o st-hva-$(CONFIG_VIDEO_STI_HVA_DEBUGFS) += hva-debugfs.o
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 116/348 lib: vsprintf: Fix handling of number field widths in vsscanf
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit 900fdc4573766dd43b847b4f54bd4a1ee2bc7360 ]
The existing code attempted to handle numbers by doing a strto[u]l(), ignoring the field width, and then repeatedly dividing to extract the field out of the full converted value. If the string contains a run of valid digits longer than will fit in a long or long long, this would overflow and no amount of dividing can recover the correct value.
This patch fixes vsscanf() to obey number field widths when parsing the number.
A new _parse_integer_limit() is added that takes a limit for the number of characters to parse. The number field conversion in vsscanf is changed to use this new function.
If a number starts with a radix prefix, the field width must be long enough for at last one digit after the prefix. If not, it will be handled like this:
sscanf("0x4", "%1i", &i): i=0, scanning continues with the 'x' sscanf("0x4", "%2i", &i): i=0, scanning continues with the '4'
This is consistent with the observed behaviour of userland sscanf.
Note that this patch does NOT fix the problem of a single field value overflowing the target type. So for example:
sscanf("123456789abcdef", "%x", &i);Will not produce the correct result because the value obviously overflows INT_MAX. But sscanf will report a successful conversion.
Note that where a very large number is used to mean "unlimited", the value INT_MAX is used for consistency with the behaviour of vsnprintf().
--- lib/kstrtox.c | 13 ++++++-- lib/kstrtox.h | 2 ++ lib/vsprintf.c | 82 +++++++++++++++++++++++++++++--------------------- 3 files changed, 60 insertions(+), 37 deletions(-)
lib/kstrtox.c +10 -3
@@ -39,20 +39,22 @@ const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)/* * Convert non-negative integer string representation in explicitly given radix -* to an integer. +* to an integer. A maximum of max_chars characters will be converted. +* * Return number of characters consumed maybe or-ed with overflow bit. * If overflow occurs, result integer (incorrect) is still returned. * * Don't you dare use this function. */ -unsigned int _parse_integer (const char *s,unsigned int base,unsigned long long *p) +unsigned int _parse_integer_limit (const char *s,unsigned int base,unsigned long long *p, +size_t max_chars) {unsigned long long res;unsigned int rv; res =0 ; rv =0 ; -while (1 ) { +while (max_chars--) {unsigned int c = *s;unsigned int lc = c |0x20 ;/* don't tolower() this line */ unsigned int val;
@@ -82,6 +84,11 @@ unsigned int _parse_integer(const char *s, unsigned int base, unsigned long longreturn rv; } +unsigned int _parse_integer (const char *s,unsigned int base,unsigned long long *p) +{ +return _parse_integer_limit (s, base, p,INT_MAX ); +} +static int _kstrtoull (const char *s,unsigned int base,unsigned long long *res) {unsigned long long _res;
lib/kstrtox.h +2 -0
@@ -4,6 +4,8 @@#define KSTRTOX_OVERFLOW (1U << 31)const char *_parse_integer_fixup_radix (const char *s,unsigned int *base); +unsigned int _parse_integer_limit (const char *s,unsigned int base,unsigned long long *res, +size_t max_chars);unsigned int _parse_integer (const char *s,unsigned int base,unsigned long long *res);#endif
lib/vsprintf.c +48 -34
113 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 69/348 media: s5p-jpeg: fix pm_runtime_get_sync() usage count
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 10343de268d10cf07b092b8b525e12ad558ead77 ]
The pm_runtime_get_sync() internally increments thedev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.
As a plus, pm_runtime_resume_and_get() doesn't return positive numbers, so the return code validation can be removed.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +1 -4
@@ -2579,11 +2579,8 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)static int s5p_jpeg_start_streaming (struct vb2_queue *q,unsigned int count) {struct s5p_jpeg_ctx *ctx =vb2_get_drv_priv (q); -int ret; - - ret =pm_runtime_get_sync (ctx->jpeg->dev); -return ret >0 ?0 : ret; +return pm_runtime_resume_and_get (ctx->jpeg->dev); }static void s5p_jpeg_stop_streaming (struct vb2_queue *q)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 126/348 platform/x86: toshiba_acpi: Fix missing error code in toshiba_acpi_setup_keyboard()
In reply to Greg Kroah-HartmanFrom: Jiapeng Chong <[email protected]>
[ Upstream commit 28e367127718a9cb85d615a71e152f7acee41bfc ]
The error code is missing in this code scenario, add the error code '-EINVAL' to the return value 'error'.
Eliminate the follow smatch warning:
drivers/platform/x86/toshiba_acpi.c:2834 toshiba_acpi_setup_keyboard()
warn: missing error code 'error'.
--- drivers/platform/x86/toshiba_acpi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/toshiba_acpi.c +1 -0
@@ -2841,6 +2841,7 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)if (!dev->info_supported && !dev->system_event_supported) {pr_warn ("No hotkey query interface found\n" ); + error = -EINVAL ; goto err_remove_filter; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 128/348 EDAC/Intel: Do not load EDAC driver when running as a guest
In reply to Greg Kroah-HartmanFrom: Luck, Tony <[email protected]>
[ Upstream commit f0a029fff4a50eb01648810a77ba1873e829fdd4 ]
There's little to no point in loading an EDAC driver running in a guest:
1) The CPU model reported by CPUID may not represent actual h/w
2) The hypervisor likely does not pass in access to memory controller devices
3) Hypervisors generally do not pass corrected error details to guests
Add a check in each of the Intel EDAC drivers for X86_FEATURE_HYPERVISOR and simply return -ENODEV in the init routine.
--- drivers/edac/i10nm_base.c | 3 +++ drivers/edac/pnd2_edac.c | 3 +++ drivers/edac/sb_edac.c | 3 +++ drivers/edac/skx_base.c | 3 +++ 4 files changed, 12 insertions(+)
drivers/edac/i10nm_base.c +3 -0
@@ -249,6 +249,9 @@ static int __init i10nm_init(void)if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ; +if (cpu_feature_enabled (X86_FEATURE_HYPERVISOR )) +return -ENODEV ; + id =x86_match_cpu (i10nm_cpuids);if (!id)return -ENODEV ;
drivers/edac/pnd2_edac.c +3 -0
@@ -1555,6 +1555,9 @@ static int __init pnd2_init(void)if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ; +if (cpu_feature_enabled (X86_FEATURE_HYPERVISOR )) +return -ENODEV ; + id =x86_match_cpu (pnd2_cpuids);if (!id)return -ENODEV ;
drivers/edac/sb_edac.c +3 -0
@@ -3512,6 +3512,9 @@ static int __init sbridge_init(void)if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ; +if (cpu_feature_enabled (X86_FEATURE_HYPERVISOR )) +return -ENODEV ; + id =x86_match_cpu (sbridge_cpuids);if (!id)return -ENODEV ;
drivers/edac/skx_base.c +3 -0
@@ -605,6 +605,9 @@ static int __init skx_init(void)if (owner &&strncmp (owner,EDAC_MOD_STR ,sizeof (EDAC_MOD_STR )))return -EBUSY ; +if (cpu_feature_enabled (X86_FEATURE_HYPERVISOR )) +return -ENODEV ; + id =x86_match_cpu (skx_cpuids);if (!id)return -ENODEV ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 129/348 PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv()
In reply to Greg Kroah-HartmanFrom: Haiyang Zhang <[email protected]>
[ Upstream commit 7d815f4afa87f2032b650ae1bba7534b550a6b8b ]
Add check for hv_is_hyperv_initialized() at the top of init_hv_pci_drv(), so if the pci-hyperv driver is force-loaded on non Hyper-V platforms, the init_hv_pci_drv() will exit immediately, without any side effects, like assignments to hvpci_block_ops, etc.
--- drivers/pci/controller/pci-hyperv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/controller/pci-hyperv.c +3 -0
@@ -3121,6 +3121,9 @@ static void __exit exit_hv_pci_drv(void)static int __init init_hv_pci_drv (void ) { +if (!hv_is_hyperv_initialized ()) +return -ENODEV ; +/* Set the invalid domain number's bit, so it will not be used */ set_bit (HVPCI_DOM_INVALID , hvpci_dom_map);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 132/348 HID: wacom: Correct base usage for capacitive ExpressKey status bits
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
[ Upstream commit 424d8237945c6c448c8b3f23885d464fb5685c97 ]
The capacitive status of ExpressKeys is reported with usages beginning at 0x940, not 0x950. Bring our driver into alignment with reality.
--- drivers/hid/wacom_wac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/wacom_wac.h +1 -1
@@ -122,7 +122,7 @@#define WACOM_HID_WD_TOUCHONOFF (WACOM_HID_UP_WACOMDIGITIZER | 0x0454)#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910) -#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950) +#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0940)#define WACOM_HID_WD_MODE_CHANGE (WACOM_HID_UP_WACOMDIGITIZER | 0x0980)#define WACOM_HID_WD_MUTE_DEVICE (WACOM_HID_UP_WACOMDIGITIZER | 0x0981)#define WACOM_HID_WD_CONTROLPANEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0982)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 130/348 clocksource: Retry clock read if long delays detected
In reply to Greg Kroah-HartmanFrom: Paul E. McKenney <[email protected]>
[ Upstream commit db3a34e17433de2390eb80d436970edcebd0ca3e ]
When the clocksource watchdog marks a clock as unstable, this might be due to that clock being unstable or it might be due to delays that happen to occur between the reads of the two clocks. Yes, interrupts are disabled across those two reads, but there are no shortage of things that can delay interrupts-disabled regions of code ranging from SMI handlers to vCPU preemption. It would be good to have some indication as to why the clock was marked unstable.
Therefore, re-read the watchdog clock on either side of the read from the clock under test. If the watchdog clock shows an excessive time delta between its pair of reads, the reads are retried.
The maximum number of retries is specified by a new kernel boot parameter clocksource.max_cswd_read_retries, which defaults to three, that is, up to four reads, one initial and up to three retries. If more than one retry was required, a message is printed on the console (the occasional single retry is expected behavior, especially in guest OSes). If the maximum number of retries is exceeded, the clock under test will be marked unstable. However, the probability of this happening due to various sorts of delays is quite small. In addition, the reason (clock-read delays) for the unstable marking will be apparent.
--- .../admin-guide/kernel-parameters.txt | 6 +++ kernel/time/clocksource.c | 53 ++++++++++++++++--- 2 files changed, 53 insertions(+), 6 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +6 -0
@@ -567,6 +567,12 @@ loops can be debugged more effectively on production systems. + clocksource.max_cswd_read_retries= [KNL] + Number of clocksource_watchdog() retries due to + external delays before the clock will be marked + unstable. Defaults to three retries, that is, + four attempts to read the clock under test. + clearcpuid=BITNUM[,BITNUM...] [X86] Disable CPUID feature X for the kernel. See arch/x86/include/asm/cpufeatures.h for the valid bit
kernel/time/clocksource.c +47 -6
75 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 131/348 ACPI: tables: Add custom DSDT file as makefile prerequisite
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit d1059c1b1146870c52f3dac12cb7b6cbf39ed27f ]
A custom DSDT file is mostly used during development or debugging, and in that case it is quite likely to want to rebuild the kernel after changing ONLY the content of the DSDT.
This patch adds the custom DSDT as a prerequisite to tables.o to ensure a rebuild if the DSDT file is updated. Make will merge the prerequisites from multiple rules for the same target.
--- drivers/acpi/Makefile | 5 +++++ 1 file changed, 5 insertions(+)
drivers/acpi/Makefile +5 -0
@@ -8,6 +8,11 @@ ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT # # ACPI Boot-Time Table Parsing # +ifeq ($(CONFIG_ACPI_CUSTOM_DSDT),y) +tables.o: $(src)/../../include/$(subst $\",,$(CONFIG_ACPI_CUSTOM_DSDT_FILE)) ; + +endif + obj-$(CONFIG_ACPI) += tables.o obj-$(CONFIG_X86) += blacklist.o
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 125/348 block: fix race between adding/removing rq qos and normal IO
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 2cafe29a8d03f02a3d16193bdaae2f3e82a423f9 ]
Yi reported several kernel panics on:
[16687.001777] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008 ... [16687.163549] pc : __rq_qos_track+0x38/0x60
or
[ 997.690455] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020 ... [ 997.850347] pc : __rq_qos_done+0x2c/0x50
Turns out it is caused by race between adding rq qos(wbt) and normal IO because rq_qos_add can be run when IO is being submitted, fix this issue by freezing queue before adding/deleting rq qos to queue.
rq_qos_exit() needn't to freeze queue because it is called after queue has been frozen.
iolatency calls rq_qos_add() during allocating queue, so freezing won't add delay because queue usage refcount works at atomic mode at that time.
iocost calls rq_qos_add() when writing cgroup attribute file, that is fine to freeze queue at that time since we usually freeze queue when storing to queue sysfs attribute, meantime iocost only exists on the root cgroup.
wbt_init calls it in blk_register_queue() and queue sysfs attribute store(queue_wb_lat_store() when write it 1st time in case of !BLK_WBT_MQ), the following patch will speedup the queue freezing in wbt_init.
--- block/blk-rq-qos.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
block/blk-rq-qos.h +24 -0
@@ -7,6 +7,7 @@#include <linux/blk_types.h> #include <linux/atomic.h> #include <linux/wait.h> +#include <linux/blk-mq.h> #include "blk-mq-debugfs.h"
@@ -99,8 +100,21 @@ static inline void rq_wait_init(struct rq_wait *rq_wait)static inline void rq_qos_add (struct request_queue *q,struct rq_qos *rqos) { +/* +* No IO can be in-flight when adding rqos, so freeze queue, which +* is fine since we only support rq_qos for blk-mq queue. +* +* Reuse ->queue_lock for protecting against other concurrent +* rq_qos adding/deleting +*/ +blk_mq_freeze_queue (q); + +spin_lock_irq (&q->queue_lock); rqos->next = q->rq_qos; q->rq_qos = rqos; +spin_unlock_irq (&q->queue_lock); + +blk_mq_unfreeze_queue (q);if (rqos->ops->debugfs_attrs)blk_mq_debugfs_register_rqos (rqos);
@@ -110,12 +124,22 @@ static inline void rq_qos_del(struct request_queue *q, struct rq_qos *rqos) {struct rq_qos **cur; +/* +* See comment in rq_qos_add() about freezing queue & using +* ->queue_lock. +*/ +blk_mq_freeze_queue (q); + +spin_lock_irq (&q->queue_lock);for (cur = &q->rq_qos; *cur; cur = &(*cur)->next) {if (*cur == rqos) { *cur = rqos->next;break ; } } +spin_unlock_irq (&q->queue_lock); + +blk_mq_unfreeze_queue (q);blk_mq_debugfs_unregister_rqos (rqos); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 127/348 nvmet-fc: do not check for invalid target port in nvmet_fc_handle_fcp_rqst()
In reply to Greg Kroah-HartmanFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 2a4a910aa4f0acc428dc8d10227c42e14ed21d10 ]
When parsing a request in nvmet_fc_handle_fcp_rqst() we should not check for invalid target ports; if we do the command is aborted from the fcp layer, causing the host to assume a transport error. Rather we should still forward this request to the nvmet layer, which will then correctly fail the command with an appropriate error status.
--- drivers/nvme/target/fc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/nvme/target/fc.c +2 -8
@@ -2151,13 +2151,6 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport,u32 xfrlen =be32_to_cpu (cmdiu->data_len);int ret; -/* -* if there is no nvmet mapping to the targetport there -* shouldn't be requests. just terminate them. -*/ -if (!tgtport->pe) - goto transport_error; -/* * Fused commands are currently not supported in the linux * implementation.
@@ -2185,7 +2178,8 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport, fod->req.cmd = &fod->cmdiubuf.sqe; fod->req.cqe = &fod->rspiubuf.cqe; - fod->req.port = tgtport->pe->port; +if (tgtport->pe) + fod->req.port = tgtport->pe->port;/* clear any response payload */ memset (&fod->rspiubuf,0 ,sizeof (fod->rspiubuf));
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 133/348 cifs: fix missing spinlock around update to ses->status
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
[ Upstream commit 0060a4f28a9ef45ae8163c0805e944a2b1546762 ]
In the other places where we update ses->status we protect the updates via GlobalMid_Lock. So to be consistent add the same locking around it in cifs_put_smb_ses where it was missing.
Addresses-Coverity: 1268904 ("Data race condition")
--- fs/cifs/cifsglob.h | 3 ++- fs/cifs/connect.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)
fs/cifs/cifsglob.h +2 -1
@@ -964,7 +964,7 @@ struct cifs_ses {struct mutex session_mutex;struct TCP_Server_Info *server;/* pointer to server info */ int ses_count;/* reference counter */ -enum statusEnum status; +enum statusEnum status;/* updates protected by GlobalMid_Lock */ unsigned overrideSecFlg;/* if non-zero override global sec flags */ char *serverOS;/* name of operating system underlying server */ char *serverNOS;/* name of network operating system of server */
@@ -1814,6 +1814,7 @@ require use of the stronger protocol */* list operations on pending_mid_q and oplockQ * updates to XID counters, multiplex id and SMB sequence numbers * list operations on global DnotifyReqList +* updates to ses->status * tcp_ses_lock protects: * list operations on tcp and SMB session lists * tcon->open_file_lock protects the list of open files hanging off the tcon
fs/cifs/connect.c +4 -1
@@ -3049,9 +3049,12 @@ void cifs_put_smb_ses(struct cifs_ses *ses)spin_unlock (&cifs_tcp_ses_lock);return ; } +spin_unlock (&cifs_tcp_ses_lock); + +spin_lock (&GlobalMid_Lock);if (ses->status == CifsGood) ses->status = CifsExiting; -spin_unlock (&cifs_tcp_ses_lock); +spin_unlock (&GlobalMid_Lock);cifs_free_ipc (ses);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 117/348 ACPI: EC: Make more Asus laptops use ECDT _GPE
In reply to Greg Kroah-HartmanFrom: Chris Chiu <[email protected]>
[ Upstream commit 6306f0431914beaf220634ad36c08234006571d5 ]
More ASUS laptops have the _GPE define in the DSDT table with a different value than the _GPE number in the ECDT.
This is causing media keys not working on ASUS X505BA/BP, X542BA/BP
Add model info to the quirks list.
--- drivers/acpi/ec.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/acpi/ec.c +16 -0
@@ -1826,6 +1826,22 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_PRODUCT_NAME, "GL702VMK"),}, NULL}, { + ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X505BA", { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X505BA"),}, NULL}, + { + ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X505BP", { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X505BP"),}, NULL}, + { + ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X542BA", { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X542BA"),}, NULL}, + { + ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X542BP", { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X542BP"),}, NULL}, + { ec_honor_ecdt_gpe, "ASUS X550VXK", { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_PRODUCT_NAME, "X550VXK"),}, NULL},
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 134/348 block: fix discard request merge
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 2705dfb2094777e405e065105e307074af8965c1 ]
ll_new_hw_segment() is reached only in case of single range discard merge, and we don't have max discard segment size limit actually, so it is wrong to run the following check:
if (req->nr_phys_segments + nr_phys_segs > blk_rq_get_max_segments(req))
it may be always false since req->nr_phys_segments is initialized as one, and bio's segment count is still 1, blk_rq_get_max_segments(reg) is 1 too.
Fix the issue by not doing the check and bypassing the calculation of discard request's nr_phys_segments.
Based on analysis from Wang Shanker.
--- block/blk-merge.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
block/blk-merge.c +6 -2
@@ -571,10 +571,14 @@ static inline unsigned int blk_rq_get_max_segments(struct request *rq)static inline int ll_new_hw_segment (struct request *req,struct bio *bio,unsigned int nr_phys_segs) { -if (req->nr_phys_segments + nr_phys_segs >blk_rq_get_max_segments (req)) +if (blk_integrity_merge_bio (req->q, req, bio) == false) goto no_merge; -if (blk_integrity_merge_bio (req->q, req, bio) == false) +/* discard request merge won't add new segment */ +if (req_op (req) ==REQ_OP_DISCARD ) +return 1 ; + +if (req->nr_phys_segments + nr_phys_segs >blk_rq_get_max_segments (req)) goto no_merge;/*
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 135/348 kthread_worker: fix return value when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
In reply to Greg Kroah-HartmanFrom: Petr Mladek <[email protected]>
[ Upstream commit d71ba1649fa3c464c51ec7163e4b817345bff2c7 ]
kthread_mod_delayed_work() might race with kthread_cancel_delayed_work_sync() or another kthread_mod_delayed_work() call. The function lets the other operation win when it sees work->canceling counter set. And it returns @false.
But it should return @true as it is done by the related workqueue API, see mod_delayed_work_on().
The reason is that the return value might be used for reference counting. It has to distinguish the case when the number of queued works has changed or stayed the same.
The change is safe. kthread_mod_delayed_work() return value is not checked anywhere at the moment.
--- kernel/kthread.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
kernel/kthread.c +12 -7
@@ -1083,14 +1083,14 @@ static bool __kthread_cancel_work(struct kthread_work *work)* modify @dwork's timer so that it expires after @delay. If @delay is zero, * @work is guaranteed to be queued immediately. * -* Return: %true if @dwork was pending and its timer was modified, -* %false otherwise. +* Return: %false if @dwork was idle and queued, %true otherwise. * * A special case is when the work is being canceled in parallel. * It might be caused either by the real kthread_cancel_delayed_work_sync() * or yet another kthread_mod_delayed_work() call. We let the other command -* win and return %false here. The caller is supposed to synchronize these -* operations a reasonable way. +* win and return %true here. The return value can be used for reference +* counting and the number of queued works stays the same. Anyway, the caller +* is supposed to synchronize these operations a reasonable way. * * This function is safe to call from any context including IRQ handler. * See __kthread_cancel_work() and kthread_delayed_work_timer_fn()
@@ -1102,13 +1102,15 @@ bool kthread_mod_delayed_work(struct kthread_worker *worker, {struct kthread_work *work = &dwork->work;unsigned long flags; -int ret = false; +int ret;raw_spin_lock_irqsave (&worker->lock, flags);/* Do not bother with canceling when never queued. */ -if (!work->worker) +if (!work->worker) { + ret = false; goto fast_queue; + }/* Work must not be used with >1 worker, see kthread_queue_work() */ WARN_ON_ONCE (work->worker != worker);
@@ -1126,8 +1128,11 @@ bool kthread_mod_delayed_work(struct kthread_worker *worker,* be used for reference counting. */ kthread_cancel_delayed_work_timer (work, &flags); -if (work->canceling) +if (work->canceling) { +/* The number of works in the queue does not change. */ + ret = true; goto out; + } ret =__kthread_cancel_work (work); fast_queue:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 143/348 media: I2C: change RST to "RSET" to fix multiple build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 8edcb5049ac29aa3c8acc5ef15dd4036543d747e ]
The use of an enum named 'RST' conflicts with a #define macro named 'RST' in arch/mips/include/asm/mach-rc32434/rb.h.
The MIPS use of RST was there first (AFAICT), so change the media/i2c/ uses of RST to be named 'RSET'.
'git grep -w RSET' does not report any naming conflicts with the new name.
This fixes multiple build errors:
arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token
15 | #define RST (1 << 15)
| ^
drivers/media/i2c/s5c73m3/s5c73m3.h:356:2: note: in expansion of macro 'RST'
356 | RST,
| ^~~../arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token
15 | #define RST (1 << 15)
| ^
../drivers/media/i2c/s5k6aa.c:180:2: note: in expansion of macro 'RST'
180 | RST,
| ^~~../arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token
15 | #define RST (1 << 15)
| ^
../drivers/media/i2c/s5k5baf.c:238:2: note: in expansion of macro 'RST'
238 | RST,
| ^~~and some others that I have trimmed.
--- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +++--- drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- drivers/media/i2c/s5k4ecgx.c | 10 +++++----- drivers/media/i2c/s5k5baf.c | 6 +++--- drivers/media/i2c/s5k6aa.c | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-)
drivers/media/i2c/s5c73m3/s5c73m3-core.c +3 -3
@@ -1386,7 +1386,7 @@ static int __s5c73m3_power_on(struct s5c73m3 *state)s5c73m3_gpio_deassert (state,STBY );usleep_range (100 ,200 ); -s5c73m3_gpio_deassert (state,RST ); +s5c73m3_gpio_deassert (state,RSET );usleep_range (50 ,100 );return 0 ;
@@ -1401,7 +1401,7 @@ static int __s5c73m3_power_off(struct s5c73m3 *state) {int i, ret; -if (s5c73m3_gpio_assert (state,RST )) +if (s5c73m3_gpio_assert (state,RSET ))usleep_range (10 ,50 );if (s5c73m3_gpio_assert (state,STBY ))
@@ -1606,7 +1606,7 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state) state->mclk_frequency = pdata->mclk_frequency; state->gpio[STBY ] = pdata->gpio_stby; - state->gpio[RST ] = pdata->gpio_reset; + state->gpio[RSET ] = pdata->gpio_reset;return 0 ; }
drivers/media/i2c/s5c73m3/s5c73m3.h +1 -1
@@ -353,7 +353,7 @@ struct s5c73m3_ctrls {enum s5c73m3_gpio_id {STBY , -RST , +RSET ,GPIO_NUM , };
drivers/media/i2c/s5k4ecgx.c +5 -5
@@ -173,7 +173,7 @@ static const char * const s5k4ecgx_supply_names[] = {enum s5k4ecgx_gpio_id {STBY , -RST , +RSET ,GPIO_NUM , };
@@ -476,7 +476,7 @@ static int __s5k4ecgx_power_on(struct s5k4ecgx *priv)if (s5k4ecgx_gpio_set_value (priv,STBY , priv->gpio[STBY ].level))usleep_range (30 ,50 ); -if (s5k4ecgx_gpio_set_value (priv,RST , priv->gpio[RST ].level)) +if (s5k4ecgx_gpio_set_value (priv,RSET , priv->gpio[RSET ].level))usleep_range (30 ,50 );return 0 ;
@@ -484,7 +484,7 @@ static int __s5k4ecgx_power_on(struct s5k4ecgx *priv)static int __s5k4ecgx_power_off (struct s5k4ecgx *priv) { -if (s5k4ecgx_gpio_set_value (priv,RST , !priv->gpio[RST ].level)) +if (s5k4ecgx_gpio_set_value (priv,RSET , !priv->gpio[RSET ].level))usleep_range (30 ,50 );if (s5k4ecgx_gpio_set_value (priv,STBY , !priv->gpio[STBY ].level))
@@ -872,7 +872,7 @@ static int s5k4ecgx_config_gpios(struct s5k4ecgx *priv,int ret; priv->gpio[STBY ].gpio = -EINVAL ; - priv->gpio[RST ].gpio = -EINVAL ; + priv->gpio[RSET ].gpio = -EINVAL ; ret =s5k4ecgx_config_gpio (gpio->gpio, gpio->level,"S5K4ECGX_STBY" );
@@ -891,7 +891,7 @@ static int s5k4ecgx_config_gpios(struct s5k4ecgx *priv,s5k4ecgx_free_gpios (priv);return ret; } - priv->gpio[RST ] = *gpio; + priv->gpio[RSET ] = *gpio;if (gpio_is_valid (gpio->gpio))gpio_set_value (gpio->gpio,0 );
drivers/media/i2c/s5k5baf.c +3 -3
@@ -235,7 +235,7 @@ struct s5k5baf_gpio {enum s5k5baf_gpio_id {STBY , -RST , +RSET ,NUM_GPIOS , };
@@ -970,7 +970,7 @@ static int s5k5baf_power_on(struct s5k5baf *state)s5k5baf_gpio_deassert (state,STBY );usleep_range (50 ,100 ); -s5k5baf_gpio_deassert (state,RST ); +s5k5baf_gpio_deassert (state,RSET );return 0 ; err_reg_dis:
@@ -988,7 +988,7 @@ static int s5k5baf_power_off(struct s5k5baf *state) state->apply_cfg =0 ; state->apply_crop =0 ; -s5k5baf_gpio_assert (state,RST ); +s5k5baf_gpio_assert (state,RSET );s5k5baf_gpio_assert (state,STBY );if (!IS_ERR (state->clock))
drivers/media/i2c/s5k6aa.c +5 -5
@@ -177,7 +177,7 @@ static const char * const s5k6aa_supply_names[] = {enum s5k6aa_gpio_id {STBY , -RST , +RSET ,GPIO_NUM , };
@@ -841,7 +841,7 @@ static int __s5k6aa_power_on(struct s5k6aa *s5k6aa) ret = s5k6aa->s_power (1 );usleep_range (4000 ,5000 ); -if (s5k6aa_gpio_deassert (s5k6aa,RST )) +if (s5k6aa_gpio_deassert (s5k6aa,RSET ))msleep (20 );return ret;
@@ -851,7 +851,7 @@ static int __s5k6aa_power_off(struct s5k6aa *s5k6aa) {int ret; -if (s5k6aa_gpio_assert (s5k6aa,RST )) +if (s5k6aa_gpio_assert (s5k6aa,RSET ))usleep_range (100 ,150 );if (s5k6aa->s_power) {
@@ -1510,7 +1510,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa,int ret; s5k6aa->gpio[STBY ].gpio = -EINVAL ; - s5k6aa->gpio[RST ].gpio = -EINVAL ; + s5k6aa->gpio[RSET ].gpio = -EINVAL ; gpio = &pdata->gpio_stby;if (gpio_is_valid (gpio->gpio)) {
@@ -1533,7 +1533,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa,if (ret <0 )return ret; - s5k6aa->gpio[RST ] = *gpio; + s5k6aa->gpio[RSET ] = *gpio; }return 0 ;
Signature · 9 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 136/348 ia64: mca_drv: fix incorrect array size calculation
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit c5f320ff8a79501bb59338278336ec43acb9d7e2 ]
gcc points out a mistake in the mca driver that goes back to before the git history:
arch/ia64/kernel/mca_drv.c: In function 'init_record_index_pools':arch/ia64/kernel/mca_drv.c:346:54: error: expression does not compute the number of elements in this array; element typ e is 'int', not 'size_t' {aka 'long unsigned int'} [-Werror=sizeof-array-div]
346 | for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++)
| ^
This is the same as sizeof(size_t), which is two shorter than the actual array. Use the ARRAY_SIZE() macro to get the correct calculation instead.
--- arch/ia64/kernel/mca_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/kernel/mca_drv.c +1 -1
@@ -343,7 +343,7 @@ init_record_index_pools(void)/* - 2 - */ sect_min_size = sal_log_sect_min_sizes[0 ]; -for (i =1 ; i <sizeof sal_log_sect_min_sizes/sizeof (size_t ); i++) +for (i =1 ; i <ARRAY_SIZE (sal_log_sect_min_sizes); i++)if (sect_min_size > sal_log_sect_min_sizes[i]) sect_min_size = sal_log_sect_min_sizes[i];
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 137/348 writeback, cgroup: increment isw_nr_in_flight before grabbing an inode
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
[ Upstream commit 8826ee4fe75051f8cbfa5d4a9aa70565938e724c ]
isw_nr_in_flight is used to determine whether the inode switch queue should be flushed from the umount path. Currently it's increased after grabbing an inode and even scheduling the switch work. It means the umount path can walk past cleanup_offline_cgwb() with active inode references, which can result in a "Busy inodes after unmount." message and use-after-free issues (with inode->i_sb which gets freed).
Fix it by incrementing isw_nr_in_flight before doing anything with the inode and decrementing in the case when switching wasn't scheduled.
The problem hasn't yet been seen in the real life and was discovered by Jan Kara by looking into the code.
--- fs/fs-writeback.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/fs-writeback.c +3 -2
@@ -505,6 +505,8 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)if (!isw)return ; +atomic_inc (&isw_nr_in_flight); +/* find and pin the new wb */ rcu_read_lock (); memcg_css =css_from_id (new_wb_id, &memory_cgrp_subsys);
@@ -535,11 +537,10 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)* Let's continue after I_WB_SWITCH is guaranteed to be visible. */ call_rcu (&isw->rcu_head, inode_switch_wbs_rcu_fn); - -atomic_inc (&isw_nr_in_flight);return ; out_free: +atomic_dec (&isw_nr_in_flight);if (isw->new_wb)wb_put (isw->new_wb);kfree (isw);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 138/348 media: s5p_cec: decrement usage count if disabled
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 747bad54a677d8633ec14b39dfbeb859c821d7f2 ]
There's a bug at s5p_cec_adap_enable(): if called to disable the device, it should call pm_runtime_put() instead of pm_runtime_disable(), as the goal here is to decrement the usage_count and not to disable PM runtime.
--- drivers/media/platform/s5p-cec/s5p_cec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/s5p-cec/s5p_cec.c +1 -1
@@ -54,7 +54,7 @@ static int s5p_cec_adap_enable(struct cec_adapter *adap, bool enable) }else {s5p_cec_mask_tx_interrupts (cec);s5p_cec_mask_rx_interrupts (cec); -pm_runtime_disable (cec->dev); +pm_runtime_put (cec->dev); }return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 118/348 block_dump: remove block_dump feature in mark_inode_dirty()
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit 12e0613715e1cf305fffafaf0e89d810d9a85cc0 ]
block_dump is an old debugging interface, one of it's functions is used to print the information about who write which file on disk. If we enable block_dump through /proc/sys/vm/block_dump and turn on debug log level, we can gather information about write process name, target file name and disk from kernel message. This feature is realized in block_dump___mark_inode_dirty(), it print above information into kernel message directly when marking inode dirty, so it is noisy and can easily trigger log storm. At the same time, get the dentry refcount is also not safe, we found it will lead to deadlock on ext4 file system with data=journal mode.
After tracepoints has been introduced into the kernel, we got a tracepoint in __mark_inode_dirty(), which is a better replacement of block_dump___mark_inode_dirty(). The only downside is that it only trace the inode number and not a file name, but it probably doesn't matter because the original printed file name in block_dump is not accurate in some cases, and we can still find it through the inode number and device id. So this patch delete the dirting inode part of block_dump feature.
--- fs/fs-writeback.c | 25 ------------------------- 1 file changed, 25 deletions(-)
fs/fs-writeback.c +0 -25
@@ -2196,28 +2196,6 @@ int dirtytime_interval_handler(struct ctl_table *table, int write,return ret; } -static noinline void block_dump___mark_inode_dirty(struct inode *inode) -{ -if (inode->i_ino ||strcmp (inode->i_sb->s_id,"bdev" )) { -struct dentry *dentry; -const char *name ="?" ; - - dentry =d_find_alias (inode); -if (dentry) { -spin_lock (&dentry->d_lock); - name = (const char *) dentry->d_name.name; - } -printk (KERN_DEBUG -"%s(%d): dirtied inode %lu (%s) on %s\n" , - current->comm,task_pid_nr (current), inode->i_ino, - name, inode->i_sb->s_id); -if (dentry) { -spin_unlock (&dentry->d_lock); -dput (dentry); - } - } -} -/** * __mark_inode_dirty - internal function *
@@ -2277,9 +2255,6 @@ void __mark_inode_dirty(struct inode *inode, int flags) (dirtytime && (inode->i_state & I_DIRTY_INODE))) return; -if (unlikely (block_dump)) -block_dump___mark_inode_dirty (inode); -spin_lock (&inode->i_lock);if (dirtytime && (inode->i_state &I_DIRTY_INODE )) goto out_unlock_inode;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 144/348 sched/uclamp: Fix wrong implementation of cpu.uclamp.min
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 0c18f2ecfcc274a4bcc1d122f79ebd4001c3b445 ]
cpu.uclamp.min is a protection as described in cgroup-v2 Resource Distribution Model
Documentation/admin-guide/cgroup-v2.rst
which means we try our best to preserve the minimum performance point of tasks in this group. See full description of cpu.uclamp.min in the cgroup-v2.rst.
But the current implementation makes it a limit, which is not what was intended.
For example:
tg->cpu.uclamp.min = 20% p0->uclamp[UCLAMP_MIN] = 0 p1->uclamp[UCLAMP_MIN] = 50% Previous Behavior (limit): p0->effective_uclamp = 0 p1->effective_uclamp = 20% New Behavior (Protection): p0->effective_uclamp = 20% p1->effective_uclamp = 50%
Which is inline with how protections should work.
With this change the cgroup and per-task behaviors are the same, as expected.
Additionally, we remove the confusing relationship between cgroup and !user_defined flag.
We don't want for example RT tasks that are boosted by default to max to change their boost value when they attach to a cgroup. If a cgroup wants to limit the max performance point of tasks attached to it, then cpu.uclamp.max must be set accordingly.
Or if they want to set different boost value based on cgroup, then sysctl_sched_util_clamp_min_rt_default must be used to NOT boost to max and set the right cpu.uclamp.min for each group to let the RT tasks obtain the desired boost value when attached to that group.
As it stands the dependency on !user_defined flag adds an extra layer of complexity that is not required now cpu.uclamp.min behaves properly as a protection.
The propagation model of effective cpu.uclamp.min in child cgroups as implemented by cpu_util_update_eff() is still correct. The parent protection sets an upper limit of what the child cgroups will effectively get.
--- kernel/sched/core.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
kernel/sched/core.c +17 -4
@@ -896,7 +896,6 @@ uclamp_tg_restrict(struct task_struct *p, enum uclamp_id clamp_id) {struct uclamp_se uc_req = p->uclamp_req[clamp_id];#ifdef CONFIG_UCLAMP_TASK_GROUP -struct uclamp_se uc_max;/* * Tasks in autogroups or root task group will be
@@ -907,9 +906,23 @@ uclamp_tg_restrict(struct task_struct *p, enum uclamp_id clamp_id)if (task_group (p) == &root_task_group)return uc_req; - uc_max =task_group (p)->uclamp[clamp_id]; -if (uc_req.value > uc_max.value || !uc_req.user_defined) -return uc_max; +switch (clamp_id) { +case UCLAMP_MIN : { +struct uclamp_se uc_min =task_group (p)->uclamp[clamp_id]; +if (uc_req.value < uc_min.value) +return uc_min; +break ; + } +case UCLAMP_MAX : { +struct uclamp_se uc_max =task_group (p)->uclamp[clamp_id]; +if (uc_req.value > uc_max.value) +return uc_max; +break ; + } +default : +WARN_ON_ONCE (1 ); +break ; + }#endif return uc_req;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 149/348 evm: fix writing <securityfs>/evm overflow
In reply to Greg Kroah-HartmanFrom: Mimi Zohar <[email protected]>
[ Upstream commit 49219d9b8785ba712575c40e48ce0f7461254626 ]
EVM_SETUP_COMPLETE is defined as 0x80000000, which is larger than INT_MAX. The "-fno-strict-overflow" compiler option properly prevents signaling EVM that the EVM policy setup is complete. Define and read an unsigned int.
--- security/integrity/evm/evm_secfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
security/integrity/evm/evm_secfs.c +3 -2
@@ -68,12 +68,13 @@ static ssize_t evm_read_key(struct file *filp, char __user *buf,static ssize_t evm_write_key (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { -int i, ret; +unsigned int i; +int ret;if (!capable (CAP_SYS_ADMIN ) || (evm_initialized &EVM_SETUP_COMPLETE ))return -EPERM ; - ret =kstrtoint_from_user (buf, count,0 , &i); + ret =kstrtouint_from_user (buf, count,0 , &i);if (ret)return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 145/348 sched/uclamp: Fix locking around cpu_util_update_eff()
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 93b73858701fd01de26a4a874eb95f9b7156fd4b ]
cpu_cgroup_css_online() calls cpu_util_update_eff() without holding the uclamp_mutex or rcu_read_lock() like other call sites, which is a mistake.
The uclamp_mutex is required to protect against concurrent reads and writes that could update the cgroup hierarchy.
The rcu_read_lock() is required to traverse the cgroup data structures in cpu_util_update_eff().
Surround the caller with the required locks and add some asserts to better document the dependency in cpu_util_update_eff().
--- kernel/sched/core.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/sched/core.c +7 -0
@@ -7199,7 +7199,11 @@ static int cpu_cgroup_css_online(struct cgroup_subsys_state *css)#ifdef CONFIG_UCLAMP_TASK_GROUP /* Propagate the effective uclamp value for the new group */ +mutex_lock (&uclamp_mutex); +rcu_read_lock ();cpu_util_update_eff (css); +rcu_read_unlock (); +mutex_unlock (&uclamp_mutex);#endif return 0 ;
@@ -7289,6 +7293,9 @@ static void cpu_util_update_eff(struct cgroup_subsys_state *css)enum uclamp_id clamp_id;unsigned int clamps; +lockdep_assert_held (&uclamp_mutex); +SCHED_WARN_ON (!rcu_read_lock_held ()); +css_for_each_descendant_pre (css, top_css) { uc_parent =css_tg (css)->parent ?css_tg (css)->parent->uclamp :NULL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 148/348 pata_octeon_cf: avoid WARN_ON() in ata_host_activate()
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit bfc1f378c8953e68ccdbfe0a8c20748427488b80 ]
Iff platform_get_irq() fails (or returns IRQ0) and thus the polling mode has to be used, ata_host_activate() hits the WARN_ON() due to 'irq_handler' parameter being non-NULL if the polling mode is selected. Let's only set the pointer to the driver's IRQ handler if platform_get_irq() returns a valid IRQ # -- this should avoid the unnecessary WARN_ON()...
--- drivers/ata/pata_octeon_cf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ata/pata_octeon_cf.c +3 -2
@@ -898,10 +898,11 @@ static int octeon_cf_probe(struct platform_device *pdev)return -EINVAL ; } - irq_handler = octeon_cf_interrupt; i =platform_get_irq (dma_dev,0 ); -if (i >0 ) +if (i >0 ) { irq = i; + irq_handler = octeon_cf_interrupt; + } }of_node_put (dma_node); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 151/348 media: rc: i2c: Fix an error message
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 9c87ae1a0dbeb5794957421157fd266d38a869b4 ]
'ret' is known to be 1 here. In fact 'i' is expected instead. Store the return value of 'i2c_master_recv()' in 'ret' so that the error message print the correct error code.
--- drivers/media/i2c/ir-kbd-i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ir-kbd-i2c.c +2 -2
@@ -678,8 +678,8 @@ static int zilog_tx(struct rc_dev *rcdev, unsigned int *txbuf, goto out_unlock; } - i =i2c_master_recv (ir->tx_c, buf,1 ); -if (i !=1 ) { + ret =i2c_master_recv (ir->tx_c, buf,1 ); +if (ret !=1 ) {dev_err (&ir->rc->dev,"i2c_master_recv failed with %d\n" , ret); ret = -EIO ; goto out_unlock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 154/348 media: au0828: fix a NULL vs IS_ERR() check
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8f2e452730d2bcd59fe05246f0e19a4c52e0012d ]
The media_device_usb_allocate() function returns error pointers when it's enabled and something goes wrong. It can return NULL as well, but only if CONFIG_MEDIA_CONTROLLER is disabled so that doesn't apply here.
--- drivers/media/usb/au0828/au0828-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/au0828/au0828-core.c +2 -2
@@ -199,8 +199,8 @@ static int au0828_media_device_init(struct au0828_dev *dev,struct media_device *mdev; mdev =media_device_usb_allocate (udev,KBUILD_MODNAME ,THIS_MODULE ); -if (!mdev) -return -ENOMEM ; +if (IS_ERR (mdev)) +return PTR_ERR (mdev); dev->media_dev = mdev;#endif
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 115/348 hv_utils: Fix passing zero to PTR_ERR warning
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit c6a8625fa4c6b0a97860d053271660ccedc3d1b3 ]
Sparse warn this:
drivers/hv/hv_util.c:753 hv_timesync_init() warn:
passing zero to 'PTR_ERR'
Use PTR_ERR_OR_ZERO instead of PTR_ERR to fix this.
--- drivers/hv/hv_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hv/hv_util.c +2 -2
@@ -537,8 +537,8 @@ static int hv_timesync_init(struct hv_util_service *srv)*/ hv_ptp_clock =ptp_clock_register (&ptp_hyperv_info,NULL );if (IS_ERR_OR_NULL (hv_ptp_clock)) { -pr_err ("cannot register PTP clock: %ld\n" , -PTR_ERR (hv_ptp_clock)); +pr_err ("cannot register PTP clock: %d\n" , +PTR_ERR_OR_ZERO (hv_ptp_clock)); hv_ptp_clock =NULL ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 159/348 crypto: nitrox - fix unchecked variable in nitrox_register_interrupts
In reply to Greg Kroah-HartmanFrom: Tong Tiangen <[email protected]>
[ Upstream commit 57c126661f50b884d3812e7db6e00f2e778eccfb ]
Function nitrox_register_interrupts leaves variable 'nr_vecs' unchecked, which would be use as kcalloc parameter later.
--- drivers/crypto/cavium/nitrox/nitrox_isr.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/cavium/nitrox/nitrox_isr.c +4 -0
@@ -306,6 +306,10 @@ int nitrox_register_interrupts(struct nitrox_device *ndev)* Entry 192: NPS_CORE_INT_ACTIVE */ nr_vecs =pci_msix_vec_count (pdev); +if (nr_vecs <0 ) { +dev_err (DEV (ndev),"Error in getting vec count %d\n" , nr_vecs); +return nr_vecs; + }/* Enable MSI-X */ ret =pci_alloc_irq_vectors (pdev, nr_vecs, nr_vecs,PCI_IRQ_MSIX );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 171/348 sched/rt: Fix Deadline utilization tracking during policy change
In reply to Greg Kroah-HartmanFrom: Vincent Donnefort <[email protected]>
[ Upstream commit d7d607096ae6d378b4e92d49946d22739c047d4c ]
DL keeps track of the utilization on a per-rq basis with the structure avg_dl. This utilization is updated during task_tick_dl(), put_prev_task_dl() and set_next_task_dl(). However, when the current running task changes its policy, set_next_task_dl() which would usually take care of updating the utilization when the rq starts running DL tasks, will not see a such change, leaving the avg_dl structure outdated. When that very same task will be dequeued later, put_prev_task_dl() will then update the utilization, based on a wrong last_update_time, leading to a huge spike in the DL utilization signal.
The signal would eventually recover from this issue after few ms. Even if no DL tasks are run, avg_dl is also updated in __update_blocked_others(). But as the CPU capacity depends partly on the avg_dl, this issue has nonetheless a significant impact on the scheduler.
Fix this issue by ensuring a load update when a running task changes its policy to DL.
--- kernel/sched/deadline.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sched/deadline.c +2 -0
@@ -2392,6 +2392,8 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)check_preempt_curr_dl (rq, p,0 ); elseresched_curr (rq ); + }else { +update_dl_rq_load_avg (rq_clock_pelt (rq), rq,0 ); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 174/348 crypto: nx - Fix RCU warning in nx842_OF_upd_status
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 2a96726bd0ccde4f12b9b9a9f61f7b1ac5af7e10 ]
The function nx842_OF_upd_status triggers a sparse RCU warning when it directly dereferences the RCU-protected devdata. This appears to be an accident as there was another variable of the same name that was passed in from the caller.
After it was removed (because the main purpose of using it, to update the status member was itself removed) the global variable unintenionally stood in as its replacement.
This patch restores the devdata parameter.
--- drivers/crypto/nx/nx-842-pseries.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/nx/nx-842-pseries.c +5 -3
@@ -538,13 +538,15 @@ static int nx842_OF_set_defaults(struct nx842_devdata *devdata)* The status field indicates if the device is enabled when the status * is 'okay'. Otherwise the device driver will be disabled. * -* @prop - struct property point containing the maxsyncop for the update +* @devdata: struct nx842_devdata to use for dev_info +* @prop: struct property point containing the maxsyncop for the update * * Returns: * 0 - Device is available * -ENODEV - Device is not available */ -static int nx842_OF_upd_status (struct property *prop) +static int nx842_OF_upd_status (struct nx842_devdata *devdata, +struct property *prop) {const char *status = (const char *)prop->value;
@@ -758,7 +760,7 @@ static int nx842_OF_upd(struct property *new_prop) goto out;/* Perform property updates */ - ret =nx842_OF_upd_status (status); + ret =nx842_OF_upd_status (new_devdata, status);if (ret) goto error_out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 150/348 crypto: ccp - Fix a resource leak in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit a6f8e68e238a15bb15f1726b35c695136c64eaba ]
If an error occurs after calling 'sp_get_irqs()', 'sp_free_irqs()' must be called as already done in the error handling path.
--- drivers/crypto/ccp/sp-pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/crypto/ccp/sp-pci.c +4 -2
@@ -213,7 +213,7 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (ret) {dev_err (dev,"dma_set_mask_and_coherent failed (%d)\n" , ret); - goto e_err; + goto free_irqs; } }
@@ -221,10 +221,12 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ret =sp_init (sp);if (ret) - goto e_err; + goto free_irqs;return 0 ; +free_irqs: +sp_free_irqs (sp); e_err:dev_notice (dev,"initialization failed\n" );return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 176/348 extcon: extcon-max8997: Fix IRQ freeing at error path
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
[ Upstream commit 610bdc04830a864115e6928fc944f1171dfff6f3 ]
If reading MAX8997_MUIC_REG_STATUS1 fails at probe the driver exits without freeing the requested IRQs.
Free the IRQs prior returning if reading the status fails.
--- drivers/extcon/extcon-max8997.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/extcon/extcon-max8997.c +1 -1
@@ -729,7 +729,7 @@ static int max8997_muic_probe(struct platform_device *pdev) 2, info->status);if (ret) {dev_err (info->dev,"failed to read MUIC register\n" ); -return ret; + goto err_irq; } cable_type =max8997_muic_get_cable_type (info,MAX8997_CABLE_GROUP_ADC , &attached);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 139/348 crypto: ixp4xx - dma_unmap the correct address
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 9395c58fdddd79cdd3882132cdd04e8ac7ad525f ]
Testing ixp4xx_crypto with CONFIG_DMA_API_DEBUG lead to the following error:
DMA-API: platform ixp4xx_crypto.0: device driver tries to free DMA memory it has not allocated [device address=0x0000000000000000] [size=24 bytes]
This is due to dma_unmap using the wrong address.
--- drivers/crypto/ixp4xx_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/ixp4xx_crypto.c +1 -1
@@ -329,7 +329,7 @@ static void free_buf_chain(struct device *dev, struct buffer_desc *buf, buf1 = buf->next; phys1 = buf->phys_next; -dma_unmap_single (dev, buf->phys_next, buf->buf_len, buf->dir); +dma_unmap_single (dev, buf->phys_addr, buf->buf_len, buf->dir);dma_pool_free (buffer_pool, buf, phys); buf = buf1; phys = phys1;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 141/348 sata_highbank: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 4a24efa16e7db02306fb5db84518bb0a7ada5a46 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_highbank.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/ata/sata_highbank.c +4 -2
@@ -469,10 +469,12 @@ static int ahci_highbank_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) { +if (irq <0 ) {dev_err (dev,"no irq\n" ); -return -EINVAL ; +return irq; } +if (!irq) +return -EINVAL ; hpriv =devm_kzalloc (dev,sizeof (*hpriv),GFP_KERNEL );if (!hpriv) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 140/348 crypto: ux500 - Fix error return code in hash_hw_final()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit b01360384009ab066940b45f34880991ea7ccbfb ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/crypto/ux500/hash/hash_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/ux500/hash/hash_core.c +1 -0
@@ -1009,6 +1009,7 @@ static int hash_hw_final(struct ahash_request *req) goto out; } }else if (req->nbytes ==0 && ctx->keylen >0 ) { + ret = -EPERM ;dev_err (device_data->dev,"%s: Empty message with keylength > 0, NOT supported\n" , __func__); goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 142/348 pata_rb532_cf: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 2d3a62fbae8e5badc2342388f65ab2191c209cc0 ]
The driver overrides the error codes returned by platform_get_irq() to -ENOENT, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/pata_rb532_cf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/ata/pata_rb532_cf.c +4 -2
@@ -115,10 +115,12 @@ static int rb532_pata_driver_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) { +if (irq <0 ) {dev_err (&pdev->dev,"no IRQ resource found\n" ); -return -ENOENT ; +return irq; } +if (!irq) +return -EINVAL ; gpiod =devm_gpiod_get (&pdev->dev,NULL ,GPIOD_IN );if (IS_ERR (gpiod)) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 146/348 kbuild: run the checker after the compiler
In reply to Greg Kroah-HartmanFrom: Luc Van Oostenryck <[email protected]>
[ Upstream commit 0c33f125732d0d33392ba6774d85469d565d3496 ]
Since the pre-git time the checker is run first, before the compiler. But if the source file contains some syntax error, the warnings from the compiler are more useful than those from sparse (and other checker most probably too).
So move the 'check' command to run after the compiler.
--- scripts/Makefile.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/Makefile.build +2 -2
@@ -240,9 +240,9 @@ undefined_syms = $(NM) $< | $(AWK) '$$1 == "U" { printf("%s%s", x++ ? " " : "", endif define rule_cc_o_c - $(call cmd,checksrc) $(call cmd_and_fixdep,cc_o_c) $(call cmd,gen_ksymdeps) + $(call cmd,checksrc) $(call cmd,checkdoc) $(call cmd,objtool) $(call cmd,modversions_c)
@@ -258,8 +258,8 @@ endef # Built-in and composite module parts $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE - $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c) + $(call cmd,force_checksrc) cmd_mod = { \ echo $(if $($*-objs)$($*-y)$($*-m), $(addprefix $(obj)/, $($*-objs) $($*-y) $($*-m)), $(@:.mod=.o)); \
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 147/348 kbuild: Fix objtool dependency for OBJECT_FILES_NON_STANDARD_<obj> := n
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit 8852c552402979508fdc395ae07aa8761aa46045 ]
"OBJECT_FILES_NON_STANDARD_vma.o := n" has a dependency bug. When objtool source is updated, the affected object doesn't get re-analyzed by objtool.
Peter's new variable-sized jump label feature relies on objtool rewriting the object file. Otherwise the system can fail to boot. That effectively upgrades this minor dependency issue to a major bug.
The problem is that variables in prerequisites are expanded early, during the read-in phase. The '$(objtool_dep)' variable indirectly uses '$@', which isn't yet available when the target prerequisites are evaluated.
Use '.SECONDEXPANSION:' which causes '$(objtool_dep)' to be expanded in a later phase, after the target-specific '$@' variable has been defined.
--- scripts/Makefile.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/Makefile.build +3 -2
@@ -257,7 +257,8 @@ define rule_as_o_S endef # Built-in and composite module parts -$(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE +.SECONDEXPANSION: +$(obj)/%.o: $(src)/%.c $(recordmcount_source) $$(objtool_dep) FORCE $(call if_changed_rule,cc_o_c) $(call cmd,force_checksrc)
@@ -340,7 +341,7 @@ cmd_modversions_S = \ fi endif -$(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE +$(obj)/%.o: $(src)/%.S $$(objtool_dep) FORCE $(call if_changed_rule,as_o_S) targets += $(filter-out $(subdir-obj-y), $(real-obj-y)) $(real-obj-m) $(lib-y)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 152/348 pata_ep93xx: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 5c8121262484d99bffb598f39a0df445cecd8efb ]
The driver overrides the error codes returned by platform_get_irq() to -ENXIO, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Propagate the error code upstream, as it should have been done from the start...
--- drivers/ata/pata_ep93xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_ep93xx.c +1 -1
@@ -928,7 +928,7 @@ static int ep93xx_pata_probe(struct platform_device *pdev)/* INT[3] (IRQ_EP93XX_EXT3) line connected as pull down */ irq =platform_get_irq (pdev,0 );if (irq <0 ) { - err = -ENXIO ; + err = irq; goto err_rel_gpio; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 155/348 media: tc358743: Fix error return code in tc358743_probe_of()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit a6b1e7093f0a099571fc8836ab4a589633f956a8 ]
When the CSI bps per lane is not in the valid range, an appropriate error code -EINVAL should be returned. However, we currently do not explicitly assign this error code to 'ret'. As a result, 0 was incorrectly returned.
--- drivers/media/i2c/tc358743.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/tc358743.c +1 -0
@@ -1973,6 +1973,7 @@ static int tc358743_probe_of(struct tc358743_state *state) bps_pr_lane =2 * endpoint.link_frequencies[0 ];if (bps_pr_lane <62500000U || bps_pr_lane >1000000000U ) {dev_err (dev,"unsupported bps per lane: %u bps\n" , bps_pr_lane); + ret = -EINVAL ; goto disable_clk; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 157/348 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 ]
Since the code for ATARI_KBD_CORE does not use drivers/input/keyboard/ code, just move ATARI_KBD_CORE to arch/m68k/Kconfig.machine to remove the dependency on INPUT_KEYBOARD.
Removes this kconfig warning:
WARNING: unmet direct dependencies detected for ATARI_KBD_CORE
Depends on [n]: !UML && INPUT [=y] && INPUT_KEYBOARD [=n] Selected by [y]:
- MOUSE_ATARI [=y] && !UML && INPUT [=y] && INPUT_MOUSE [=y] && ATARI [=y]
--- arch/m68k/Kconfig.machine | 3 +++ drivers/input/keyboard/Kconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/m68k/Kconfig.machine +3 -0
@@ -23,6 +23,9 @@ config ATARI this kernel on an Atari, say Y here and browse the material available in <file:Documentation/m68k>; otherwise say N. +config ATARI_KBD_CORE + bool + config MAC bool "Macintosh support" depends on MMU
drivers/input/keyboard/Kconfig +0 -3
@@ -68,9 +68,6 @@ config KEYBOARD_AMIGA To compile this driver as a module, choose M here: the module will be called amikbd. -config ATARI_KBD_CORE - bool - config KEYBOARD_APPLESPI tristate "Apple SPI keyboard and trackpad" depends on ACPI && EFI
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 156/348 media: gspca/gl860: fix zero-length control requests
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 8ed339f23d41e21660a389adf2e7b2966d457ff6 ]
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the gl860_RTx() helper so that zero-length control reads fail with an error message instead. Note that there are no current callers that would trigger this.
--- drivers/media/usb/gspca/gl860/gl860.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/gspca/gl860/gl860.c +2 -2
@@ -561,8 +561,8 @@ int gl860_RTx(struct gspca_dev *gspca_dev, len, 400 + 200 * (len > 1));memcpy (pdata, gspca_dev->usb_buf, len); }else { - r =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), - req, pref, val, index,NULL , len,400 ); +gspca_err (gspca_dev,"zero-length read request\n" ); + r = -EINVAL ; } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 119/348 fs: dlm: cancel work sync othercon
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
[ Upstream commit c6aa00e3d20c2767ba3f57b64eb862572b9744b3 ]
These rx tx flags arguments are for signaling close_connection() from which worker they are called. Obviously the receive worker cannot cancel itself and vice versa for swork. For the othercon the receive worker should only be used, however to avoid deadlocks we should pass the same flags as the original close_connection() was called.
--- fs/dlm/lowcomms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/dlm/lowcomms.c +1 -1
@@ -607,7 +607,7 @@ static void close_connection(struct connection *con, bool and_other, }if (con->othercon && and_other) {/* Will only re-enter once. */ -close_connection (con->othercon, false, true, true); +close_connection (con->othercon, false, tx, rx); }if (con->rx_page) {__free_page (con->rx_page);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 158/348 media: siano: Fix out-of-bounds warnings in smscore_load_firmware_family2()
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 13dfead49db07225335d4f587a560a2210391a1a ]
Rename struct sms_msg_data4 to sms_msg_data5 and increase the size of its msg_data array from 4 to 5 elements. Notice that at some point the 5th element of msg_data is being accessed in function smscore_load_firmware_family2():
1006 trigger_msg->msg_data[4] = 4; /* Task ID */
Also, there is no need for the object _trigger_msg_ of type struct sms_msg_data *, when _msg_ can be used, directly. Notice that msg_data in struct sms_msg_data is a one-element array, which causes multiple out-of-bounds warnings when accessing beyond its first element in function smscore_load_firmware_family2():
992 struct sms_msg_data *trigger_msg =
993 (struct sms_msg_data *) msg;
994
995 pr_debug("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ\n");
996 SMS_INIT_MSG(&msg->x_msg_header,
997 MSG_SMS_SWDOWNLOAD_TRIGGER_REQ, 998 sizeof(struct sms_msg_hdr) + 999 sizeof(u32) * 5); 1000 1001 trigger_msg->msg_data[0] = firmware->start_address; 1002 /* Entry point */ 1003 trigger_msg->msg_data[1] = 6; /* Priority */ 1004 trigger_msg->msg_data[2] = 0x200; /* Stack size */ 1005 trigger_msg->msg_data[3] = 0; /* Parameter */ 1006 trigger_msg->msg_data[4] = 4; /* Task ID */
even when enough dynamic memory is allocated for _msg_:
929 /* PAGE_SIZE buffer shall be enough and dma aligned */
930 msg = kmalloc(PAGE_SIZE, GFP_KERNEL | coredev->gfp_buf_flags);
but as _msg_ is casted to (struct sms_msg_data *):
992 struct sms_msg_data *trigger_msg =
993 (struct sms_msg_data *) msg;
the out-of-bounds warnings are actually valid and should be addressed.
Fix this by declaring object _msg_ of type struct sms_msg_data5 *, which contains a 5-elements array, instead of just 4. And use _msg_ directly, instead of creating object trigger_msg.
This helps with the ongoing efforts to enable -Warray-bounds by fixing the following warnings:
CC [M] drivers/media/common/siano/smscoreapi.odrivers/media/common/siano/smscoreapi.c: In function ‘smscore_load_firmware_family2’:drivers/media/common/siano/smscoreapi.c:1003:24: warning: array subscript 1 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1003 | trigger_msg->msg_data[1] = 6; /* Priority */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~
drivers/media/common/siano/smscoreapi.c:1004:24: warning: array subscript 2 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1004 | trigger_msg->msg_data[2] = 0x200; /* Stack size */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~
drivers/media/common/siano/smscoreapi.c:1005:24: warning: array subscript 3 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1005 | trigger_msg->msg_data[3] = 0; /* Parameter */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~
drivers/media/common/siano/smscoreapi.c:1006:24: warning: array subscript 4 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1006 | trigger_msg->msg_data[4] = 4; /* Task ID */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~--- drivers/media/common/siano/smscoreapi.c | 22 +++++++++------------- drivers/media/common/siano/smscoreapi.h | 4 ++-- 2 files changed, 11 insertions(+), 15 deletions(-)
drivers/media/common/siano/smscoreapi.c +9 -13
@@ -908,7 +908,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, void *buffer, size_t size) {struct sms_firmware *firmware = (struct sms_firmware *) buffer; -struct sms_msg_data4 *msg; +struct sms_msg_data5 *msg;u32 mem_address, calc_checksum =0 ;u32 i, *ptr;u8 *payload = firmware->payload;
@@ -989,24 +989,20 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, goto exit_fw_download;if (coredev->mode ==DEVICE_MODE_NONE ) { -struct sms_msg_data *trigger_msg = - (struct sms_msg_data *) msg; -pr_debug ("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ\n" );SMS_INIT_MSG (&msg->x_msg_header,MSG_SMS_SWDOWNLOAD_TRIGGER_REQ , -sizeof (struct sms_msg_hdr ) + -sizeof (u32) *5 ); +sizeof (*msg)); - trigger_msg->msg_data[0 ] = firmware->start_address; + msg->msg_data[0 ] = firmware->start_address;/* Entry point */ - trigger_msg->msg_data[1 ] =6 ;/* Priority */ - trigger_msg->msg_data[2 ] =0x200 ;/* Stack size */ - trigger_msg->msg_data[3 ] =0 ;/* Parameter */ - trigger_msg->msg_data[4 ] =4 ;/* Task ID */ + msg->msg_data[1 ] =6 ;/* Priority */ + msg->msg_data[2 ] =0x200 ;/* Stack size */ + msg->msg_data[3 ] =0 ;/* Parameter */ + msg->msg_data[4 ] =4 ;/* Task ID */ - rc =smscore_sendrequest_and_wait (coredev, trigger_msg, - trigger_msg->x_msg_header.msg_length, + rc =smscore_sendrequest_and_wait (coredev, msg, + msg->x_msg_header.msg_length, &coredev->trigger_done); }else { SMS_INIT_MSG(&msg->x_msg_header, MSG_SW_RELOAD_EXEC_REQ,
drivers/media/common/siano/smscoreapi.h +2 -2
@@ -629,9 +629,9 @@ struct sms_msg_data2 {u32 msg_data[2 ]; }; -struct sms_msg_data4 { +struct sms_msg_data5 {struct sms_msg_hdr x_msg_header; -u32 msg_data[4 ]; +u32 msg_data[5 ]; };struct sms_data_download {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 123/348 ACPI: bus: Call kobject_put() in acpi_init() error path
In reply to Greg Kroah-HartmanFrom: Hanjun Guo <[email protected]>
[ Upstream commit 4ac7a817f1992103d4e68e9837304f860b5e7300 ]
Although the system will not be in a good condition or it will not boot if acpi_bus_init() fails, it is still necessary to put the kobject in the error path before returning to avoid leaking memory.
--- drivers/acpi/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/bus.c +1 -0
@@ -1240,6 +1240,7 @@ static int __init acpi_init(void) result =acpi_bus_init ();if (result) { +kobject_put (acpi_kobj);disable_acpi ();return result; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 160/348 crypto: omap-sham - Fix PM reference leak in omap sham ops
In reply to Greg Kroah-HartmanFrom: Zhang Qilong <[email protected]>
[ Upstream commit ca323b2c61ec321eb9f2179a405b9c34cdb4f553 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- drivers/crypto/omap-sham.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/omap-sham.c +2 -2
@@ -364,7 +364,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd) {int err; - err =pm_runtime_get_sync (dd->dev); + err =pm_runtime_resume_and_get (dd->dev);if (err <0 ) {dev_err (dd->dev,"failed to get sync: %d\n" , err);return err;
@@ -2236,7 +2236,7 @@ static int omap_sham_suspend(struct device *dev)static int omap_sham_resume (struct device *dev) { -int err =pm_runtime_get_sync (dev); +int err =pm_runtime_resume_and_get (dev);if (err <0 ) {dev_err (dev,"failed to get sync: %d\n" , err);return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 120/348 random32: Fix implicit truncation warning in prandom_seed_state()
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit d327ea15a305024ef0085252fa3657bbb1ce25f5 ]
sparse generates the following warning:
include/linux/prandom.h:114:45: sparse: sparse: cast truncates bits from constant value
This is because the 64-bit seed value is manipulated and then placed in a u32, causing an implicit cast and truncation. A forced cast to u32 doesn't prevent this warning, which is reasonable because a typecast doesn't prove that truncation was expected.
Logical-AND the value with 0xffffffff to make explicit that truncation to 32-bit is intended.
--- include/linux/prandom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/prandom.h +1 -1
@@ -93,7 +93,7 @@ static inline u32 __seed(u32 x, u32 m)*/ static inline void prandom_seed_state (struct rnd_state *state,u64 seed) { -u32 i = (seed >>32 ) ^ (seed <<10 ) ^ seed; +u32 i = ((seed >>32 ) ^ (seed <<10 ) ^ seed) &0xffffffffUL ; state->s1 =__seed (i,2U ); state->s2 =__seed (i,8U );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 124/348 ACPI: resources: Add checks for ACPI IRQ override
In reply to Greg Kroah-HartmanFrom: Hui Wang <[email protected]>
[ Upstream commit 0ec4e55e9f571f08970ed115ec0addc691eda613 ]
The laptop keyboard doesn't work on many MEDION notebooks, but the keyboard works well under Windows and Unix.
Through debugging, we found this log in the dmesg:
ACPI: IRQ 1 override to edge, high
pnp 00:03: Plug and Play ACPI device, IDs PNP0303 (active)
And we checked the IRQ definition in the DSDT, it is:
IRQ (Level, ActiveLow, Exclusive, )
{1}
So the BIOS defines the keyboard IRQ to Level_Low, but the Linux kernel override it to Edge_High. If the Linux kernel is modified to skip the IRQ override, the keyboard will work normally.
Quoted 1 line
From the existing comment in
acpi_dev_get_irqresource(), the override
function only needs to be called when IRQ() or IRQNoFlags() is used to populate the resource descriptor, and according to Section 6.4.2.1 of ACPI 6.4 [1], if IRQ() is empty or IRQNoFlags() is used, the IRQ is High true, edge sensitive and non-shareable. ACPICA also assumes that to be the case (see acpi_rs_set_irq[] in rsirq.c).
In accordance with the above, check 3 additional conditions (EdgeSensitive, ActiveHigh and Exclusive) when deciding whether or not to treat an ACPI_RESOURCE_TYPE_IRQ resource as "legacy", in which case the IRQ override is applicable to it.
--- drivers/acpi/resource.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/acpi/resource.c +8 -1
@@ -430,6 +430,13 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, } } +static bool irq_is_legacy (struct acpi_resource_irq *irq) +{ +return irq->triggering ==ACPI_EDGE_SENSITIVE && + irq->polarity ==ACPI_ACTIVE_HIGH && + irq->shareable ==ACPI_EXCLUSIVE ; +} +/** * acpi_dev_resource_interrupt - Extract ACPI interrupt resource information. * @ares: Input ACPI resource object.
@@ -468,7 +475,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, }acpi_dev_get_irqresource (res, irq->interrupts[index], irq->triggering, irq->polarity, - irq->shareable, true); + irq->shareable,irq_is_legacy (irq));break ;case ACPI_RESOURCE_TYPE_EXTENDED_IRQ : ext_irq = &ares->data.extended_irq;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 172/348 sched/uclamp: Fix uclamp_tg_restrict()
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 0213b7083e81f4acd69db32cb72eb4e5f220329a ]
Now cpu.uclamp.min acts as a protection, we need to make sure that the uclamp request of the task is within the allowed range of the cgroup, that is it is clamp()'ed correctly by tg->uclamp[UCLAMP_MIN] and tg->uclamp[UCLAMP_MAX].
As reported by Xuewen [1] we can have some corner cases where there's inversion between uclamp requested by task (p) and the uclamp values of the taskgroup it's attached to (tg). Following table demonstrates 2 corner cases:
| p | tg | effective -----------+-----+------+----------- CASE 1 -----------+-----+------+----------- uclamp_min | 60% | 0% | 60% -----------+-----+------+----------- uclamp_max | 80% | 50% | 50% -----------+-----+------+----------- CASE 2 -----------+-----+------+----------- uclamp_min | 0% | 30% | 30% -----------+-----+------+----------- uclamp_max | 20% | 50% | 20% -----------+-----+------+-----------
With this fix we get:
| p | tg | effective -----------+-----+------+----------- CASE 1 -----------+-----+------+----------- uclamp_min | 60% | 0% | 50% -----------+-----+------+----------- uclamp_max | 80% | 50% | 50% -----------+-----+------+----------- CASE 2 -----------+-----+------+----------- uclamp_min | 0% | 30% | 30% -----------+-----+------+----------- uclamp_max | 20% | 50% | 30% -----------+-----+------+-----------
Additionally uclamp_update_active_tasks() must now unconditionally update both UCLAMP_MIN/MAX because changing the tg's UCLAMP_MAX for instance could have an impact on the effective UCLAMP_MIN of the tasks.
| p | tg | effective -----------+-----+------+----------- old -----------+-----+------+----------- uclamp_min | 60% | 0% | 50% -----------+-----+------+----------- uclamp_max | 80% | 50% | 50% -----------+-----+------+----------- *new* -----------+-----+------+----------- uclamp_min | 60% | 0% | *60%* -----------+-----+------+----------- uclamp_max | 80% |*70%* | *70%* -----------+-----+------+-----------
[1] https://lore.kernel.org/lkml/CAB8ipk_a6VFNjiEnHRHkUMBKbA+qzPQvhtNjJ_YNzQhqV_o8Zw@mail.gmail.com/
--- kernel/sched/core.c | 49 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 31 deletions(-)
kernel/sched/core.c +18 -31
@@ -894,8 +894,10 @@ unsigned int uclamp_rq_max_value(struct rq *rq, enum uclamp_id clamp_id,static inline struct uclamp_se uclamp_tg_restrict (struct task_struct *p,enum uclamp_id clamp_id) { +/* Copy by value as we could modify it */ struct uclamp_se uc_req = p->uclamp_req[clamp_id];#ifdef CONFIG_UCLAMP_TASK_GROUP +unsigned int tg_min, tg_max, value;/* * Tasks in autogroups or root task group will be
@@ -906,23 +908,11 @@ uclamp_tg_restrict(struct task_struct *p, enum uclamp_id clamp_id)if (task_group (p) == &root_task_group)return uc_req; -switch (clamp_id) { -case UCLAMP_MIN : { -struct uclamp_se uc_min =task_group (p)->uclamp[clamp_id]; -if (uc_req.value < uc_min.value) -return uc_min; -break ; - } -case UCLAMP_MAX : { -struct uclamp_se uc_max =task_group (p)->uclamp[clamp_id]; -if (uc_req.value > uc_max.value) -return uc_max; -break ; - } -default : -WARN_ON_ONCE (1 ); -break ; - } + tg_min =task_group (p)->uclamp[UCLAMP_MIN ].value; + tg_max =task_group (p)->uclamp[UCLAMP_MAX ].value; + value = uc_req.value; + value =clamp (value, tg_min, tg_max); +uclamp_se_set (&uc_req, value, false);#endif return uc_req;
@@ -1121,8 +1111,9 @@ static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) }static inline void -uclamp_update_active (struct task_struct *p,enum uclamp_id clamp_id) +uclamp_update_active (struct task_struct *p) { +enum uclamp_id clamp_id;struct rq_flags rf;struct rq *rq;
@@ -1142,9 +1133,11 @@ uclamp_update_active(struct task_struct *p, enum uclamp_id clamp_id)* affecting a valid clamp bucket, the next time it's enqueued, * it will already see the updated clamp bucket value. */ -if (p->uclamp[clamp_id].active) { -uclamp_rq_dec_id (rq, p, clamp_id); -uclamp_rq_inc_id (rq, p, clamp_id); +for_each_clamp_id (clamp_id) { +if (p->uclamp[clamp_id].active) { +uclamp_rq_dec_id (rq, p, clamp_id); +uclamp_rq_inc_id (rq, p, clamp_id); + } }task_rq_unlock (rq, p, &rf);
@@ -1152,20 +1145,14 @@ uclamp_update_active(struct task_struct *p, enum uclamp_id clamp_id)#ifdef CONFIG_UCLAMP_TASK_GROUP static inline void -uclamp_update_active_tasks (struct cgroup_subsys_state *css, -unsigned int clamps) +uclamp_update_active_tasks (struct cgroup_subsys_state *css) { -enum uclamp_id clamp_id;struct css_task_iter it;struct task_struct *p;css_task_iter_start (css,0 , &it); -while ((p =css_task_iter_next (&it))) { -for_each_clamp_id (clamp_id) { -if ((0x1 << clamp_id) & clamps) -uclamp_update_active (p, clamp_id); - } - } +while ((p =css_task_iter_next (&it))) +uclamp_update_active (p);css_task_iter_end (&it); }
@@ -7328,7 +7315,7 @@ static void cpu_util_update_eff(struct cgroup_subsys_state *css) }/* Immediately update descendants RUNNABLE tasks */ -uclamp_update_active_tasks (css, clamps); +uclamp_update_active_tasks (css); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 173/348 spi: spi-sun6i: Fix chipselect/clock bug
In reply to Greg Kroah-HartmanFrom: Mirko Vogt <mirko-dev|[email protected]>
[ Upstream commit 0d7993b234c9fad8cb6bec6adfaa74694ba85ecb ]
The current sun6i SPI implementation initializes the transfer too early, resulting in SCK going high before the transfer. When using an additional (gpio) chipselect with sun6i, the chipselect is asserted at a time when clock is high, making the SPI transfer fail.
This is due to SUN6I_GBL_CTL_BUS_ENABLE being written into SUN6I_GBL_CTL_REG at an early stage. Moving that to the transfer function, hence, right before the transfer starts, mitigates that problem.
--- drivers/spi/spi-sun6i.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/spi/spi-sun6i.c +5 -1
@@ -297,6 +297,10 @@ static int sun6i_spi_transfer_one(struct spi_master *master, }sun6i_spi_write (sspi,SUN6I_CLK_CTL_REG , reg); +/* Finally enable the bus - doing so before might raise SCK to HIGH */ + reg =sun6i_spi_read (sspi,SUN6I_GBL_CTL_REG ); + reg |=SUN6I_GBL_CTL_BUS_ENABLE ; +sun6i_spi_write (sspi,SUN6I_GBL_CTL_REG , reg);/* Setup the transfer now... */ if (sspi->tx_buf)
@@ -405,7 +409,7 @@ static int sun6i_spi_runtime_resume(struct device *dev) }sun6i_spi_write (sspi,SUN6I_GBL_CTL_REG , -SUN6I_GBL_CTL_BUS_ENABLE |SUN6I_GBL_CTL_MASTER |SUN6I_GBL_CTL_TP ); +SUN6I_GBL_CTL_MASTER |SUN6I_GBL_CTL_TP );return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 122/348 ACPICA: Fix memory leak caused by _CID repair function
In reply to Greg Kroah-HartmanFrom: Erik Kaneda <[email protected]>
[ Upstream commit c27bac0314131b11bccd735f7e8415ac6444b667 ]
ACPICA commit 180cb53963aa876c782a6f52cc155d951b26051a
According to the ACPI spec, _CID returns a package containing hardware ID's. Each element of an ASL package contains a reference count from the parent package as well as the element itself.
Name (TEST, Package() {
"String object" // this package element has a reference count of 2
})
A memory leak was caused in the _CID repair function because it did not decrement the reference count created by the package. Fix the memory leak by calling acpi_ut_remove_reference on _CID package elements that represent a hardware ID (_HID).
--- drivers/acpi/acpica/nsrepair2.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/acpi/acpica/nsrepair2.c +7 -0
@@ -375,6 +375,13 @@ acpi_ns_repair_CID(struct acpi_evaluate_info *info, (*element_ptr)->common.reference_count = original_ref_count; + +/* +* The original_element holds a reference from the package object +* that represents _HID. Since a new element was created by _HID, +* remove the reference from the _CID package. +*/ +acpi_ut_remove_reference (original_element); } element_ptr++;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 121/348 fs: dlm: fix memory leak when fenced
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
[ Upstream commit 700ab1c363c7b54c9ea3222379b33fc00ab02f7b ]
I got some kmemleak report when a node was fenced. The user space tool dlm_controld will therefore run some rmdir() in dlm configfs which was triggering some memleaks. This patch stores the sps and cms attributes which stores some handling for subdirectories of the configfs cluster entry and free them if they get released as the parent directory gets freed.
unreferenced object 0xffff88810d9e3e00 (size 192):
comm "dlm_controld", pid 342, jiffies 4294698126 (age 55438.801s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 73 70 61 63 65 73 00 00 ........spaces..
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000db8b640b>] make_cluster+0x5d/0x360
[<000000006a571db4>] configfs_mkdir+0x274/0x730
[<00000000b094501c>] vfs_mkdir+0x27e/0x340
[<0000000058b0adaf>] do_mkdirat+0xff/0x1b0
[<00000000d1ffd156>] do_syscall_64+0x40/0x80
[<00000000ab1408c8>] entry_SYSCALL_64_after_hwframe+0x44/0xae
unreferenced object 0xffff88810d9e3a00 (size 192):
comm "dlm_controld", pid 342, jiffies 4294698126 (age 55438.801s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 63 6f 6d 6d 73 00 00 00 ........comms...
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000a7ef6ad2>] make_cluster+0x82/0x360
[<000000006a571db4>] configfs_mkdir+0x274/0x730
[<00000000b094501c>] vfs_mkdir+0x27e/0x340
[<0000000058b0adaf>] do_mkdirat+0xff/0x1b0
[<00000000d1ffd156>] do_syscall_64+0x40/0x80
[<00000000ab1408c8>] entry_SYSCALL_64_after_hwframe+0x44/0xae--- fs/dlm/config.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/dlm/config.c +9 -0
@@ -78,6 +78,9 @@ struct dlm_cluster {unsigned int cl_new_rsb_count;unsigned int cl_recover_callbacks;char cl_cluster_name[DLM_LOCKSPACE_LEN ]; + +struct dlm_spaces *sps; +struct dlm_comms *cms; };static struct dlm_cluster *config_item_to_cluster (struct config_item *i)
@@ -354,6 +357,9 @@ static struct config_group *make_cluster(struct config_group *g,if (!cl || !sps || !cms) goto fail; + cl->sps = sps; + cl->cms = cms; +config_group_init_type_name (&cl->group, name, &cluster_type);config_group_init_type_name (&sps->ss_group,"spaces" , &spaces_type);config_group_init_type_name (&cms->cs_group,"comms" , &comms_type);
@@ -403,6 +409,9 @@ static void drop_cluster(struct config_group *g, struct config_item *i)static void release_cluster (struct config_item *i) {struct dlm_cluster *cl =config_item_to_cluster (i); + +kfree (cl->sps); +kfree (cl->cms);kfree (cl); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 153/348 media: exynos4-is: Fix a use after free in isp_video_release
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
[ Upstream commit 01fe904c9afd26e79c1f73aa0ca2e3d785e5e319 ]
In isp_video_release, file->private_data is freed via _vb2_fop_release()->v4l2_fh_release(). But the freed file->private_data is still used in v4l2_fh_is_singular_file() ->v4l2_fh_is_singular(file->private_data), which is a use after free bug.
My patch uses a variable 'is_singular_file' to avoid the uaf.
v3: https://lore.kernel.org/patchwork/patch/1419058/
--- drivers/media/platform/exynos4-is/fimc-isp-video.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/exynos4-is/fimc-isp-video.c +5 -2
@@ -305,17 +305,20 @@ static int isp_video_release(struct file *file)struct fimc_is_video *ivc = &isp->video_capture;struct media_entity *entity = &ivc->ve.vdev.entity;struct media_device *mdev = entity->graph_obj.mdev; +bool is_singular_file;mutex_lock (&isp->video_lock); -if (v4l2_fh_is_singular_file (file) && ivc->streaming) { + is_singular_file =v4l2_fh_is_singular_file (file); + +if (is_singular_file && ivc->streaming) {media_pipeline_stop (entity); ivc->streaming =0 ; }_vb2_fop_release (file,NULL ); -if (v4l2_fh_is_singular_file (file)) { +if (is_singular_file) {fimc_pipeline_call (&ivc->ve, close);mutex_lock (&mdev->graph_mutex);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 175/348 ACPI: sysfs: Fix a buffer overrun problem with description_show()
In reply to Greg Kroah-HartmanFrom: Krzysztof Wilczyński <[email protected]>
[ Upstream commit 888be6067b97132c3992866bbcf647572253ab3f ]
Currently, a device description can be obtained using ACPI, if the _STR method exists for a particular device, and then exposed to the userspace via a sysfs object as a string value.
If the _STR method is available for a given device then the data (usually a Unicode string) is read and stored in a buffer (of the ACPI_TYPE_BUFFER type) with a pointer to said buffer cached in the struct acpi_device_pnp for later access.
The description_show() function is responsible for exposing the device description to the userspace via a corresponding sysfs object and internally calls the utf16s_to_utf8s() function with a pointer to the buffer that contains the Unicode string so that it can be converted from UTF16 encoding to UTF8 and thus allowing for the value to be safely stored and later displayed.
When invoking the utf16s_to_utf8s() function, the description_show() function also sets a limit of the data that can be saved into a provided buffer as a result of the character conversion to be a total of PAGE_SIZE, and upon completion, the utf16s_to_utf8s() function returns an integer value denoting the number of bytes that have been written into the provided buffer.
Following the execution of the utf16s_to_utf8s() a newline character will be added at the end of the resulting buffer so that when the value is read in the userspace through the sysfs object then it would include newline making it more accessible when working with the sysfs file system in the shell, etc. Normally, this wouldn't be a problem, but if the function utf16s_to_utf8s() happens to return the number of bytes written to be precisely PAGE_SIZE, then we would overrun the buffer and write the newline character outside the allotted space which can have undefined consequences or result in a failure.
To fix this buffer overrun, ensure that there always is enough space left for the newline character to be safely appended.
--- drivers/acpi/device_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/device_sysfs.c +1 -1
@@ -446,7 +446,7 @@ static ssize_t description_show(struct device *dev, (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer, acpi_dev->pnp.str_obj->buffer.length,UTF16_LITTLE_ENDIAN , buf, - PAGE_SIZE); + PAGE_SIZE - 1); buf[result++] ='\n' ;
Signature · 1 line
2.30.2