Commit 7b25339f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-5.11-20210113' of... 

Merge tag 'linux-can-fixes-for-5.11-20210113' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2021-01-13

The first patch is by Oliver Hartkopp for the CAn ISO-TP protocol and fixes a
kernel information leak to userspace.

The last patch is by Qinglang Miao for the mcp251xfd driver and fixes a NULL
pointer check to work on the correct variable.

* tag 'linux-can-fixes-for-5.11-20210113' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: mcp251xfd: mcp251xfd_handle_rxif_one(): fix wrong NULL pointer check
  can: isotp: isotp_getname(): fix kernel information leak
====================

Link: https://lore.kernel.org/r/20210113212158.925513-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1f02efd1 ca4c6ebe

drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,7 @@ mcp251xfd_handle_rxif_one(struct mcp251xfd_priv *priv, 
	else

		skb = alloc_can_skb(priv->ndev, (struct can_frame **)&cfd);



	if (!cfd) {

	if (!skb) {

		stats->rx_dropped++;

		return 0;

	}

net/can/isotp.c

+1 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,7 @@ static int isotp_getname(struct socket *sock, struct sockaddr *uaddr, int peer) 
	if (peer)

		return -EOPNOTSUPP;



	memset(addr, 0, sizeof(*addr));

	addr->can_family = AF_CAN;

	addr->can_ifindex = so->ifindex;

	addr->can_addr.tp.rx_id = so->rxid;