From: Greg Kroah-Hartman Date: Fri, 10 Mar 2023 13:31:03 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v6.1.17~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbbc18dae996333b67ba07bb00bfbd60025ab15d;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: s390-dasd-add-missing-discipline-function.patch usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch --- diff --git a/queue-5.10/s390-dasd-add-missing-discipline-function.patch b/queue-5.10/s390-dasd-add-missing-discipline-function.patch new file mode 100644 index 00000000000..88d48951128 --- /dev/null +++ b/queue-5.10/s390-dasd-add-missing-discipline-function.patch @@ -0,0 +1,86 @@ +From c0c8a8397fa8a74d04915f4d3d28cb4a5d401427 Mon Sep 17 00:00:00 2001 +From: Stefan Haberland +Date: Tue, 25 May 2021 14:50:06 +0200 +Subject: s390/dasd: add missing discipline function + +From: Stefan Haberland + +commit c0c8a8397fa8a74d04915f4d3d28cb4a5d401427 upstream. + +Fix crash with illegal operation exception in dasd_device_tasklet. +Commit b72949328869 ("s390/dasd: Prepare for additional path event handling") +renamed the verify_path function for ECKD but not for FBA and DIAG. +This leads to a panic when the path verification function is called for a +FBA or DIAG device. + +Fix by defining a wrapper function for dasd_generic_verify_path(). + +Fixes: b72949328869 ("s390/dasd: Prepare for additional path event handling") +Cc: #5.11 +Reviewed-by: Jan Hoeppner +Signed-off-by: Stefan Haberland +Reviewed-by: Cornelia Huck +Link: https://lore.kernel.org/r/20210525125006.157531-2-sth@linux.ibm.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/s390/block/dasd_diag.c | 8 +++++++- + drivers/s390/block/dasd_fba.c | 8 +++++++- + drivers/s390/block/dasd_int.h | 1 - + 3 files changed, 14 insertions(+), 3 deletions(-) + +--- a/drivers/s390/block/dasd_diag.c ++++ b/drivers/s390/block/dasd_diag.c +@@ -642,12 +642,18 @@ static void dasd_diag_setup_blk_queue(st + blk_queue_segment_boundary(q, PAGE_SIZE - 1); + } + ++static int dasd_diag_pe_handler(struct dasd_device *device, ++ __u8 tbvpm, __u8 fcsecpm) ++{ ++ return dasd_generic_verify_path(device, tbvpm); ++} ++ + static struct dasd_discipline dasd_diag_discipline = { + .owner = THIS_MODULE, + .name = "DIAG", + .ebcname = "DIAG", + .check_device = dasd_diag_check_device, +- .verify_path = dasd_generic_verify_path, ++ .pe_handler = dasd_diag_pe_handler, + .fill_geometry = dasd_diag_fill_geometry, + .setup_blk_queue = dasd_diag_setup_blk_queue, + .start_IO = dasd_start_diag, +--- a/drivers/s390/block/dasd_fba.c ++++ b/drivers/s390/block/dasd_fba.c +@@ -803,13 +803,19 @@ static void dasd_fba_setup_blk_queue(str + blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); + } + ++static int dasd_fba_pe_handler(struct dasd_device *device, ++ __u8 tbvpm, __u8 fcsecpm) ++{ ++ return dasd_generic_verify_path(device, tbvpm); ++} ++ + static struct dasd_discipline dasd_fba_discipline = { + .owner = THIS_MODULE, + .name = "FBA ", + .ebcname = "FBA ", + .check_device = dasd_fba_check_characteristics, + .do_analysis = dasd_fba_do_analysis, +- .verify_path = dasd_generic_verify_path, ++ .pe_handler = dasd_fba_pe_handler, + .setup_blk_queue = dasd_fba_setup_blk_queue, + .fill_geometry = dasd_fba_fill_geometry, + .start_IO = dasd_start_IO, +--- a/drivers/s390/block/dasd_int.h ++++ b/drivers/s390/block/dasd_int.h +@@ -298,7 +298,6 @@ struct dasd_discipline { + * e.g. verify that new path is compatible with the current + * configuration. + */ +- int (*verify_path)(struct dasd_device *, __u8); + int (*pe_handler)(struct dasd_device *, __u8); + + /* diff --git a/queue-5.10/series b/queue-5.10/series index 9bb2751092f..7630e6539fc 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -525,3 +525,5 @@ scsi-mpt3sas-don-t-change-dma-mask-while-reallocating-pools.patch scsi-mpt3sas-re-do-lost-mpt3sas-dma-mask-fix.patch scsi-mpt3sas-remove-usage-of-dma_get_required_mask-api.patch malidp-fix-null-vs-is_err-checking.patch +usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch +s390-dasd-add-missing-discipline-function.patch diff --git a/queue-5.10/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch b/queue-5.10/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch new file mode 100644 index 00000000000..4bb2dd37062 --- /dev/null +++ b/queue-5.10/usb-gadget-uvc-fix-missing-mutex_unlock-if-kstrtou8-fails.patch @@ -0,0 +1,45 @@ +From 7ebb605d2283fb2647b4fa82030307ce00bee436 Mon Sep 17 00:00:00 2001 +From: Yang Yingliang +Date: Mon, 13 Feb 2023 15:09:26 +0800 +Subject: usb: gadget: uvc: fix missing mutex_unlock() if kstrtou8() fails + +From: Yang Yingliang + +commit 7ebb605d2283fb2647b4fa82030307ce00bee436 upstream. + +If kstrtou8() fails, the mutex_unlock() is missed, move kstrtou8() +before mutex_lock() to fix it up. + +Fixes: 0525210c9840 ("usb: gadget: uvc: Allow definition of XUs in configfs") +Fixes: b3c839bd8a07 ("usb: gadget: uvc: Make bSourceID read/write") +Signed-off-by: Yang Yingliang +Link: https://lore.kernel.org/r/20230213070926.776447-1-yangyingliang@huawei.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/gadget/function/uvc_configfs.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/usb/gadget/function/uvc_configfs.c ++++ b/drivers/usb/gadget/function/uvc_configfs.c +@@ -546,6 +546,10 @@ static ssize_t uvcg_default_output_b_sou + int result; + u8 num; + ++ result = kstrtou8(page, 0, &num); ++ if (result) ++ return result; ++ + mutex_lock(su_mutex); /* for navigating configfs hierarchy */ + + opts_item = group->cg_item.ci_parent->ci_parent-> +@@ -553,10 +557,6 @@ static ssize_t uvcg_default_output_b_sou + opts = to_f_uvc_opts(opts_item); + cd = &opts->uvc_output_terminal; + +- result = kstrtou8(page, 0, &num); +- if (result) +- return result; +- + mutex_lock(&opts->lock); + cd->bSourceID = num; + mutex_unlock(&opts->lock);