]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jul 2024 12:40:57 +0000 (14:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jul 2024 12:40:57 +0000 (14:40 +0200)
added patches:
bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch
can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch
fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch

queue-4.19/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch [new file with mode: 0644]
queue-4.19/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch [new file with mode: 0644]
queue-4.19/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch b/queue-4.19/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch
new file mode 100644 (file)
index 0000000..0876495
--- /dev/null
@@ -0,0 +1,32 @@
+From cd9151b618da4723877bd94eae952f2e50acbc0e Mon Sep 17 00:00:00 2001
+From: Jaganath Kanakkassery <jaganath.k.os@gmail.com>
+Date: Wed, 3 Apr 2019 12:11:44 +0530
+Subject: Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt
+
+From: Jaganath Kanakkassery <jaganath.k.os@gmail.com>
+
+commit cd9151b618da4723877bd94eae952f2e50acbc0e upstream.
+
+In ext_adv_report_event rssi comes before data (not after data as
+in legacy adv_report_evt) so "+ 1" is not required in the ptr arithmatic
+to point to next report.
+
+Signed-off-by: Jaganath Kanakkassery <jaganath.kanakkassery@intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/bluetooth/hci_event.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -5448,7 +5448,7 @@ static void hci_le_adv_report_evt(struct
+                       bt_dev_err(hdev, "Dropping invalid advertising data");
+               }
+-              ptr += sizeof(*ev) + ev->length + 1;
++              ptr += sizeof(*ev) + ev->length;
+       }
+       hci_dev_unlock(hdev);
diff --git a/queue-4.19/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch b/queue-4.19/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch
new file mode 100644 (file)
index 0000000..1cc3a7f
--- /dev/null
@@ -0,0 +1,33 @@
+From 19d5b2698c35b2132a355c67b4d429053804f8cc Mon Sep 17 00:00:00 2001
+From: Jimmy Assarsson <extja@kvaser.com>
+Date: Fri, 28 Jun 2024 21:45:29 +0200
+Subject: can: kvaser_usb: Explicitly initialize family in leafimx driver_info struct
+
+From: Jimmy Assarsson <extja@kvaser.com>
+
+commit 19d5b2698c35b2132a355c67b4d429053804f8cc upstream.
+
+Explicitly set the 'family' driver_info struct member for leafimx.
+Previously, the correct operation relied on KVASER_LEAF being the first
+defined value in enum kvaser_usb_leaf_family.
+
+Fixes: e6c80e601053 ("can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression")
+Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
+Link: https://lore.kernel.org/all/20240628194529.312968-1-extja@kvaser.com
+Cc: stable@vger.kernel.org
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
++++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+@@ -114,6 +114,7 @@ static const struct kvaser_usb_driver_in
+ static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = {
+       .quirks = 0,
++      .family = KVASER_LEAF,
+       .ops = &kvaser_usb_leaf_dev_ops,
+ };
diff --git a/queue-4.19/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch b/queue-4.19/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch
new file mode 100644 (file)
index 0000000..e3ca7ff
--- /dev/null
@@ -0,0 +1,44 @@
+From 702eb71fd6501b3566283f8c96d7ccc6ddd662e9 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Mon, 17 Jun 2024 18:23:00 +0200
+Subject: fsnotify: Do not generate events for O_PATH file descriptors
+
+From: Jan Kara <jack@suse.cz>
+
+commit 702eb71fd6501b3566283f8c96d7ccc6ddd662e9 upstream.
+
+Currently we will not generate FS_OPEN events for O_PATH file
+descriptors but we will generate FS_CLOSE events for them. This is
+asymmetry is confusing. Arguably no fsnotify events should be generated
+for O_PATH file descriptors as they cannot be used to access or modify
+file content, they are just convenient handles to file objects like
+paths. So fix the asymmetry by stopping to generate FS_CLOSE for O_PATH
+file descriptors.
+
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Jan Kara <jack@suse.cz>
+Link: https://lore.kernel.org/r/20240617162303.1596-1-jack@suse.cz
+Reviewed-by: Amir Goldstein <amir73il@gmail.com>
+Signed-off-by: Christian Brauner <brauner@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/fsnotify.h |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/include/linux/fsnotify.h
++++ b/include/linux/fsnotify.h
+@@ -34,7 +34,13 @@ static inline int fsnotify_perm(struct f
+       __u32 fsnotify_mask = 0;
+       int ret;
+-      if (file->f_mode & FMODE_NONOTIFY)
++      /*
++       * FMODE_NONOTIFY are fds generated by fanotify itself which should not
++       * generate new events. We also don't want to generate events for
++       * FMODE_PATH fds (involves open & close events) as they are just
++       * handle creation / destruction events and not "real" file events.
++       */
++      if (file->f_mode & (FMODE_NONOTIFY | FMODE_PATH))
+               return 0;
+       if (!(mask & (MAY_READ | MAY_OPEN)))
+               return 0;
index 6f53b8fc8b2c7c07e5227b29720c8df2baabf20c..e98664300e5f66b0055df1523d6b737e632cf16d 100644 (file)
@@ -31,3 +31,6 @@ inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch
 nilfs2-fix-inode-number-range-checks.patch
 nilfs2-add-missing-check-for-inode-numbers-on-directory-entries.patch
 mm-optimize-the-redundant-loop-of-mm_update_owner_next.patch
+bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch
+can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch
+fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch