From ac21d42c5e69bb17ce5f9b8689968a56907236ca Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 3 Apr 2022 15:17:29 +0200 Subject: [PATCH] 5.17-stable patches added patches: pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch watch_queue-free-the-page-array-when-watch_queue-is-dismantled.patch --- ...eneric-print-arguments-for-bias-pull.patch | 42 +++++++++++++++ queue-5.17/series | 2 + ...array-when-watch_queue-is-dismantled.patch | 52 +++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 queue-5.17/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch create mode 100644 queue-5.17/watch_queue-free-the-page-array-when-watch_queue-is-dismantled.patch diff --git a/queue-5.17/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch b/queue-5.17/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch new file mode 100644 index 00000000000..dab51a8f92c --- /dev/null +++ b/queue-5.17/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch @@ -0,0 +1,42 @@ +From 188e5834b930acd03ad3cf7c5e7aa24db9665a29 Mon Sep 17 00:00:00 2001 +From: Chen-Yu Tsai +Date: Tue, 8 Mar 2022 18:09:46 +0800 +Subject: pinctrl: pinconf-generic: Print arguments for bias-pull-* + +From: Chen-Yu Tsai + +commit 188e5834b930acd03ad3cf7c5e7aa24db9665a29 upstream. + +The bias-pull-* properties, or PIN_CONFIG_BIAS_PULL_* pin config +parameters, accept optional arguments in ohms denoting the strength of +the pin bias. + +Print these values out in debugfs as well. + +Fixes: eec450713e5c ("pinctrl: pinconf-generic: Add flag to print arguments") +Signed-off-by: Chen-Yu Tsai +Reviewed-by: AngeloGioacchino Del Regno +Tested-by: AngeloGioacchino Del Regno +Link: https://lore.kernel.org/r/20220308100956.2750295-2-wenst@chromium.org +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/pinconf-generic.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/pinctrl/pinconf-generic.c ++++ b/drivers/pinctrl/pinconf-generic.c +@@ -30,10 +30,10 @@ static const struct pin_config_item conf + PCONFDUMP(PIN_CONFIG_BIAS_BUS_HOLD, "input bias bus hold", NULL, false), + PCONFDUMP(PIN_CONFIG_BIAS_DISABLE, "input bias disabled", NULL, false), + PCONFDUMP(PIN_CONFIG_BIAS_HIGH_IMPEDANCE, "input bias high impedance", NULL, false), +- PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", NULL, false), ++ PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", "ohms", true), + PCONFDUMP(PIN_CONFIG_BIAS_PULL_PIN_DEFAULT, +- "input bias pull to pin specific state", NULL, false), +- PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", NULL, false), ++ "input bias pull to pin specific state", "ohms", true), ++ PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", "ohms", true), + PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL, false), + PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL, false), + PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL, false), diff --git a/queue-5.17/series b/queue-5.17/series index 60ff4642952..1f835a98350 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -1037,3 +1037,5 @@ rxrpc-fix-call-timer-start-racing-with-call-destruction.patch mailbox-imx-fix-wakeup-failure-from-freeze-mode.patch crypto-x86-poly1305-fixup-sls.patch crypto-arm-aes-neonbs-cbc-select-generic-cbc-and-aes.patch +watch_queue-free-the-page-array-when-watch_queue-is-dismantled.patch +pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch diff --git a/queue-5.17/watch_queue-free-the-page-array-when-watch_queue-is-dismantled.patch b/queue-5.17/watch_queue-free-the-page-array-when-watch_queue-is-dismantled.patch new file mode 100644 index 00000000000..6ebf897189e --- /dev/null +++ b/queue-5.17/watch_queue-free-the-page-array-when-watch_queue-is-dismantled.patch @@ -0,0 +1,52 @@ +From b490207017ba237d97b735b2aa66dc241ccd18f5 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet +Date: Mon, 28 Mar 2022 18:07:04 +0100 +Subject: watch_queue: Free the page array when watch_queue is dismantled + +From: Eric Dumazet + +commit b490207017ba237d97b735b2aa66dc241ccd18f5 upstream. + +Commit 7ea1a0124b6d ("watch_queue: Free the alloc bitmap when the +watch_queue is torn down") took care of the bitmap, but not the page +array. + + BUG: memory leak + unreferenced object 0xffff88810d9bc140 (size 32): + comm "syz-executor335", pid 3603, jiffies 4294946994 (age 12.840s) + hex dump (first 32 bytes): + 40 a7 40 04 00 ea ff ff 00 00 00 00 00 00 00 00 @.@............. + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + kmalloc_array include/linux/slab.h:621 [inline] + kcalloc include/linux/slab.h:652 [inline] + watch_queue_set_size+0x12f/0x2e0 kernel/watch_queue.c:251 + pipe_ioctl+0x82/0x140 fs/pipe.c:632 + vfs_ioctl fs/ioctl.c:51 [inline] + __do_sys_ioctl fs/ioctl.c:874 [inline] + __se_sys_ioctl fs/ioctl.c:860 [inline] + __x64_sys_ioctl+0xfc/0x140 fs/ioctl.c:860 + do_syscall_x64 arch/x86/entry/common.c:50 [inline] + +Reported-by: syzbot+25ea042ae28f3888727a@syzkaller.appspotmail.com +Fixes: c73be61cede5 ("pipe: Add general notification queue support") +Signed-off-by: Eric Dumazet +Signed-off-by: David Howells +Cc: Jann Horn +Link: https://lore.kernel.org/r/20220322004654.618274-1-eric.dumazet@gmail.com/ +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + kernel/watch_queue.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/kernel/watch_queue.c ++++ b/kernel/watch_queue.c +@@ -370,6 +370,7 @@ static void __put_watch_queue(struct kre + + for (i = 0; i < wqueue->nr_pages; i++) + __free_page(wqueue->notes[i]); ++ kfree(wqueue->notes); + bitmap_free(wqueue->notes_bitmap); + + wfilter = rcu_access_pointer(wqueue->filter); -- 2.47.3