From: Greg Kroah-Hartman Date: Tue, 27 Mar 2018 08:30:58 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.15.14~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92d4812ff0a047c3dfb2ac724dc82ca497f19259;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: iio-abi-fix-name-of-timestamp-sysfs-file.patch staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch --- diff --git a/queue-4.9/iio-abi-fix-name-of-timestamp-sysfs-file.patch b/queue-4.9/iio-abi-fix-name-of-timestamp-sysfs-file.patch new file mode 100644 index 00000000000..0f4eb805787 --- /dev/null +++ b/queue-4.9/iio-abi-fix-name-of-timestamp-sysfs-file.patch @@ -0,0 +1,33 @@ +From b9a3589332c2a25fb7edad25a26fcaada3209126 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Tue, 5 Dec 2017 11:57:27 +0100 +Subject: iio: ABI: Fix name of timestamp sysfs file + +From: Linus Walleij + +commit b9a3589332c2a25fb7edad25a26fcaada3209126 upstream. + +The name of the file is "current_timetamp_clock" not +"timestamp_clock". + +Fixes: bc2b7dab629a ("iio:core: timestamping clock selection support") +Cc: Gregor Boirie +Signed-off-by: Linus Walleij +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/ABI/testing/sysfs-bus-iio | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/ABI/testing/sysfs-bus-iio ++++ b/Documentation/ABI/testing/sysfs-bus-iio +@@ -32,7 +32,7 @@ Description: + Description of the physical chip / device for device X. + Typically a part number. + +-What: /sys/bus/iio/devices/iio:deviceX/timestamp_clock ++What: /sys/bus/iio/devices/iio:deviceX/current_timestamp_clock + KernelVersion: 4.5 + Contact: linux-iio@vger.kernel.org + Description: diff --git a/queue-4.9/series b/queue-4.9/series index b4590e6fed8..0e95dabb670 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -55,3 +55,5 @@ perf-x86-intel-uncore-fix-skylake-upi-event-format.patch perf-stat-fix-cvs-output-format-for-non-supported-counters.patch perf-x86-intel-don-t-accidentally-clear-high-bits-in-bdw_limit_period.patch perf-x86-intel-uncore-fix-multi-domain-pci-cha-enumeration-bug-on-skylake-servers.patch +iio-abi-fix-name-of-timestamp-sysfs-file.patch +staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch diff --git a/queue-4.9/staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch b/queue-4.9/staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch new file mode 100644 index 00000000000..2e46777b9a9 --- /dev/null +++ b/queue-4.9/staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch @@ -0,0 +1,40 @@ +From c3eec59659cf25916647d2178c541302bb4822ad Mon Sep 17 00:00:00 2001 +From: Nadav Amit +Date: Tue, 5 Sep 2017 20:25:25 +0000 +Subject: staging: lustre: ptlrpc: kfree used instead of kvfree + +From: Nadav Amit + +commit c3eec59659cf25916647d2178c541302bb4822ad upstream. + +rq_reqbuf is allocated using kvmalloc() but released in one occasion +using kfree() instead of kvfree(). + +The issue was found using grep based on a similar bug. + +Fixes: d7e09d0397e8 ("add Lustre file system client support") +Fixes: ee0ec1946ec2 ("lustre: ptlrpc: Replace uses of OBD_{ALLOC,FREE}_LARGE") + +Cc: Peng Tao +Cc: Oleg Drokin +Cc: James Simmons + +Signed-off-by: Nadav Amit +Signed-off-by: Andreas Dilger +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/lustre/lustre/ptlrpc/sec.c ++++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c +@@ -838,7 +838,7 @@ void sptlrpc_request_out_callback(struct + if (req->rq_pool || !req->rq_reqbuf) + return; + +- kfree(req->rq_reqbuf); ++ kvfree(req->rq_reqbuf); + req->rq_reqbuf = NULL; + req->rq_reqbuf_len = 0; + }