Skip to contentSkip to conversation

Linux 4.19.212

DISCUSSION Greg Kroah-Hartman 1 participant 2 messages Oct 17, 2021 Stable branch

lore
Share & tools
lore
author maintainer
#1 lore raw
In reply to Greg Kroah-Hartman
Makefile +1 -1
index d4e6f5d326b0..484b0665e572 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 19
-SUBLEVEL = 211
+SUBLEVEL = 212
 EXTRAVERSION =
 NAME = "People's Front"
 
arch/m68k/kernel/signal.c +42 -46

184 lines not on this page · raw message

arch/x86/events/core.c +1 -0
index 429389489eed..f612eb1cc818 100644
@@ -2096,6 +2096,7 @@ static int x86_pmu_event_init(struct perf_event *event)
 	if (err) {
 		if (event->destroy)
 			event->destroy(event);
+		event->destroy = NULL;
 	}
 
 	if (READ_ONCE(x86_pmu.attr_rdpmc) &&
drivers/hid/hid-apple.c +7 -0
index b58ab769aa7b..4e3dd3f55a96 100644
@@ -304,12 +304,19 @@ static int apple_event(struct hid_device *hdev, struct hid_field *field,
 
 /*
  * MacBook JIS keyboard has wrong logical maximum
+ * Magic Keyboard JIS has wrong logical maximum
  */
 static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,
 		unsigned int *rsize)
 {
 	struct apple_sc *asc = hid_get_drvdata(hdev);
 
+	if(*rsize >=71 && rdesc[70] == 0x65 && rdesc[64] == 0x65) {
+		hid_info(hdev,
+			 "fixing up Magic Keyboard JIS report descriptor\n");
+		rdesc[64] = rdesc[70] = 0xe7;
+	}
+
 	if ((asc->quirks & APPLE_RDESC_JIS) && *rsize >= 60 &&
 			rdesc[53] == 0x65 && rdesc[59] == 0x65) {
 		hid_info(hdev,
drivers/net/ethernet/sun/Kconfig +1 -0
index 7b982e02ea3a..1080a2a3e13a 100644
@@ -73,6 +73,7 @@ config CASSINI
 config SUNVNET_COMMON
 	tristate "Common routines to support Sun Virtual Networking"
 	depends on SUN_LDOMS
+	depends on INET
 	default m
 
 config SUNVNET
drivers/net/phy/bcm7xxx.c +94 -0

113 lines not on this page · raw message

drivers/scsi/ses.c +1 -1
index caf35ca577ce..e79d9f60a528 100644
@@ -134,7 +134,7 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code,
 static int ses_send_diag(struct scsi_device *sdev, int page_code,
 			 void *buf, int bufflen)
 {
-	u32 result;
+	int result;
 
 	unsigned char cmd[] = {
 		SEND_DIAGNOSTIC,
drivers/scsi/virtio_scsi.c +2 -2
index 3d331a864b2f..50e87823baab 100644
@@ -336,7 +336,7 @@ static void virtscsi_handle_transport_reset(struct virtio_scsi *vscsi,
 		}
 		break;
 	default:
-		pr_info("Unsupport virtio scsi event reason %x\n", event->reason);
+		pr_info("Unsupported virtio scsi event reason %x\n", event->reason);
 	}
 }
 
@@ -389,7 +389,7 @@ static void virtscsi_handle_event(struct work_struct *work)
 		virtscsi_handle_param_change(vscsi, event);
 		break;
 	default:
-		pr_err("Unsupport virtio scsi event %x\n", event->event);
+		pr_err("Unsupported virtio scsi event %x\n", event->event);
 	}
 	virtscsi_kick_event(vscsi, event_node);
 }
include/linux/sched.h +1 -1
index 5524cd5c6abe..761d0f85c4a5 100644
@@ -1433,7 +1433,7 @@ extern struct pid *cad_pid;
 #define tsk_used_math(p)			((p)->flags & PF_USED_MATH)
 #define used_math()				tsk_used_math(current)
 
-static inline bool is_percpu_thread(void)
+static __always_inline bool is_percpu_thread(void)
 {
 #ifdef CONFIG_SMP
 	return (current->flags & PF_NO_SETAFFINITY) &&
include/net/pkt_sched.h +1 -0
index 5e99771a5dcc..edca90ef3bdc 100644
@@ -11,6 +11,7 @@
 #include <uapi/linux/pkt_sched.h>
 
 #define DEFAULT_TX_QUEUE_LEN	1000
+#define STAB_SIZE_LOG_MAX	30
 
 struct qdisc_walker {
 	int	stop;
net/ipv6/netfilter/ip6_tables.c +1 -0
index dd0c1073dc8e..d93490ac8275 100644
@@ -276,6 +276,7 @@ ip6t_do_table(struct sk_buff *skb,
 	 * things we don't know, ie. tcp syn flag or ports).  If the
 	 * rule is also a fragment-specific rule, non-fragments won't
 	 * match it. */
+	acpar.fragoff = 0;
 	acpar.hotdrop = false;
 	acpar.state   = state;
 
net/mac80211/mesh_pathtbl.c +4 -1
index 6dc5f93b1e4d..06b44c3c831a 100644
@@ -63,7 +63,10 @@ static struct mesh_table *mesh_table_alloc(void)
 	atomic_set(&newtbl->entries,  0);
 	spin_lock_init(&newtbl->gates_lock);
 	spin_lock_init(&newtbl->walk_lock);
-	rhashtable_init(&newtbl->rhead, &mesh_rht_params);
+	if (rhashtable_init(&newtbl->rhead, &mesh_rht_params)) {
+		kfree(newtbl);
+		return NULL;
+	}
 
 	return newtbl;
 }
net/mac80211/rx.c +2 -1
index 012697efafc3..e0baa563a4de 100644
@@ -3875,7 +3875,8 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
 		if (!bssid)
 			return false;
 		if (ether_addr_equal(sdata->vif.addr, hdr->addr2) ||
-		    ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2))
+		    ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2) ||
+		    !is_valid_ether_addr(hdr->addr2))
 			return false;
 		if (ieee80211_is_beacon(hdr->frame_control))
 			return true;
net/sched/sch_api.c +6 -0
index 1f12be9f0207..0bb4f7a94a3c 100644
@@ -498,6 +498,12 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt,
 		return stab;
 	}
 
+	if (s->size_log > STAB_SIZE_LOG_MAX ||
+	    s->cell_log > STAB_SIZE_LOG_MAX) {
+		NL_SET_ERR_MSG(extack, "Invalid logarithmic size of size table");
+		return ERR_PTR(-EINVAL);
+	}
+
 	stab = kmalloc(sizeof(*stab) + tsize * sizeof(u16), GFP_KERNEL);
 	if (!stab)
 		return ERR_PTR(-ENOMEM);

Greg Kroah-Hartman

author maintainer
#0 lore raw

I'm announcing the release of the 4.19.212 kernel.

All users of the 4.19 kernel series must upgrade.

The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                         |    2 
 arch/m68k/kernel/signal.c        |   88 +++++++++++++++++-------------------
 arch/x86/events/core.c           |    1 
 drivers/hid/hid-apple.c          |    7 ++
 drivers/net/ethernet/sun/Kconfig |    1 
 drivers/net/phy/bcm7xxx.c        |   94 +++++++++++++++++++++++++++++++++++++++
 drivers/scsi/ses.c               |    2 
 drivers/scsi/virtio_scsi.c       |    4 -
 include/linux/sched.h            |    2 
 include/net/pkt_sched.h          |    1 
 net/ipv6/netfilter/ip6_tables.c  |    1 
 net/mac80211/mesh_pathtbl.c      |    5 +-
 net/mac80211/rx.c                |    3 -
 net/sched/sch_api.c              |    6 ++
 14 files changed, 164 insertions(+), 53 deletions(-)

Al Viro (1):
m68k: Handle arrivals of multiple signals correctly

Anand K Mistry (1):
perf/x86: Reset destroy callback on event init failure

Colin Ian King (1):

      scsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported"

Florian Fainelli (1):
net: phy: bcm7xxx: Fixed indirect MMD operations

Greg Kroah-Hartman (1):

      Linux 4.19.212

Jeremy Sowden (1):
netfilter: ip6_tables: zero-initialize fragment offset

Jiapeng Chong (1):
scsi: ses: Fix unsigned comparison with less than zero

MichelleJin (1):
mac80211: check return value of rhashtable_init

Mizuho Mori (1):
HID: apple: Fix logical maximum and usage maximum of Magic Keyboard JIS

Peter Zijlstra (1):
sched: Always inline is_percpu_thread()

Randy Dunlap (1):
net: sun: SUNVNET_COMMON should depend on INET

YueHaibing (1):
mac80211: Drop frames from invalid MAC address in ad-hoc mode

王贇 (1):
net: prevent user from passing illegal stab size