Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c439abc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.225 into android-4.19-stable 



Changes in 4.19.225
	tracing: Fix check for trace_percpu_buffer validity in get_trace_buf()
	tracing: Tag trace_percpu_buffer as a percpu pointer
	ieee802154: atusb: fix uninit value in atusb_set_extended_addr
	RDMA/core: Don't infoleak GRH fields
	mac80211: initialize variable have_higher_than_11mbit
	i40e: fix use-after-free in i40e_sync_filters_subtask()
	i40e: Fix incorrect netdev's real number of RX/TX queues
	ipv6: Check attribute length for RTA_GATEWAY in multipath route
	ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route
	sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc
	xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate
	power: reset: ltc2952: Fix use of floating point literals
	rndis_host: support Hytera digital radios
	phonet: refcount leak in pep_sock_accep
	ipv6: Continue processing multipath route even if gateway attribute is invalid
	ipv6: Do cleanup if attribute validation fails in multipath route
	usb: mtu3: fix interval value for intr and isoc
	scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown()
	ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate
	net: udp: fix alignment problem in udp4_seq_show()
	mISDN: change function names to avoid conflicts
	Linux 4.19.225

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I654b44d04f15dc632654f0bb89c756143c94c891
parents 523769c6 5e0cdb24

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 224

SUBLEVEL = 225

EXTRAVERSION =

NAME = "People's Front"

drivers/infiniband/core/uverbs_marshall.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void ib_copy_ah_attr_to_user(struct ib_device *device, 
	struct rdma_ah_attr *src = ah_attr;

	struct rdma_ah_attr conv_ah;



	memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));

	memset(&dst->grh, 0, sizeof(dst->grh));



	if ((ah_attr->type == RDMA_AH_ATTR_TYPE_OPA) &&

	    (rdma_ah_get_dlid(ah_attr) > be16_to_cpu(IB_LID_PERMISSIVE)) &&

drivers/isdn/mISDN/core.c

+3 −3
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ mISDNInit(void) 
	err = mISDN_inittimer(&debug);

	if (err)

		goto error2;

	err = l1_init(&debug);

	err = Isdnl1_Init(&debug);

	if (err)

		goto error3;

	err = Isdnl2_Init(&debug);
@@ -404,7 +404,7 @@ mISDNInit(void) 
error5:

	Isdnl2_cleanup();

error4:

	l1_cleanup();

	Isdnl1_cleanup();

error3:

	mISDN_timer_cleanup();

error2:
@@ -417,7 +417,7 @@ static void mISDN_cleanup(void) 
{

	misdn_sock_cleanup();

	Isdnl2_cleanup();

	l1_cleanup();

	Isdnl1_cleanup();

	mISDN_timer_cleanup();

	class_unregister(&mISDN_class);

drivers/isdn/mISDN/core.h

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ struct Bprotocol *get_Bprotocol4id(u_int); 
extern int	mISDN_inittimer(u_int *);

extern void	mISDN_timer_cleanup(void);



extern int	l1_init(u_int *);

extern void	l1_cleanup(void);

extern int	Isdnl1_Init(u_int *);

extern void	Isdnl1_cleanup(void);

extern int	Isdnl2_Init(u_int *);

extern void	Isdnl2_cleanup(void);

drivers/isdn/mISDN/layer1.c

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) { 
EXPORT_SYMBOL(create_l1);



int

l1_init(u_int *deb)

Isdnl1_Init(u_int *deb)

{

	debug = deb;

	l1fsm_s.state_count = L1S_STATE_COUNT;
@@ -418,7 +418,7 @@ l1_init(u_int *deb) 
}



void

l1_cleanup(void)

Isdnl1_cleanup(void)

{

	mISDN_FsmFree(&l1fsm_s);

}