diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-24 23:12:29 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-24 23:12:29 -0400 |
commit | c46c4e363194eeab1b3f8241242b7734ffa4f617 (patch) | |
tree | f6b290b8b75c026d90270fd5e8266abd10eb0d45 | |
parent | aa200b2bdafa8ebf22c63913340df4caac927981 (diff) | |
download | longterm-queue-5.2-c46c4e363194eeab1b3f8241242b7734ffa4f617.tar.gz |
re-export commits with SOB lines added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
54 files changed, 200 insertions, 146 deletions
diff --git a/queue/ALSA-hda-ca0132-Add-new-quirk-ID-for-Recon3D.patch b/queue/ALSA-hda-ca0132-Add-new-quirk-ID-for-Recon3D.patch index 07f59165..ca019f3a 100644 --- a/queue/ALSA-hda-ca0132-Add-new-quirk-ID-for-Recon3D.patch +++ b/queue/ALSA-hda-ca0132-Add-new-quirk-ID-for-Recon3D.patch @@ -1,4 +1,4 @@ -From cc5edb1bd3f7bfe450f767b12423f6673822427b Mon Sep 17 00:00:00 2001 +From 8af84657f20873f5cb719bbc2d803b55c0a1e77f Mon Sep 17 00:00:00 2001 From: Connor McAdams <conmanx360@gmail.com> Date: Sun, 2 Aug 2020 20:29:26 -0400 Subject: [PATCH] ALSA: hda/ca0132 - Add new quirk ID for Recon3D. @@ -11,9 +11,10 @@ Signed-off-by: Connor McAdams <conmanx360@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200803002928.8638-2-conmanx360@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c -index 2cbe01d59c16..40fa9d82ef95 100644 +index bc08a9f3dd9a..c225d8d41201 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1182,6 +1182,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { diff --git a/queue/ALSA-hda-ca0132-Fix-AE-5-microphone-selection-comman.patch b/queue/ALSA-hda-ca0132-Fix-AE-5-microphone-selection-comman.patch index f28a2437..b69d7219 100644 --- a/queue/ALSA-hda-ca0132-Fix-AE-5-microphone-selection-comman.patch +++ b/queue/ALSA-hda-ca0132-Fix-AE-5-microphone-selection-comman.patch @@ -1,4 +1,4 @@ -From 7fe3530427e52dd53cd7366914864e29215180a4 Mon Sep 17 00:00:00 2001 +From db4e12ca95ed700c3e38199a224e2b192330f4eb Mon Sep 17 00:00:00 2001 From: Connor McAdams <conmanx360@gmail.com> Date: Sun, 2 Aug 2020 20:29:27 -0400 Subject: [PATCH] ALSA: hda/ca0132 - Fix AE-5 microphone selection commands. @@ -12,12 +12,13 @@ Signed-off-by: Connor McAdams <conmanx360@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200803002928.8638-3-conmanx360@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c -index 40fa9d82ef95..b7dbf2e7f77a 100644 +index 39ab852ceba3..08bf3c2888a0 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c -@@ -4672,7 +4672,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec) +@@ -4671,7 +4671,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec) tmp = FLOAT_ONE; break; case QUIRK_AE5: @@ -26,7 +27,7 @@ index 40fa9d82ef95..b7dbf2e7f77a 100644 tmp = FLOAT_THREE; break; default: -@@ -4718,7 +4718,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec) +@@ -4717,7 +4717,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec) r3di_gpio_mic_set(codec, R3DI_REAR_MIC); break; case QUIRK_AE5: @@ -35,7 +36,7 @@ index 40fa9d82ef95..b7dbf2e7f77a 100644 break; default: break; -@@ -4757,7 +4757,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec) +@@ -4756,7 +4756,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec) tmp = FLOAT_ONE; break; case QUIRK_AE5: diff --git a/queue/ALSA-hda-ca0132-Fix-ZxR-Headphone-gain-control-get-v.patch b/queue/ALSA-hda-ca0132-Fix-ZxR-Headphone-gain-control-get-v.patch index 1008d416..0fa64971 100644 --- a/queue/ALSA-hda-ca0132-Fix-ZxR-Headphone-gain-control-get-v.patch +++ b/queue/ALSA-hda-ca0132-Fix-ZxR-Headphone-gain-control-get-v.patch @@ -1,4 +1,4 @@ -From a00dc409de455b64e6cb2f6d40cdb8237cdb2e83 Mon Sep 17 00:00:00 2001 +From a44a57be82ce7859c523fb57a9f3694596b86acc Mon Sep 17 00:00:00 2001 From: Connor McAdams <conmanx360@gmail.com> Date: Sun, 2 Aug 2020 20:29:25 -0400 Subject: [PATCH] ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value. @@ -13,9 +13,10 @@ Signed-off-by: Connor McAdams <conmanx360@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200803002928.8638-1-conmanx360@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c -index 19c575fd28a1..2cbe01d59c16 100644 +index c225d8d41201..39ab852ceba3 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -5748,6 +5748,11 @@ static int ca0132_switch_get(struct snd_kcontrol *kcontrol, diff --git a/queue/ALSA-hda-fix-NULL-pointer-dereference-during-suspend.patch b/queue/ALSA-hda-fix-NULL-pointer-dereference-during-suspend.patch index e92c2922..a2e4493f 100644 --- a/queue/ALSA-hda-fix-NULL-pointer-dereference-during-suspend.patch +++ b/queue/ALSA-hda-fix-NULL-pointer-dereference-during-suspend.patch @@ -1,4 +1,4 @@ -From 7fcd9bb5acd01250bcae1ecc0cb8b8d4bb5b7e63 Mon Sep 17 00:00:00 2001 +From 0bcfe5d5562fff02dfb3097e160811851d4a011a Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Date: Tue, 28 Jul 2020 16:10:11 -0700 Subject: [PATCH] ALSA: hda: fix NULL pointer dereference during suspend @@ -16,12 +16,13 @@ Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/20200728231011.1454066-1-ranjani.sridharan@linux.intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c -index 7e3ae4534df9..803978d69e3c 100644 +index 71228bbcb580..0922a8bb32d0 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c -@@ -2935,6 +2935,10 @@ static int hda_codec_runtime_suspend(struct device *dev) +@@ -2924,6 +2924,10 @@ static int hda_codec_runtime_suspend(struct device *dev) struct hda_codec *codec = dev_to_hda_codec(dev); unsigned int state; @@ -32,7 +33,7 @@ index 7e3ae4534df9..803978d69e3c 100644 cancel_delayed_work_sync(&codec->jackpoll_work); state = hda_call_codec_suspend(codec); if (codec->link_down_at_suspend || -@@ -2949,6 +2953,10 @@ static int hda_codec_runtime_resume(struct device *dev) +@@ -2938,6 +2942,10 @@ static int hda_codec_runtime_resume(struct device *dev) { struct hda_codec *codec = dev_to_hda_codec(dev); diff --git a/queue/ALSA-hda-realtek-Add-alc269-alc662-pin-tables-for-Lo.patch b/queue/ALSA-hda-realtek-Add-alc269-alc662-pin-tables-for-Lo.patch index aa8b5dbe..e84ff075 100644 --- a/queue/ALSA-hda-realtek-Add-alc269-alc662-pin-tables-for-Lo.patch +++ b/queue/ALSA-hda-realtek-Add-alc269-alc662-pin-tables-for-Lo.patch @@ -1,4 +1,4 @@ -From a1ccdd4a564d59f189414b5ec4790c748051dc6a Mon Sep 17 00:00:00 2001 +From 36c0b1a3139fae7a504252e3d63166011161d7eb Mon Sep 17 00:00:00 2001 From: Huacai Chen <chenhc@lemote.com> Date: Sun, 2 Aug 2020 17:26:40 +0800 Subject: [PATCH] ALSA: hda/realtek: Add alc269/alc662 pin-tables for @@ -14,6 +14,7 @@ Signed-off-by: Huacai Chen <chenhc@lemote.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/1596360400-32425-1-git-send-email-chenhc@lemote.com Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1cc5d149797c..e1bcc930b201 100644 diff --git a/queue/ALSA-seq-oss-Serialize-ioctls.patch b/queue/ALSA-seq-oss-Serialize-ioctls.patch index 9f514463..64d30ec5 100644 --- a/queue/ALSA-seq-oss-Serialize-ioctls.patch +++ b/queue/ALSA-seq-oss-Serialize-ioctls.patch @@ -1,4 +1,4 @@ -From 80982c7e834e5d4e325b6ce33757012ecafdf0bb Mon Sep 17 00:00:00 2001 +From a075e2e7b1c4059e94d8b81fea2fb157cb880b2b Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Tue, 4 Aug 2020 20:58:15 +0200 Subject: [PATCH] ALSA: seq: oss: Serialize ioctls @@ -21,6 +21,7 @@ Suggested-by: Hillf Danton <hdanton@sina.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200804185815.2453-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index 17f913657304..c8b9c0b315d8 100644 diff --git a/queue/Bluetooth-Fix-slab-out-of-bounds-read-in-hci_extende.patch b/queue/Bluetooth-Fix-slab-out-of-bounds-read-in-hci_extende.patch index 5f7fd8d2..70396e2c 100644 --- a/queue/Bluetooth-Fix-slab-out-of-bounds-read-in-hci_extende.patch +++ b/queue/Bluetooth-Fix-slab-out-of-bounds-read-in-hci_extende.patch @@ -1,4 +1,4 @@ -From 51c19bf3d5cfaa66571e4b88ba2a6f6295311101 Mon Sep 17 00:00:00 2001 +From b4ae49e3566a95d04b47a6d4996b88ceb81f2f2f Mon Sep 17 00:00:00 2001 From: Peilin Ye <yepeilin.cs@gmail.com> Date: Fri, 10 Jul 2020 12:09:15 -0400 Subject: [PATCH] Bluetooth: Fix slab-out-of-bounds read in @@ -19,12 +19,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index 03a0759f2fc2..13d8802b8137 100644 +index 7065c5e9bdab..6940b9c2beec 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c -@@ -4375,7 +4375,7 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, +@@ -4198,7 +4198,7 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, BT_DBG("%s num_rsp %d", hdev->name, num_rsp); diff --git a/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_.patch b/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_.patch index 76781fed..aacf964c 100644 --- a/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_.patch +++ b/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_.patch @@ -1,4 +1,4 @@ -From 629b49c848ee71244203934347bd7730b0ddee8d Mon Sep 17 00:00:00 2001 +From ef7416920dabfead759a4ac40b3b0baad8b7daee Mon Sep 17 00:00:00 2001 From: Peilin Ye <yepeilin.cs@gmail.com> Date: Fri, 10 Jul 2020 17:45:26 -0400 Subject: [PATCH] Bluetooth: Prevent out-of-bounds read in @@ -11,12 +11,13 @@ Check `num_rsp` before using it as for-loop counter. Add `unlock` label. Cc: stable@vger.kernel.org Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index b97d0247983c..61f8c4d12028 100644 +index 6940b9c2beec..13d6b34b0bdf 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c -@@ -4159,6 +4159,9 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, +@@ -3995,6 +3995,9 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct inquiry_info_with_rssi_and_pscan_mode *info; info = (void *) (skb->data + 1); @@ -26,7 +27,7 @@ index b97d0247983c..61f8c4d12028 100644 for (; num_rsp; num_rsp--, info++) { u32 flags; -@@ -4180,6 +4183,9 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, +@@ -4016,6 +4019,9 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, } else { struct inquiry_info_with_rssi *info = (void *) (skb->data + 1); @@ -36,7 +37,7 @@ index b97d0247983c..61f8c4d12028 100644 for (; num_rsp; num_rsp--, info++) { u32 flags; -@@ -4200,6 +4206,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, +@@ -4036,6 +4042,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, } } diff --git a/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_1.patch b/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_1.patch index 9bf76f0b..03b7ec30 100644 --- a/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_1.patch +++ b/queue/Bluetooth-Prevent-out-of-bounds-read-in-hci_inquiry_1.patch @@ -1,4 +1,4 @@ -From 75bbd2ea50ba1c5d9da878a17e92eac02fe0fd3a Mon Sep 17 00:00:00 2001 +From 7050d68c3bef1ba4ae6e370bf0f2cabba42968bf Mon Sep 17 00:00:00 2001 From: Peilin Ye <yepeilin.cs@gmail.com> Date: Fri, 10 Jul 2020 17:39:18 -0400 Subject: [PATCH] Bluetooth: Prevent out-of-bounds read in @@ -11,12 +11,13 @@ Check `num_rsp` before using it as for-loop counter. Cc: stable@vger.kernel.org Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index 927bde511170..b97d0247983c 100644 +index 13d6b34b0bdf..b323c65a4485 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c -@@ -2517,7 +2517,7 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) +@@ -2399,7 +2399,7 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) BT_DBG("%s num_rsp %d", hdev->name, num_rsp); diff --git a/queue/Drivers-hv-vmbus-Ignore-CHANNELMSG_TL_CONNECT_RESULT.patch b/queue/Drivers-hv-vmbus-Ignore-CHANNELMSG_TL_CONNECT_RESULT.patch index e20ca45a..34a6af0e 100644 --- a/queue/Drivers-hv-vmbus-Ignore-CHANNELMSG_TL_CONNECT_RESULT.patch +++ b/queue/Drivers-hv-vmbus-Ignore-CHANNELMSG_TL_CONNECT_RESULT.patch @@ -1,4 +1,4 @@ -From ddc9d357b991838c2d975e8d7e4e9db26f37a7ff Mon Sep 17 00:00:00 2001 +From de29a7cd73900e210a297185977fa5b6b3d9d2b9 Mon Sep 17 00:00:00 2001 From: Dexuan Cui <decui@microsoft.com> Date: Sun, 19 Jan 2020 15:29:22 -0800 Subject: [PATCH] Drivers: hv: vmbus: Ignore CHANNELMSG_TL_CONNECT_RESULT(23) @@ -24,12 +24,13 @@ So, let's not see the warning by silently ignoring the message. Signed-off-by: Dexuan Cui <decui@microsoft.com> Reviewed-by: Michael Kelley <mikelley@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c -index 8eb167540b4f..0370364169c4 100644 +index 93907dc3f02f..a8fca0279013 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c -@@ -1351,6 +1351,8 @@ channel_message_table[CHANNELMSG_COUNT] = { +@@ -1227,6 +1227,8 @@ channel_message_table[CHANNELMSG_COUNT] = { { CHANNELMSG_19, 0, NULL }, { CHANNELMSG_20, 0, NULL }, { CHANNELMSG_TL_CONNECT_REQUEST, 0, NULL }, @@ -38,7 +39,7 @@ index 8eb167540b4f..0370364169c4 100644 }; /* -@@ -1362,25 +1364,16 @@ void vmbus_onmessage(void *context) +@@ -1238,25 +1240,16 @@ void vmbus_onmessage(void *context) { struct hv_message *msg = context; struct vmbus_channel_message_header *hdr; @@ -70,10 +71,10 @@ index 8eb167540b4f..0370364169c4 100644 /* diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index 4ef5a66df680..029378c27421 100644 +index 18c5197bc191..8342028bc005 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c -@@ -1033,6 +1033,10 @@ void vmbus_on_msg_dpc(unsigned long data) +@@ -1019,6 +1019,10 @@ void vmbus_on_msg_dpc(unsigned long data) } entry = &channel_message_table[hdr->msgtype]; @@ -85,10 +86,10 @@ index 4ef5a66df680..029378c27421 100644 ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC); if (ctx == NULL) diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h -index 26f3aeeae1ca..41c58011431e 100644 +index 6256cc34c4a6..e02b3dd76242 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h -@@ -425,6 +425,8 @@ enum vmbus_channel_message_type { +@@ -420,6 +420,8 @@ enum vmbus_channel_message_type { CHANNELMSG_19 = 19, CHANNELMSG_20 = 20, CHANNELMSG_TL_CONNECT_REQUEST = 21, diff --git a/queue/Smack-fix-use-after-free-in-smk_write_relabel_self.patch b/queue/Smack-fix-use-after-free-in-smk_write_relabel_self.patch index d3fdbb8c..b752a2dc 100644 --- a/queue/Smack-fix-use-after-free-in-smk_write_relabel_self.patch +++ b/queue/Smack-fix-use-after-free-in-smk_write_relabel_self.patch @@ -1,4 +1,4 @@ -From beb4ee6770a89646659e6a2178538d2b13e2654e Mon Sep 17 00:00:00 2001 +From c3682e1ccb35ade61400554486cb19973231f03e Mon Sep 17 00:00:00 2001 From: Eric Biggers <ebiggers@google.com> Date: Wed, 8 Jul 2020 13:15:20 -0700 Subject: [PATCH] Smack: fix use-after-free in smk_write_relabel_self() @@ -36,12 +36,13 @@ Fixes: 38416e53936e ("Smack: limited capability for changing process label") Cc: <stable@vger.kernel.org> # v4.4+ Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c -index c21b656b3263..840a192e9337 100644 +index 20de7f1f1f41..5ff9e65cf253 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c -@@ -2720,7 +2720,6 @@ static int smk_open_relabel_self(struct inode *inode, struct file *file) +@@ -2719,7 +2719,6 @@ static int smk_open_relabel_self(struct inode *inode, struct file *file) static ssize_t smk_write_relabel_self(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -49,7 +50,7 @@ index c21b656b3263..840a192e9337 100644 char *data; int rc; LIST_HEAD(list_tmp); -@@ -2745,11 +2744,21 @@ static ssize_t smk_write_relabel_self(struct file *file, const char __user *buf, +@@ -2744,11 +2743,21 @@ static ssize_t smk_write_relabel_self(struct file *file, const char __user *buf, kfree(data); if (!rc || (rc == -EINVAL && list_empty(&list_tmp))) { diff --git a/queue/Staging-rtl8188eu-rtw_mlme-Fix-uninitialized-variabl.patch b/queue/Staging-rtl8188eu-rtw_mlme-Fix-uninitialized-variabl.patch index aa653acc..aa5e9f69 100644 --- a/queue/Staging-rtl8188eu-rtw_mlme-Fix-uninitialized-variabl.patch +++ b/queue/Staging-rtl8188eu-rtw_mlme-Fix-uninitialized-variabl.patch @@ -1,4 +1,4 @@ -From 5f520603be66c4f9cc9fe9bb732ff74a1301cb73 Mon Sep 17 00:00:00 2001 +From 3ea26746c857f0eef4019debef3fe000af3213fb Mon Sep 17 00:00:00 2001 From: Dinghao Liu <dinghao.liu@zju.edu.cn> Date: Tue, 28 Jul 2020 15:21:51 +0800 Subject: [PATCH] Staging: rtl8188eu: rtw_mlme: Fix uninitialized variable @@ -18,6 +18,7 @@ Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200728072153.9202-1-dinghao.liu@zju.edu.cn Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c index 9a4aad5ec365..24c0ec1674b1 100644 diff --git a/queue/USB-serial-qcserial-add-EM7305-QDL-product-ID.patch b/queue/USB-serial-qcserial-add-EM7305-QDL-product-ID.patch index 2d30de44..840ee4dc 100644 --- a/queue/USB-serial-qcserial-add-EM7305-QDL-product-ID.patch +++ b/queue/USB-serial-qcserial-add-EM7305-QDL-product-ID.patch @@ -1,4 +1,4 @@ -From d2a4309c1ab6df424b2239fe2920d6f26f808d17 Mon Sep 17 00:00:00 2001 +From 7a5f89f0591be4875f8dced80e230ce6c9d374d3 Mon Sep 17 00:00:00 2001 From: Erik Ekman <erik@kryo.se> Date: Fri, 17 Jul 2020 20:51:18 +0200 Subject: [PATCH] USB: serial: qcserial: add EM7305 QDL product ID @@ -24,9 +24,10 @@ Signed-off-by: Erik Ekman <erik@kryo.se> Link: https://lore.kernel.org/r/20200717185118.3640219-1-erik@kryo.se Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c -index 5dfbbaef38bb..c8d1ea0e6e6f 100644 +index d147feae83e6..0f60363c1bbc 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c @@ -155,6 +155,7 @@ static const struct usb_device_id id_table[] = { diff --git a/queue/appletalk-Fix-atalk_proc_init-return-path.patch b/queue/appletalk-Fix-atalk_proc_init-return-path.patch index 2d238095..db93e441 100644 --- a/queue/appletalk-Fix-atalk_proc_init-return-path.patch +++ b/queue/appletalk-Fix-atalk_proc_init-return-path.patch @@ -1,4 +1,4 @@ -From d0f6ba2ef2c1c95069509e71402e7d6d43452512 Mon Sep 17 00:00:00 2001 +From 53b107987a351a0600505909c01916dfe52b2921 Mon Sep 17 00:00:00 2001 From: Vincent Duvert <vincent.ldev@duvert.net> Date: Sun, 2 Aug 2020 07:06:51 +0200 Subject: [PATCH] appletalk: Fix atalk_proc_init() return path @@ -19,6 +19,7 @@ Signed-off-by: Lukas Wunner <lukas@wunner.de> Cc: stable@vger.kernel.org # v5.1+ Cc: Yue Haibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c index 550c6ca007cc..9c1241292d1d 100644 diff --git a/queue/atm-fix-atm_dev-refcnt-leaks-in-atmtcp_remove_persis.patch b/queue/atm-fix-atm_dev-refcnt-leaks-in-atmtcp_remove_persis.patch index 6dca3844..f1204930 100644 --- a/queue/atm-fix-atm_dev-refcnt-leaks-in-atmtcp_remove_persis.patch +++ b/queue/atm-fix-atm_dev-refcnt-leaks-in-atmtcp_remove_persis.patch @@ -1,4 +1,4 @@ -From 51875dad43b44241b46a569493f1e4bfa0386d86 Mon Sep 17 00:00:00 2001 +From f2041860a73bb7aa59275f2010a02e3a81ad3864 Mon Sep 17 00:00:00 2001 From: Xin Xiong <xiongx18@fudan.edu.cn> Date: Wed, 29 Jul 2020 21:06:59 +0800 Subject: [PATCH] atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent @@ -20,6 +20,7 @@ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn> Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c index d9fd70280482..7f814da3c2d0 100644 diff --git a/queue/binder-Prevent-context-manager-from-incrementing-ref.patch b/queue/binder-Prevent-context-manager-from-incrementing-ref.patch index fad91e9c..f9aa09a4 100644 --- a/queue/binder-Prevent-context-manager-from-incrementing-ref.patch +++ b/queue/binder-Prevent-context-manager-from-incrementing-ref.patch @@ -1,4 +1,4 @@ -From 4b836a1426cb0f1ef2a6e211d7e553221594f8fc Mon Sep 17 00:00:00 2001 +From 7f892af47720ebe3345a2b34accf48b3df36042f Mon Sep 17 00:00:00 2001 From: Jann Horn <jannh@google.com> Date: Mon, 27 Jul 2020 14:04:24 +0200 Subject: [PATCH] binder: Prevent context manager from incrementing ref 0 @@ -49,12 +49,13 @@ Signed-off-by: Jann Horn <jannh@google.com> Reviewed-by: Martijn Coenen <maco@android.com> Link: https://lore.kernel.org/r/20200727120424.1627555-1-jannh@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/android/binder.c b/drivers/android/binder.c -index f50c5f182bb5..5b310eea9e52 100644 +index ae649044112b..4fe23f28514e 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c -@@ -2982,6 +2982,12 @@ static void binder_transaction(struct binder_proc *proc, +@@ -3002,6 +3002,12 @@ static void binder_transaction(struct binder_proc *proc, goto err_dead_binder; } e->to_node = target_node->debug_id; @@ -67,7 +68,7 @@ index f50c5f182bb5..5b310eea9e52 100644 if (security_binder_transaction(proc->tsk, target_proc->tsk) < 0) { return_error = BR_FAILED_REPLY; -@@ -3635,10 +3641,17 @@ static int binder_thread_write(struct binder_proc *proc, +@@ -3655,10 +3661,17 @@ static int binder_thread_write(struct binder_proc *proc, struct binder_node *ctx_mgr_node; mutex_lock(&context->context_mgr_node_lock); ctx_mgr_node = context->binder_context_mgr_node; diff --git a/queue/cfg80211-check-vendor-command-doit-pointer-before-us.patch b/queue/cfg80211-check-vendor-command-doit-pointer-before-us.patch index 3093e95d..b05f3889 100644 --- a/queue/cfg80211-check-vendor-command-doit-pointer-before-us.patch +++ b/queue/cfg80211-check-vendor-command-doit-pointer-before-us.patch @@ -1,4 +1,4 @@ -From 4052d3d2e8f47a15053320bbcbe365d15610437d Mon Sep 17 00:00:00 2001 +From d56bb7d86df9636497c74e02c35568dab3906577 Mon Sep 17 00:00:00 2001 From: Julian Squires <julian@cipht.net> Date: Mon, 6 Jul 2020 17:13:53 -0400 Subject: [PATCH] cfg80211: check vendor command doit pointer before use @@ -17,12 +17,13 @@ when NEED_WDEV. Signed-off-by: Julian Squires <julian@cipht.net> Link: https://lore.kernel.org/r/20200706211353.2366470-1-julian@cipht.net Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c -index 0e07fb8585fb..7fbca0854265 100644 +index 79e3e1f8a62c..f4f2d3e23a54 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -13266,13 +13266,13 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info) +@@ -12760,13 +12760,13 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info) if (!wdev_running(wdev)) return -ENETDOWN; } diff --git a/queue/dpaa2-eth-Fix-passing-zero-to-PTR_ERR-warning.patch b/queue/dpaa2-eth-Fix-passing-zero-to-PTR_ERR-warning.patch index 1831609b..34663411 100644 --- a/queue/dpaa2-eth-Fix-passing-zero-to-PTR_ERR-warning.patch +++ b/queue/dpaa2-eth-Fix-passing-zero-to-PTR_ERR-warning.patch @@ -1,4 +1,4 @@ -From 02afa9c66bb954c6959877c70d9e128dcf0adce7 Mon Sep 17 00:00:00 2001 +From 21668d77f0faf0ac271d8cfb97752cf67799d4a4 Mon Sep 17 00:00:00 2001 From: YueHaibing <yuehaibing@huawei.com> Date: Tue, 4 Aug 2020 21:26:43 +0800 Subject: [PATCH] dpaa2-eth: Fix passing zero to 'PTR_ERR' warning @@ -16,12 +16,13 @@ handling case. Fixes: d7f5a9d89a55 ("dpaa2-eth: defer probe on object allocate") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -index 83b1e974bff0..457106e761be 100644 +index 3f16661cfc47..c977c58dd3df 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -2370,7 +2370,7 @@ static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv) +@@ -1947,7 +1947,7 @@ static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv) free: fsl_mc_object_free(dpcon); @@ -30,7 +31,7 @@ index 83b1e974bff0..457106e761be 100644 } static void free_dpcon(struct dpaa2_eth_priv *priv, -@@ -2394,8 +2394,8 @@ alloc_channel(struct dpaa2_eth_priv *priv) +@@ -1971,8 +1971,8 @@ alloc_channel(struct dpaa2_eth_priv *priv) return NULL; channel->dpcon = setup_dpcon(priv); diff --git a/queue/drm-drm_fb_helper-fix-fbdev-with-sparc64.patch b/queue/drm-drm_fb_helper-fix-fbdev-with-sparc64.patch index 9f725429..b688daff 100644 --- a/queue/drm-drm_fb_helper-fix-fbdev-with-sparc64.patch +++ b/queue/drm-drm_fb_helper-fix-fbdev-with-sparc64.patch @@ -1,4 +1,4 @@ -From 00d740fa4f7107f2d58fe02cd1cc5a383128e073 Mon Sep 17 00:00:00 2001 +From d022350fce8141129a3f4e6be76b15b503844369 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg <sam@ravnborg.org> Date: Thu, 9 Jul 2020 21:30:16 +0200 Subject: [PATCH] drm/drm_fb_helper: fix fbdev with sparc64 @@ -49,6 +49,7 @@ Cc: "David S. Miller" <davem@davemloft.net> Cc: sparclinux@vger.kernel.org Link: https://patchwork.freedesktop.org/patch/msgid/20200709193016.291267-1-sam@ravnborg.org Link: https://patchwork.freedesktop.org/patch/msgid/20200725191012.GA434957@ravnborg.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 37e515221ad8..6f42db56c20c 100644 diff --git a/queue/drm-nouveau-fbcon-fix-module-unload-when-fbcon-init-.patch b/queue/drm-nouveau-fbcon-fix-module-unload-when-fbcon-init-.patch index c7fc19e8..461c5054 100644 --- a/queue/drm-nouveau-fbcon-fix-module-unload-when-fbcon-init-.patch +++ b/queue/drm-nouveau-fbcon-fix-module-unload-when-fbcon-init-.patch @@ -1,4 +1,4 @@ -From 498595abf5bd51f0ae074cec565d888778ea558f Mon Sep 17 00:00:00 2001 +From 21ebf44f9eba007730bb130d318cf00f55d418c4 Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Fri, 24 Jul 2020 17:01:39 +1000 Subject: [PATCH] drm/nouveau/fbcon: fix module unload when fbcon init has @@ -9,12 +9,13 @@ commit 498595abf5bd51f0ae074cec565d888778ea558f upstream. Stale pointer was tripping up the unload path. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c -index 3d11b84d4cf9..843928ec059e 100644 +index 73cc3217068a..7ed56309a01c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c -@@ -590,6 +590,7 @@ nouveau_fbcon_init(struct drm_device *dev) +@@ -592,6 +592,7 @@ nouveau_fbcon_init(struct drm_device *dev) drm_fb_helper_fini(&fbcon->helper); free: kfree(fbcon); diff --git a/queue/drm-nouveau-fbcon-zero-initialise-the-mode_cmd2-stru.patch b/queue/drm-nouveau-fbcon-zero-initialise-the-mode_cmd2-stru.patch index 83b0b750..072c4149 100644 --- a/queue/drm-nouveau-fbcon-zero-initialise-the-mode_cmd2-stru.patch +++ b/queue/drm-nouveau-fbcon-zero-initialise-the-mode_cmd2-stru.patch @@ -1,4 +1,4 @@ -From 5f7bfb229d0e746b4d7aceea86bb5843aee4bbbb Mon Sep 17 00:00:00 2001 +From 49820194fe1fb1ca352f0bf6b397ebdd4d863d1a Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Fri, 24 Jul 2020 17:02:48 +1000 Subject: [PATCH] drm/nouveau/fbcon: zero-initialise the mode_cmd2 structure @@ -8,6 +8,7 @@ commit 15fbc3b938534cc8eaac584a7b0c1183fc968b86 upstream. This is tripping up the format modifier patches. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 7ed56309a01c..d323b7e99def 100644 diff --git a/queue/firmware-Fix-a-reference-count-leak.patch b/queue/firmware-Fix-a-reference-count-leak.patch index 8b978850..dc3c14a1 100644 --- a/queue/firmware-Fix-a-reference-count-leak.patch +++ b/queue/firmware-Fix-a-reference-count-leak.patch @@ -1,4 +1,4 @@ -From fe3c60684377d5ad9b0569b87ed3e26e12c8173b Mon Sep 17 00:00:00 2001 +From 9cc69de41ca86caa0de04e3f22df43174c2e511a Mon Sep 17 00:00:00 2001 From: Qiushi Wu <wu000273@umn.edu> Date: Sat, 13 Jun 2020 14:05:33 -0500 Subject: [PATCH] firmware: Fix a reference count leak. @@ -14,6 +14,7 @@ can handle the pointer "entry" properly. Signed-off-by: Qiushi Wu <wu000273@umn.edu> Link: https://lore.kernel.org/r/20200613190533.15712-1-wu000273@umn.edu Signed-off-by: Michael S. Tsirkin <mst@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 039e0f91dba8..6945c3c96637 100644 diff --git a/queue/hv_netvsc-do-not-use-VF-device-if-link-is-down.patch b/queue/hv_netvsc-do-not-use-VF-device-if-link-is-down.patch index a5621948..beae8bc2 100644 --- a/queue/hv_netvsc-do-not-use-VF-device-if-link-is-down.patch +++ b/queue/hv_netvsc-do-not-use-VF-device-if-link-is-down.patch @@ -1,4 +1,4 @@ -From 7c9864bbccc23e1812ac82966555d68c13ea4006 Mon Sep 17 00:00:00 2001 +From d1576c95f516d748bce41927c5b33a143db1fa9b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger <stephen@networkplumber.org> Date: Tue, 4 Aug 2020 09:54:15 -0700 Subject: [PATCH] hv_netvsc: do not use VF device if link is down @@ -17,12 +17,13 @@ Fixes: 0c195567a8f6 ("netvsc: transparent VF management") Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c -index d27b90b4e2bb..787f17e2a971 100644 +index 15447151ddc4..b61d895b6a63 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c -@@ -532,12 +532,13 @@ static int netvsc_xmit(struct sk_buff *skb, struct net_device *net, bool xdp_tx) +@@ -531,12 +531,13 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) u32 hash; struct hv_page_buffer pb[MAX_PAGE_BUFFER_COUNT]; diff --git a/queue/i2c-slave-add-sanity-check-when-unregistering.patch b/queue/i2c-slave-add-sanity-check-when-unregistering.patch index 420d95fe..68562073 100644 --- a/queue/i2c-slave-add-sanity-check-when-unregistering.patch +++ b/queue/i2c-slave-add-sanity-check-when-unregistering.patch @@ -1,4 +1,4 @@ -From 8808981baf96e1b3dea1f08461e4d958aa0dbde1 Mon Sep 17 00:00:00 2001 +From fa340e8900641a65ef13eca2d81f2dba418787eb Mon Sep 17 00:00:00 2001 From: Wolfram Sang <wsa+renesas@sang-engineering.com> Date: Sat, 25 Jul 2020 21:50:53 +0200 Subject: [PATCH] i2c: slave: add sanity check when unregistering @@ -8,6 +8,7 @@ commit 8808981baf96e1b3dea1f08461e4d958aa0dbde1 upstream. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Alain Volmat <alain.volmat@st.com> Signed-off-by: Wolfram Sang <wsa@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/i2c-core-slave.c b/drivers/i2c/i2c-core-slave.c index 549751347e6c..1589179d5eb9 100644 diff --git a/queue/i2c-slave-improve-sanity-check-when-registering.patch b/queue/i2c-slave-improve-sanity-check-when-registering.patch index 24571daf..2a80150e 100644 --- a/queue/i2c-slave-improve-sanity-check-when-registering.patch +++ b/queue/i2c-slave-improve-sanity-check-when-registering.patch @@ -1,4 +1,4 @@ -From 1b1be3bf27b62f5abcf85c6f3214bdb9c7526685 Mon Sep 17 00:00:00 2001 +From d69d84154947f419ded73c47de0e568f51c05abe Mon Sep 17 00:00:00 2001 From: Wolfram Sang <wsa+renesas@sang-engineering.com> Date: Sat, 25 Jul 2020 21:50:52 +0200 Subject: [PATCH] i2c: slave: improve sanity check when registering @@ -10,6 +10,7 @@ Add check for ERR_PTR and simplify code while here. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Alain Volmat <alain.volmat@st.com> Signed-off-by: Wolfram Sang <wsa@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/i2c-core-slave.c b/drivers/i2c/i2c-core-slave.c index 5427f047faf0..549751347e6c 100644 diff --git a/queue/igb-reinit_locked-should-be-called-with-rtnl_lock.patch b/queue/igb-reinit_locked-should-be-called-with-rtnl_lock.patch index 4c89b0b2..9b85b188 100644 --- a/queue/igb-reinit_locked-should-be-called-with-rtnl_lock.patch +++ b/queue/igb-reinit_locked-should-be-called-with-rtnl_lock.patch @@ -1,4 +1,4 @@ -From 024a8168b749db7a4aa40a5fbdfa04bf7e77c1c0 Mon Sep 17 00:00:00 2001 +From d90c162430159bf49140202236c49980add34447 Mon Sep 17 00:00:00 2001 From: Francesco Ruggeri <fruggeri@arista.com> Date: Thu, 2 Jul 2020 15:39:06 -0700 Subject: [PATCH] igb: reinit_locked() should be called with rtnl_lock @@ -57,12 +57,13 @@ reset subtask"). Signed-off-by: Francesco Ruggeri <fruggeri@arista.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index 8bb3db2cbd41..6e5861bfb0fa 100644 +index a7e52e33c90a..879ade3adefc 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -6224,9 +6224,18 @@ static void igb_reset_task(struct work_struct *work) +@@ -6205,9 +6205,18 @@ static void igb_reset_task(struct work_struct *work) struct igb_adapter *adapter; adapter = container_of(work, struct igb_adapter, reset_task); diff --git a/queue/ima-move-APPRAISE_BOOTPARAM-dependency-on-ARCH_POLIC.patch b/queue/ima-move-APPRAISE_BOOTPARAM-dependency-on-ARCH_POLIC.patch index 2b3e7654..5db5f705 100644 --- a/queue/ima-move-APPRAISE_BOOTPARAM-dependency-on-ARCH_POLIC.patch +++ b/queue/ima-move-APPRAISE_BOOTPARAM-dependency-on-ARCH_POLIC.patch @@ -1,4 +1,4 @@ -From 311aa6aafea446c2f954cc19d66425bfed8c4b0b Mon Sep 17 00:00:00 2001 +From b9978846c6422625afd94147c7d4e0763b1223f7 Mon Sep 17 00:00:00 2001 From: Bruno Meneguele <bmeneg@redhat.com> Date: Mon, 13 Jul 2020 13:48:30 -0300 Subject: [PATCH] ima: move APPRAISE_BOOTPARAM dependency on ARCH_POLICY to @@ -50,12 +50,13 @@ Fixes: d958083a8f64 ("x86/ima: define arch_get_ima_policy() for x86") Signed-off-by: Bruno Meneguele <bmeneg@redhat.com> Cc: stable@vger.kernel.org # 5.0 Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig -index 794ebb5cbf74..080c53545ff0 100644 +index 2692c7358c2c..3ae199689d17 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig -@@ -232,7 +232,7 @@ config IMA_APPRAISE_REQUIRE_POLICY_SIGS +@@ -226,7 +226,7 @@ config IMA_APPRAISE_REQUIRE_POLICY_SIGS config IMA_APPRAISE_BOOTPARAM bool "ima_appraise boot parameter" @@ -65,10 +66,10 @@ index 794ebb5cbf74..080c53545ff0 100644 help This option enables the different "ima_appraise=" modes diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c -index 6c52bf7ea7f0..372d16382960 100644 +index f0cd67cab6aa..9e2a3993a922 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c -@@ -19,6 +19,12 @@ +@@ -18,6 +18,12 @@ static int __init default_appraise_setup(char *str) { #ifdef CONFIG_IMA_APPRAISE_BOOTPARAM diff --git a/queue/ipv4-Silence-suspicious-RCU-usage-warning.patch b/queue/ipv4-Silence-suspicious-RCU-usage-warning.patch index 2928aa95..225a10ed 100644 --- a/queue/ipv4-Silence-suspicious-RCU-usage-warning.patch +++ b/queue/ipv4-Silence-suspicious-RCU-usage-warning.patch @@ -1,4 +1,4 @@ -From 83f3522860f702748143e022f1a546547314c715 Mon Sep 17 00:00:00 2001 +From cc119d9eddaccc01b1bd091bafabce490757c797 Mon Sep 17 00:00:00 2001 From: Ido Schimmel <idosch@mellanox.com> Date: Wed, 29 Jul 2020 11:37:13 +0300 Subject: [PATCH] ipv4: Silence suspicious RCU usage warning @@ -60,12 +60,13 @@ Fixes: 0ddcf43d5d4a ("ipv4: FIB Local/MAIN table collapse") Signed-off-by: Ido Schimmel <idosch@mellanox.com> Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c -index 248f1c1959a6..3c65f71d0e82 100644 +index 77da7df84494..4c6f04b6afba 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -1864,7 +1864,7 @@ struct fib_table *fib_trie_unmerge(struct fib_table *oldtb) +@@ -1738,7 +1738,7 @@ struct fib_table *fib_trie_unmerge(struct fib_table *oldtb) while ((l = leaf_walk_rcu(&tp, key)) != NULL) { struct key_vector *local_l = NULL, *local_tp; diff --git a/queue/ipv6-fix-memory-leaks-on-IPV6_ADDRFORM-path.patch b/queue/ipv6-fix-memory-leaks-on-IPV6_ADDRFORM-path.patch index 6837e810..6496feeb 100644 --- a/queue/ipv6-fix-memory-leaks-on-IPV6_ADDRFORM-path.patch +++ b/queue/ipv6-fix-memory-leaks-on-IPV6_ADDRFORM-path.patch @@ -1,4 +1,4 @@ -From 8c0de6e96c9794cb523a516c465991a70245da1c Mon Sep 17 00:00:00 2001 +From 936fc32fd9c4750b86d86f14599ac07beb6c7f03 Mon Sep 17 00:00:00 2001 From: Cong Wang <xiyou.wangcong@gmail.com> Date: Sat, 25 Jul 2020 15:40:53 -0700 Subject: [PATCH] ipv6: fix memory leaks on IPV6_ADDRFORM path @@ -44,12 +44,13 @@ Reported-by: ch3332xr@gmail.com Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/net/addrconf.h b/include/net/addrconf.h -index fdb07105384c..8418b7d38468 100644 +index 3f62b347b04a..ab8b3eb53d4b 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h -@@ -274,6 +274,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, +@@ -273,6 +273,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr); int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr); @@ -58,7 +59,7 @@ index fdb07105384c..8418b7d38468 100644 int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr); diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c -index 893261230ffc..dacdea7fcb62 100644 +index fed91ab7ec46..cf3a88a10ddd 100644 --- a/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c @@ -183,7 +183,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) @@ -100,10 +101,10 @@ index 893261230ffc..dacdea7fcb62 100644 } diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c -index 20576e87a5f7..76f9e41859a2 100644 +index 7bef41308be7..0716282ea85d 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c -@@ -240,6 +240,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, +@@ -205,6 +205,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, fl6_free_socklist(sk); __ipv6_sock_mc_close(sk); diff --git a/queue/leds-88pm860x-fix-use-after-free-on-unbind.patch b/queue/leds-88pm860x-fix-use-after-free-on-unbind.patch index 8d0212ca..837b25aa 100644 --- a/queue/leds-88pm860x-fix-use-after-free-on-unbind.patch +++ b/queue/leds-88pm860x-fix-use-after-free-on-unbind.patch @@ -1,4 +1,4 @@ -From eca21c2d8655387823d695b26e6fe78cf3975c05 Mon Sep 17 00:00:00 2001 +From c2226dbe6490de753c3e00145169646fcb87f0ad Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 1 Jun 2020 15:39:45 +0200 Subject: [PATCH] leds: 88pm860x: fix use-after-free on unbind @@ -16,6 +16,7 @@ Cc: stable <stable@vger.kernel.org> # 4.6 Cc: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c index b3044c9a8120..465c3755cf2e 100644 diff --git a/queue/leds-da903x-fix-use-after-free-on-unbind.patch b/queue/leds-da903x-fix-use-after-free-on-unbind.patch index 1e7c44fd..beb01930 100644 --- a/queue/leds-da903x-fix-use-after-free-on-unbind.patch +++ b/queue/leds-da903x-fix-use-after-free-on-unbind.patch @@ -1,4 +1,4 @@ -From 6f4aa35744f69ed9b0bf5a736c9ca9b44bc1dcea Mon Sep 17 00:00:00 2001 +From 3808d09cf9ee798e90a63738079ada646812276e Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 1 Jun 2020 15:39:46 +0200 Subject: [PATCH] leds: da903x: fix use-after-free on unbind @@ -16,6 +16,7 @@ Cc: stable <stable@vger.kernel.org> # 4.6 Cc: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c index ed1b303f699f..2b5fb00438a2 100644 diff --git a/queue/leds-lm3533-fix-use-after-free-on-unbind.patch b/queue/leds-lm3533-fix-use-after-free-on-unbind.patch index 2f17381f..df9c2a59 100644 --- a/queue/leds-lm3533-fix-use-after-free-on-unbind.patch +++ b/queue/leds-lm3533-fix-use-after-free-on-unbind.patch @@ -1,4 +1,4 @@ -From d584221e683bbd173738603b83a315f27d27d043 Mon Sep 17 00:00:00 2001 +From 2515fc01cd1ace14aa49f56258e73974ef4ef0b6 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 1 Jun 2020 15:39:47 +0200 Subject: [PATCH] leds: lm3533: fix use-after-free on unbind @@ -16,6 +16,7 @@ Cc: stable <stable@vger.kernel.org> # 4.6 Cc: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c index 9504ad405aef..b3edee703193 100644 diff --git a/queue/leds-wm831x-status-fix-use-after-free-on-unbind.patch b/queue/leds-wm831x-status-fix-use-after-free-on-unbind.patch index 1f0a93cd..2023c707 100644 --- a/queue/leds-wm831x-status-fix-use-after-free-on-unbind.patch +++ b/queue/leds-wm831x-status-fix-use-after-free-on-unbind.patch @@ -1,4 +1,4 @@ -From 47a459ecc800a17109d0c496a4e21e478806ee40 Mon Sep 17 00:00:00 2001 +From 82b35082f05b49ca3afdc98ef4380544df1f40b0 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 1 Jun 2020 15:39:49 +0200 Subject: [PATCH] leds: wm831x-status: fix use-after-free on unbind @@ -16,6 +16,7 @@ Cc: stable <stable@vger.kernel.org> # 4.6 Cc: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c index 082df7f1dd90..67f4235cb28a 100644 diff --git a/queue/mtd-properly-check-all-write-ioctls-for-permissions.patch b/queue/mtd-properly-check-all-write-ioctls-for-permissions.patch index e3558a6f..f74487e4 100644 --- a/queue/mtd-properly-check-all-write-ioctls-for-permissions.patch +++ b/queue/mtd-properly-check-all-write-ioctls-for-permissions.patch @@ -1,4 +1,4 @@ -From f7e6b19bc76471ba03725fe58e0c218a3d6266c3 Mon Sep 17 00:00:00 2001 +From 0f221da335b177a11878aa5f66472b611e96a852 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Thu, 16 Jul 2020 13:53:46 +0200 Subject: [PATCH] mtd: properly check all write ioctls for permissions @@ -17,12 +17,13 @@ Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [rw: Fixed locking issue] Signed-off-by: Richard Weinberger <richard@nod.at> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c -index c5935b2f9cd1..b40f46a43fc6 100644 +index 975aed94f06c..48832f9b215c 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c -@@ -355,9 +355,6 @@ static int mtdchar_writeoob(struct file *file, struct mtd_info *mtd, +@@ -354,9 +354,6 @@ static int mtdchar_writeoob(struct file *file, struct mtd_info *mtd, uint32_t retlen; int ret = 0; @@ -32,7 +33,7 @@ index c5935b2f9cd1..b40f46a43fc6 100644 if (length > 4096) return -EINVAL; -@@ -643,6 +640,48 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) +@@ -641,6 +638,48 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) pr_debug("MTD_ioctl\n"); @@ -81,7 +82,7 @@ index c5935b2f9cd1..b40f46a43fc6 100644 switch (cmd) { case MEMGETREGIONCOUNT: if (copy_to_user(argp, &(mtd->numeraseregions), sizeof(int))) -@@ -690,9 +729,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) +@@ -688,9 +727,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) { struct erase_info *erase; @@ -91,7 +92,7 @@ index c5935b2f9cd1..b40f46a43fc6 100644 erase=kzalloc(sizeof(struct erase_info),GFP_KERNEL); if (!erase) ret = -ENOMEM; -@@ -985,9 +1021,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) +@@ -983,9 +1019,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) ret = 0; break; } @@ -101,7 +102,7 @@ index c5935b2f9cd1..b40f46a43fc6 100644 } return ret; -@@ -1031,6 +1064,11 @@ static long mtdchar_compat_ioctl(struct file *file, unsigned int cmd, +@@ -1029,6 +1062,11 @@ static long mtdchar_compat_ioctl(struct file *file, unsigned int cmd, struct mtd_oob_buf32 buf; struct mtd_oob_buf32 __user *buf_user = argp; diff --git a/queue/net-9p-validate-fds-in-p9_fd_open.patch b/queue/net-9p-validate-fds-in-p9_fd_open.patch index dc8582d8..7dbd08f2 100644 --- a/queue/net-9p-validate-fds-in-p9_fd_open.patch +++ b/queue/net-9p-validate-fds-in-p9_fd_open.patch @@ -1,4 +1,4 @@ -From a39c46067c845a8a2d7144836e9468b7f072343e Mon Sep 17 00:00:00 2001 +From 44f5f2e5027403b0545df56598290e8c2cc62c91 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Fri, 10 Jul 2020 10:57:22 +0200 Subject: [PATCH] net/9p: validate fds in p9_fd_open @@ -17,12 +17,13 @@ Reported-by: syzbot+e6f77e16ff68b2434a2c@syzkaller.appspotmail.com Signed-off-by: Christoph Hellwig <hch@lst.de> [Dominique: amend goto as per Doug Nazar's review] Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c -index 13cd683a658a..9c9196d30a59 100644 +index 3f67803123be..12ecacf0c55f 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c -@@ -803,20 +803,28 @@ static int p9_fd_open(struct p9_client *client, int rfd, int wfd) +@@ -816,20 +816,28 @@ static int p9_fd_open(struct p9_client *client, int rfd, int wfd) return -ENOMEM; ts->rd = fget(rfd); diff --git a/queue/net-gre-recompute-gre-csum-for-sctp-over-gre-tunnels.patch b/queue/net-gre-recompute-gre-csum-for-sctp-over-gre-tunnels.patch index 01dc5541..de4802d8 100644 --- a/queue/net-gre-recompute-gre-csum-for-sctp-over-gre-tunnels.patch +++ b/queue/net-gre-recompute-gre-csum-for-sctp-over-gre-tunnels.patch @@ -1,4 +1,4 @@ -From 622e32b7d4a6492cf5c1f759ef833f817418f7b3 Mon Sep 17 00:00:00 2001 +From 67353feeaecdb765f95e7656ce806fc93b9fef37 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi <lorenzo@kernel.org> Date: Fri, 31 Jul 2020 20:12:05 +0200 Subject: [PATCH] net: gre: recompute gre csum for sctp over gre tunnels @@ -19,9 +19,10 @@ Fixes: 90017accff61 ("sctp: Add GSO support") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c -index 2e6d1b7a7bc9..e0a246575887 100644 +index 4de7e962d3da..c840141876bc 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c @@ -15,12 +15,12 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, diff --git a/queue/net-lan78xx-replace-bogus-endpoint-lookup.patch b/queue/net-lan78xx-replace-bogus-endpoint-lookup.patch index 25559d95..54b48ee6 100644 --- a/queue/net-lan78xx-replace-bogus-endpoint-lookup.patch +++ b/queue/net-lan78xx-replace-bogus-endpoint-lookup.patch @@ -1,4 +1,4 @@ -From ea060b352654a8de1e070140d25fe1b7e4d50310 Mon Sep 17 00:00:00 2001 +From 94e30be27df0fd08b72b0efe8f78968e2ecf9770 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Tue, 28 Jul 2020 14:10:31 +0200 Subject: [PATCH] net: lan78xx: replace bogus endpoint lookup @@ -20,9 +20,10 @@ descriptor assumption for now. Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index ee062b27cfa7..442507f25aad 100644 +index 099ae3b1a601..c78cd0f5b922 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -377,10 +377,6 @@ struct lan78xx_net { @@ -36,7 +37,7 @@ index ee062b27cfa7..442507f25aad 100644 int msg_enable; struct urb *urb_intr; -@@ -2860,78 +2856,12 @@ lan78xx_start_xmit(struct sk_buff *skb, struct net_device *net) +@@ -2872,78 +2868,12 @@ lan78xx_start_xmit(struct sk_buff *skb, struct net_device *net) return NETDEV_TX_OK; } @@ -115,7 +116,7 @@ index ee062b27cfa7..442507f25aad 100644 dev->data[0] = (unsigned long)kzalloc(sizeof(*pdata), GFP_KERNEL); pdata = (struct lan78xx_priv *)(dev->data[0]); -@@ -3700,6 +3630,7 @@ static void lan78xx_stat_monitor(struct timer_list *t) +@@ -3715,6 +3645,7 @@ static void lan78xx_stat_monitor(struct timer_list *t) static int lan78xx_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -123,7 +124,7 @@ index ee062b27cfa7..442507f25aad 100644 struct lan78xx_net *dev; struct net_device *netdev; struct usb_device *udev; -@@ -3748,6 +3679,34 @@ static int lan78xx_probe(struct usb_interface *intf, +@@ -3763,6 +3694,34 @@ static int lan78xx_probe(struct usb_interface *intf, mutex_init(&dev->stats.access_lock); @@ -158,7 +159,7 @@ index ee062b27cfa7..442507f25aad 100644 ret = lan78xx_bind(dev, intf); if (ret < 0) goto out2; -@@ -3759,23 +3718,7 @@ static int lan78xx_probe(struct usb_interface *intf, +@@ -3774,23 +3733,7 @@ static int lan78xx_probe(struct usb_interface *intf, netdev->max_mtu = MAX_SINGLE_PACKET_SIZE; netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); diff --git a/queue/net-thunderx-use-spin_lock_bh-in-nicvf_set_rx_mode_t.patch b/queue/net-thunderx-use-spin_lock_bh-in-nicvf_set_rx_mode_t.patch index c0a12060..43e85923 100644 --- a/queue/net-thunderx-use-spin_lock_bh-in-nicvf_set_rx_mode_t.patch +++ b/queue/net-thunderx-use-spin_lock_bh-in-nicvf_set_rx_mode_t.patch @@ -1,4 +1,4 @@ -From bab9693a9a8c6dd19f670408ec1e78e12a320682 Mon Sep 17 00:00:00 2001 +From 565b754075a05fb6a2a39b1860fa358b7ce9ef26 Mon Sep 17 00:00:00 2001 From: Xin Long <lucien.xin@gmail.com> Date: Tue, 4 Aug 2020 15:02:30 +0800 Subject: [PATCH] net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() @@ -35,12 +35,13 @@ Tested-by: Dean Nelson <dnelson@redhat.com> Fixes: 469998c861fa ("net: thunderx: prevent concurrent data re-writing by nicvf_set_rx_mode") Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c -index 1c6163934e20..d22c9d350355 100644 +index 40a44dcb3d9b..f414f5651dbd 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c -@@ -2039,11 +2039,11 @@ static void nicvf_set_rx_mode_task(struct work_struct *work_arg) +@@ -2047,11 +2047,11 @@ static void nicvf_set_rx_mode_task(struct work_struct *work_arg) /* Save message data locally to prevent them from * being overwritten by next ndo_set_rx_mode call(). */ diff --git a/queue/nfsd-Fix-NFSv4-READ-on-RDMA-when-using-readv.patch b/queue/nfsd-Fix-NFSv4-READ-on-RDMA-when-using-readv.patch index 31c8d757..09b80d40 100644 --- a/queue/nfsd-Fix-NFSv4-READ-on-RDMA-when-using-readv.patch +++ b/queue/nfsd-Fix-NFSv4-READ-on-RDMA-when-using-readv.patch @@ -1,4 +1,4 @@ -From ccef874e7b532d5ac03dda324b17edefb3856029 Mon Sep 17 00:00:00 2001 +From c30d790d12b4001a8164304875310ac2cb20dcb9 Mon Sep 17 00:00:00 2001 From: Chuck Lever <chuck.lever@oracle.com> Date: Mon, 2 Mar 2020 14:45:53 -0500 Subject: [PATCH] nfsd: Fix NFSv4 READ on RDMA when using readv @@ -29,6 +29,7 @@ This simplifies the implementation of this fix. Fixes: b04209806384 ("nfsd4: allow exotic read compounds") Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=198053 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 52c4f6daa649..7a1cc8b77d42 100644 diff --git a/queue/nvme-pci-prevent-SK-hynix-PC400-from-using-Write-Zer.patch b/queue/nvme-pci-prevent-SK-hynix-PC400-from-using-Write-Zer.patch index 048c9f45..d3edce0a 100644 --- a/queue/nvme-pci-prevent-SK-hynix-PC400-from-using-Write-Zer.patch +++ b/queue/nvme-pci-prevent-SK-hynix-PC400-from-using-Write-Zer.patch @@ -1,4 +1,4 @@ -From 7a4ccc1e7063bbbc5ca26a063e4439c195f98b2b Mon Sep 17 00:00:00 2001 +From 765f6f33356bd466c166515763d83c89fd075870 Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng <kai.heng.feng@canonical.com> Date: Fri, 24 Jul 2020 01:29:10 +0800 Subject: [PATCH] nvme-pci: prevent SK hynix PC400 from using Write Zeroes @@ -27,6 +27,7 @@ BugLink: https://bugs.launchpad.net/bugs/1872383 Cc: kyounghwan sohn <kyounghwan.sohn@sk.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a27cc8df10af..727fec79b6cf 100644 diff --git a/queue/omapfb-dss-Fix-max-fclk-divider-for-omap36xx.patch b/queue/omapfb-dss-Fix-max-fclk-divider-for-omap36xx.patch index 0ec43ae6..30c893a8 100644 --- a/queue/omapfb-dss-Fix-max-fclk-divider-for-omap36xx.patch +++ b/queue/omapfb-dss-Fix-max-fclk-divider-for-omap36xx.patch @@ -1,4 +1,4 @@ -From 254503a2b186caa668a188dbbd7ab0d25149c0a5 Mon Sep 17 00:00:00 2001 +From 381e8813964bf7a62e427490c55c6ac8dffa5a64 Mon Sep 17 00:00:00 2001 From: Adam Ford <aford173@gmail.com> Date: Tue, 30 Jun 2020 13:26:36 -0500 Subject: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx @@ -21,12 +21,13 @@ Cc: Rob Clark <robdclark@gmail.com> [b.zolnierkie: mark patch as applicable to stable 4.5+ (was 4.9+)] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200630182636.439015-1-aford173@gmail.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c -index 3586579c838f..a6b1c1598040 100644 +index 7252d22dd117..bfc5c4c5a26a 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c -@@ -836,7 +836,7 @@ static const struct dss_features omap34xx_dss_feats = { +@@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { }; static const struct dss_features omap3630_dss_feats = { diff --git a/queue/openvswitch-Prevent-kernel-infoleak-in-ovs_ct_put_ke.patch b/queue/openvswitch-Prevent-kernel-infoleak-in-ovs_ct_put_ke.patch index 459650d5..ed7131ba 100644 --- a/queue/openvswitch-Prevent-kernel-infoleak-in-ovs_ct_put_ke.patch +++ b/queue/openvswitch-Prevent-kernel-infoleak-in-ovs_ct_put_ke.patch @@ -1,4 +1,4 @@ -From 9aba6c5b49254d5bee927d81593ed4429e91d4ae Mon Sep 17 00:00:00 2001 +From a3dcdac2d1a68e854e7bad532c1d14dad69e19e4 Mon Sep 17 00:00:00 2001 From: Peilin Ye <yepeilin.cs@gmail.com> Date: Fri, 31 Jul 2020 00:48:38 -0400 Subject: [PATCH] openvswitch: Prevent kernel-infoleak in ovs_ct_put_key() @@ -14,9 +14,10 @@ Fixes: 9dd7f8907c37 ("openvswitch: Add original direction conntrack tuple to sw_ Suggested-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c -index 4340f25fe390..98d393e70de3 100644 +index 1d418d1eef5d..8d66222a65df 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -276,10 +276,6 @@ void ovs_ct_fill_key(const struct sk_buff *skb, struct sw_flow_key *key) diff --git a/queue/rxrpc-Fix-race-between-recvmsg-and-sendmsg-on-immedi.patch b/queue/rxrpc-Fix-race-between-recvmsg-and-sendmsg-on-immedi.patch index 01af8dcb..e1506af1 100644 --- a/queue/rxrpc-Fix-race-between-recvmsg-and-sendmsg-on-immedi.patch +++ b/queue/rxrpc-Fix-race-between-recvmsg-and-sendmsg-on-immedi.patch @@ -1,4 +1,4 @@ -From 65550098c1c4db528400c73acf3e46bfa78d9264 Mon Sep 17 00:00:00 2001 +From c637247d13471fb16712c350c1cc69101eca4ea2 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Wed, 29 Jul 2020 00:03:56 +0100 Subject: [PATCH] rxrpc: Fix race between recvmsg and sendmsg on immediate call @@ -67,9 +67,10 @@ Reported-by: syzbot+b54969381df354936d96@syzkaller.appspotmail.com Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Marc Dionne <marc.dionne@auristor.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c -index f07970207b54..38a46167523f 100644 +index e7569bb5ffb7..d7f5db7b74fb 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -288,7 +288,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, @@ -119,7 +120,7 @@ index f07970207b54..38a46167523f 100644 /* diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c -index 19e141eeed17..8cbe0bf20ed5 100644 +index 5ff9d5e12bfe..d76868acfa1a 100644 --- a/net/rxrpc/conn_object.c +++ b/net/rxrpc/conn_object.c @@ -212,9 +212,11 @@ void rxrpc_disconnect_call(struct rxrpc_call *call) @@ -138,10 +139,10 @@ index 19e141eeed17..8cbe0bf20ed5 100644 if (rxrpc_is_client_call(call)) return rxrpc_disconnect_client_call(call); diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c -index 490b1927215c..efecc5a8f67d 100644 +index 9d03e6bcf0a3..ba5d9c2885b0 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c -@@ -620,7 +620,7 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, +@@ -526,7 +526,7 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, goto error_unlock_call; } @@ -151,10 +152,10 @@ index 490b1927215c..efecc5a8f67d 100644 size_t len = sizeof(call->peer->srx); diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c -index 03a30d014bb6..f3f6da6e4ad2 100644 +index dd872863513d..732c7ae56afd 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c -@@ -681,6 +681,9 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len) +@@ -682,6 +682,9 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len) if (IS_ERR(call)) return PTR_ERR(call); /* ... and we have the call lock. */ diff --git a/queue/rxrpc-Fix-trace-after-put-looking-at-the-put-call-re.patch b/queue/rxrpc-Fix-trace-after-put-looking-at-the-put-call-re.patch index 0615824a..e75e38c8 100644 --- a/queue/rxrpc-Fix-trace-after-put-looking-at-the-put-call-re.patch +++ b/queue/rxrpc-Fix-trace-after-put-looking-at-the-put-call-re.patch @@ -1,4 +1,4 @@ -From 182e8d8f23992e0fd3d6f308ff78ca8704accba7 Mon Sep 17 00:00:00 2001 +From f4471c5b254e1b1ffae73687aaf4a3f278abce15 Mon Sep 17 00:00:00 2001 From: David Howells <dhowells@redhat.com> Date: Mon, 7 Oct 2019 10:58:29 +0100 Subject: [PATCH] rxrpc: Fix trace-after-put looking at the put call record @@ -15,6 +15,7 @@ then passing that into the tracepoint. Fixes: e34d4234b0b7 ("rxrpc: Trace rxrpc_call usage") Signed-off-by: David Howells <dhowells@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h index 007be31cab31..5c5764f5e1d4 100644 diff --git a/queue/selftests-net-relax-cpu-affinity-requirement-in-msg_.patch b/queue/selftests-net-relax-cpu-affinity-requirement-in-msg_.patch index 0a39754d..689be0c0 100644 --- a/queue/selftests-net-relax-cpu-affinity-requirement-in-msg_.patch +++ b/queue/selftests-net-relax-cpu-affinity-requirement-in-msg_.patch @@ -1,4 +1,4 @@ -From 16f6458f2478b55e2b628797bc81a4455045c74e Mon Sep 17 00:00:00 2001 +From c0c12ed7ed49f1cccd98225f71d66b5459850a7c Mon Sep 17 00:00:00 2001 From: Willem de Bruijn <willemb@google.com> Date: Wed, 5 Aug 2020 04:40:45 -0400 Subject: [PATCH] selftests/net: relax cpu affinity requirement in msg_zerocopy @@ -24,6 +24,7 @@ Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Willem de Bruijn <willemb@google.com> Acked-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/selftests/net/msg_zerocopy.c b/tools/testing/selftests/net/msg_zerocopy.c index 4b02933cab8a..bdc03a2097e8 100644 diff --git a/queue/staging-android-ashmem-Fix-lockdep-warning-for-write.patch b/queue/staging-android-ashmem-Fix-lockdep-warning-for-write.patch index f46a1053..c9a9f8ae 100644 --- a/queue/staging-android-ashmem-Fix-lockdep-warning-for-write.patch +++ b/queue/staging-android-ashmem-Fix-lockdep-warning-for-write.patch @@ -1,4 +1,4 @@ -From 3e338d3c95c735dc3265a86016bb4c022ec7cadc Mon Sep 17 00:00:00 2001 +From 1ab84367cc42e34e276ba29a576af4feb86381f9 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan <surenb@google.com> Date: Thu, 30 Jul 2020 12:26:32 -0700 Subject: [PATCH] staging: android: ashmem: Fix lockdep warning for write @@ -34,9 +34,10 @@ Cc: stable <stable@vger.kernel.org> Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> Link: https://lore.kernel.org/r/20200730192632.3088194-1-surenb@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c -index c05a214191da..10b4be1f3e78 100644 +index c6695354b123..19b0cc5ea33f 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -95,6 +95,15 @@ static DEFINE_MUTEX(ashmem_mutex); diff --git a/queue/staging-rtl8712-handle-firmware-load-failure.patch b/queue/staging-rtl8712-handle-firmware-load-failure.patch index f2843bec..879abeca 100644 --- a/queue/staging-rtl8712-handle-firmware-load-failure.patch +++ b/queue/staging-rtl8712-handle-firmware-load-failure.patch @@ -1,4 +1,4 @@ -From 8f4bd41709cc0bcc57f3d4489c67258a29820317 Mon Sep 17 00:00:00 2001 +From b0717f07cabed077e8b356db4812472ff6d45600 Mon Sep 17 00:00:00 2001 From: Rustam Kovhaev <rkovhaev@gmail.com> Date: Thu, 16 Jul 2020 08:13:26 -0700 Subject: [PATCH] staging: rtl8712: handle firmware load failure @@ -15,9 +15,10 @@ Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200716151324.1036204-1-rkovhaev@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c -index 401f0e442bcf..c67a9ad675f2 100644 +index 401f0e442bcf..fd220c284c01 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -33,7 +33,6 @@ static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context) diff --git a/queue/tcp-apply-a-floor-of-1-for-RTT-samples-from-TCP-time.patch b/queue/tcp-apply-a-floor-of-1-for-RTT-samples-from-TCP-time.patch index f5077d6e..e825d8b2 100644 --- a/queue/tcp-apply-a-floor-of-1-for-RTT-samples-from-TCP-time.patch +++ b/queue/tcp-apply-a-floor-of-1-for-RTT-samples-from-TCP-time.patch @@ -1,4 +1,4 @@ -From 730e700e2c19d87e578ff0e7d8cb1d4a02b036d2 Mon Sep 17 00:00:00 2001 +From 408b9f2b35b2ae62b090efdd7620c118e00cf598 Mon Sep 17 00:00:00 2001 From: Jianfeng Wang <jfwang@google.com> Date: Thu, 30 Jul 2020 23:49:16 +0000 Subject: [PATCH] tcp: apply a floor of 1 for RTT samples from TCP timestamps @@ -34,12 +34,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Kevin Yang <yyd@google.com> Acked-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 739da25b0c23..184ea556f50e 100644 +index 65a899f65fa2..755b44c7506a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -2950,6 +2950,8 @@ static bool tcp_ack_update_rtt(struct sock *sk, const int flag, +@@ -2940,6 +2940,8 @@ static bool tcp_ack_update_rtt(struct sock *sk, const int flag, u32 delta = tcp_time_stamp(tp) - tp->rx_opt.rcv_tsecr; if (likely(delta < INT_MAX / (USEC_PER_SEC / TCP_TS_HZ))) { diff --git a/queue/tools-lib-traceevent-Fix-memory-leak-in-process_dyna.patch b/queue/tools-lib-traceevent-Fix-memory-leak-in-process_dyna.patch index 7908302d..b23617c3 100644 --- a/queue/tools-lib-traceevent-Fix-memory-leak-in-process_dyna.patch +++ b/queue/tools-lib-traceevent-Fix-memory-leak-in-process_dyna.patch @@ -1,4 +1,4 @@ -From e24c6447ccb7b1a01f9bf0aec94939e6450c0b4d Mon Sep 17 00:00:00 2001 +From 0a1a3fcc5abe599fa4377ca49fbe442c0aaa4bdc Mon Sep 17 00:00:00 2001 From: Philippe Duplessis-Guindon <pduplessis@efficios.com> Date: Thu, 30 Jul 2020 11:02:36 -0400 Subject: [PATCH] tools lib traceevent: Fix memory leak in @@ -49,12 +49,13 @@ Signed-off-by: Philippe Duplessis-Guindon <pduplessis@efficios.com> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Link: https://lore.kernel.org/linux-trace-devel/20200730150236.5392-1-pduplessis@efficios.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c -index 5b36c589a029..ba4f33804af1 100644 +index 3d6c9c5b455c..36af2bec523c 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c -@@ -2861,6 +2861,7 @@ process_dynamic_array_len(struct tep_event *event, struct tep_print_arg *arg, +@@ -2828,6 +2828,7 @@ process_dynamic_array_len(struct tep_event *event, struct tep_print_arg *arg, if (read_expected(TEP_EVENT_DELIM, ")") < 0) goto out_err; diff --git a/queue/usb-hso-check-for-return-value-in-hso_serial_common_.patch b/queue/usb-hso-check-for-return-value-in-hso_serial_common_.patch index 66a0d204..309deba2 100644 --- a/queue/usb-hso-check-for-return-value-in-hso_serial_common_.patch +++ b/queue/usb-hso-check-for-return-value-in-hso_serial_common_.patch @@ -1,4 +1,4 @@ -From e911e99a0770f760377c263bc7bac1b1593c6147 Mon Sep 17 00:00:00 2001 +From fb2154acad487325e81ed3d79eec00e40b08683b Mon Sep 17 00:00:00 2001 From: Rustam Kovhaev <rkovhaev@gmail.com> Date: Mon, 27 Jul 2020 23:42:17 -0700 Subject: [PATCH] usb: hso: check for return value in @@ -14,12 +14,13 @@ Link: https://syzkaller.appspot.com/bug?extid=67b2bd0e34f952d0321e Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c -index 5f123a8cf68e..d2fdb5430d27 100644 +index 67434a9f238d..cab6ae76156b 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c -@@ -2261,12 +2261,14 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs, +@@ -2260,12 +2260,14 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs, minor = get_free_serial_index(); if (minor < 0) @@ -35,7 +36,7 @@ index 5f123a8cf68e..d2fdb5430d27 100644 /* fill in specific data for later use */ serial->minor = minor; -@@ -2311,6 +2313,7 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs, +@@ -2310,6 +2312,7 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs, return 0; exit: hso_serial_tty_unregister(serial); diff --git a/queue/usb-xhci-Fix-ASMedia-ASM1142-DMA-addressing.patch b/queue/usb-xhci-Fix-ASMedia-ASM1142-DMA-addressing.patch index a7f1234e..1b29c555 100644 --- a/queue/usb-xhci-Fix-ASMedia-ASM1142-DMA-addressing.patch +++ b/queue/usb-xhci-Fix-ASMedia-ASM1142-DMA-addressing.patch @@ -1,4 +1,4 @@ -From ec37198acca7b4c17b96247697406e47aafe0605 Mon Sep 17 00:00:00 2001 +From 376fedbfbb8749b4897315f8b58afc523c4898b5 Mon Sep 17 00:00:00 2001 From: Forest Crossman <cyrozap@gmail.com> Date: Mon, 27 Jul 2020 23:24:08 -0500 Subject: [PATCH] usb: xhci: Fix ASMedia ASM1142 DMA addressing @@ -16,12 +16,13 @@ Signed-off-by: Forest Crossman <cyrozap@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200728042408.180529-3-cyrozap@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index baa5af88ca67..3feaafebfe58 100644 +index 5e9b6729e921..ec24b6ae22d6 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -59,6 +59,7 @@ +@@ -57,6 +57,7 @@ #define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc #define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042 #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 @@ -29,7 +30,7 @@ index baa5af88ca67..3feaafebfe58 100644 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 static const char hcd_name[] = "xhci_hcd"; -@@ -268,7 +269,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -253,7 +254,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) xhci->quirks |= XHCI_TRUST_TX_LENGTH; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/queue/usb-xhci-define-IDs-for-various-ASMedia-host-control.patch b/queue/usb-xhci-define-IDs-for-various-ASMedia-host-control.patch index b2953761..e133be39 100644 --- a/queue/usb-xhci-define-IDs-for-various-ASMedia-host-control.patch +++ b/queue/usb-xhci-define-IDs-for-various-ASMedia-host-control.patch @@ -1,4 +1,4 @@ -From 60aebf993f800c3f2579a85ee05baf338a19db73 Mon Sep 17 00:00:00 2001 +From 18edf209cef8e551800721d39733507ce38ea2f1 Mon Sep 17 00:00:00 2001 From: Forest Crossman <cyrozap@gmail.com> Date: Mon, 27 Jul 2020 23:24:07 -0500 Subject: [PATCH] usb: xhci: define IDs for various ASMedia host controllers @@ -14,6 +14,7 @@ Signed-off-by: Forest Crossman <cyrozap@gmail.com> Link: https://lore.kernel.org/r/20200728042408.180529-2-cyrozap@gmail.com Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index f55da3437b8e..5e9b6729e921 100644 diff --git a/queue/vxlan-Ensure-FDB-dump-is-performed-under-RCU.patch b/queue/vxlan-Ensure-FDB-dump-is-performed-under-RCU.patch index ffbd1c3b..0d02171b 100644 --- a/queue/vxlan-Ensure-FDB-dump-is-performed-under-RCU.patch +++ b/queue/vxlan-Ensure-FDB-dump-is-performed-under-RCU.patch @@ -1,4 +1,4 @@ -From e8feb10ba75a98d99a56e8028aa6d4af5356b8d5 Mon Sep 17 00:00:00 2001 +From 3e2a34286525df8e31d3e141a9f25dc7a1dad9d8 Mon Sep 17 00:00:00 2001 From: Ido Schimmel <idosch@mellanox.com> Date: Wed, 29 Jul 2020 11:34:36 +0300 Subject: [PATCH] vxlan: Ensure FDB dump is performed under RCU @@ -62,6 +62,7 @@ Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [PG: use v5.4.x-stable version instead of mainline for v5.2 baseline.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index bfa7d8a88ac8..54e7d7a8ea01 100644 diff --git a/queue/xattr-break-delegations-in-set-remove-xattr.patch b/queue/xattr-break-delegations-in-set-remove-xattr.patch index 30f11797..389b30b7 100644 --- a/queue/xattr-break-delegations-in-set-remove-xattr.patch +++ b/queue/xattr-break-delegations-in-set-remove-xattr.patch @@ -1,4 +1,4 @@ -From 08b5d5014a27e717826999ad20e394a8811aae92 Mon Sep 17 00:00:00 2001 +From f97ec1b4655258b21881f8b4d060cf1731855574 Mon Sep 17 00:00:00 2001 From: Frank van der Linden <fllinden@amazon.com> Date: Tue, 23 Jun 2020 22:39:18 +0000 Subject: [PATCH] xattr: break delegations in {set,remove}xattr @@ -17,9 +17,10 @@ Cc: linux-fsdevel@vger.kernel.org Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Frank van der Linden <fllinden@amazon.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/xattr.c b/fs/xattr.c -index 91608d9bfc6a..95f38f57347f 100644 +index 90dd78f0eb27..f2854570d411 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -204,10 +204,22 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name, @@ -161,7 +162,7 @@ index 91608d9bfc6a..95f38f57347f 100644 * Extended attribute SET operations */ diff --git a/include/linux/xattr.h b/include/linux/xattr.h -index 47eaa34f8761..a2f3cd02653c 100644 +index 6dad031be3c2..3a71ad716da5 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -51,8 +51,10 @@ ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t); |