qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

can: isotp: support MSG_TRUNC flag when reading from socket 

JIRA: https://issues.redhat.com/browse/RHEL-80832

Conflicts: net/can/isotp.c due to out-of-order backport of f4b41f062c424
    ("net: remove noblock parameter from skb_recv_datagram()")

commit 42bf50a1795a1854d48717b7361dbdbce496b16b
Author: Oliver Hartkopp <socketcan@hartkopp.net>
Date:   Wed Mar 16 17:42:58 2022 +0100

    can: isotp: support MSG_TRUNC flag when reading from socket

    When providing the MSG_TRUNC flag via recvmsg() syscall the return value
    provides the real length of the packet or datagram, even when it was longer
    than the passed buffer.

    Fixes: e057dd3fc2 ("can: add ISO 15765-2:2016 transport protocol")
    Link: https://github.com/linux-can/can-utils/issues/347#issuecomment-1065932671
    Link: https://lore.kernel.org/all/20220316164258.54155-3-socketcan@hartkopp.net
    Suggested-by: Derek Will <derekrobertwill@gmail.com>
    Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Signed-off-by: Radu Rendec <rrendec@redhat.com>
This commit is contained in:
Radu Rendec 2025-03-04 17:14:46 -05:00
parent dde843c263
commit eaa31b3279
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/can/isotp.c
View File

@ -1037,25 +1037,26 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
struct sock *sk = sock->sk;
struct sk_buff *skb;
struct isotp_sock *so = isotp_sk(sk);
int err = 0;
int ret = 0;
if (flags & ~(MSG_DONTWAIT | MSG_TRUNC))
return -EINVAL;
if (!so->bound)
return -EADDRNOTAVAIL;
skb = skb_recv_datagram(sk, flags, &err);
skb = skb_recv_datagram(sk, flags, &ret);
if (!skb)
return err;
return ret;
if (size < skb->len)
msg->msg_flags |= MSG_TRUNC;
else
size = skb->len;
err = memcpy_to_msg(msg, skb->data, size);
if (err < 0) {
skb_free_datagram(sk, skb);
return err;
}
ret = memcpy_to_msg(msg, skb->data, size);
if (ret < 0)
goto out_err;
sock_recv_timestamp(msg, sk, skb);
@ -1065,9 +1066,13 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
}
/* set length of return value */
ret = (flags & MSG_TRUNC) ? skb->len : size;
out_err:
skb_free_datagram(sk, skb);
return size;
return ret;
}
static int isotp_release(struct socket *sock)