UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

linux-can-fixes-for-5.13-20210624 

-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEK3kIWJt9yTYMP3ehqclaivrt76kFAmDUKNUTHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRCpyVqK+u3vqb9BB/9V7TVpbOzQ3vvhS7w/7oz357aodB2t
 uL4R5jV0fCf9hKXlHdbT3VKG49sPCnOSlZ3YYpFwfxB/AowWOe5sf9zKwcIb7z95
 O3ZouirZYFRcTwFQs/wN4kUetyXl/gcHVJpvxQHowqf3U+f7u//JOiiBNeIbAdZA
 f5+KfB77ZfuUpOjtijX3Tt4HnfbzWKCcf17cncTK0dWVJkChfqtBP1+H/9iH/xjj
 8vVaW8Kx1FDLY7CKcHfCGxQy5QUy2OK+hfmeP60tUXdnB1znBbWH2D1Sc/aHlb3R
 iWTBMBoxbZbN6YBYMBDjzwXgfYNb6IIAcV02xlvn+9nMShJPKeoxz3Mz
 =9WcJ
 -----END PGP SIGNATURE-----

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

Marc Kleine-Budde says:

====================
pull-request: can 2021-06-24

this is a pull request of 2 patches for net/master.

The first patch is by Norbert Slusarek and prevent allocation of
filter for optlen == 0 in the j1939 CAN protocol.

The last patch is by Stephane Grosjean and fixes a potential
starvation in the TX path of the peak_pciefd driver.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2021-06-24 11:24:36 -07:00
parent ede285b105 b17233d385
commit abe90454f0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/can/peak_canfd/peak_canfd.c
View File

@ -351,8 +351,8 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,
return err;
}
/* start network queue (echo_skb array is empty) */
netif_start_queue(ndev);
/* wake network queue up (echo_skb array is empty) */
netif_wake_queue(ndev);
return 0;
}

2
net/can/j1939/socket.c
View File

@ -676,7 +676,7 @@ static int j1939_sk_setsockopt(struct socket *sock, int level, int optname,
switch (optname) {
case SO_J1939_FILTER:
if (!sockptr_is_null(optval)) {
if (!sockptr_is_null(optval) && optlen != 0) {
struct j1939_filter *f;
int c;