can: fix msg_namelen values depending on CAN_REQUIRED_SIZE
Subsystems (2)
Oliver Hartkopp
maintainerRFC PATCH 1/1 can: fix msg_namelen values depending on CAN_REQUIRED_SIZE
Since commit f5223e9eee65 ("can: extend sockaddr_can to include j1939 members") the sockaddr_can has been extended in size and a new CAN_REQUIRED_SIZE macro has been introduced to calculate the protocol specific needed size.
The ABI for the msg_name and msg_namelen has not been adapted to the new CAN_REQUIRED_SIZE macro which leads to a problem when an existing binary reads the (increased) struct sockaddr_can in msg_name.
--- net/can/bcm.c | 14 ++++++++++---- net/can/isotp.c | 14 ++++++++++---- net/can/raw.c | 17 +++++++++++------ 3 files changed, 31 insertions(+), 14 deletions(-)
net/can/bcm.c +10 -4
@@ -84,10 +84,12 @@MODULE_DESCRIPTION ("PF_CAN broadcast manager protocol" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Oliver Hartkopp <[email protected]>" );MODULE_ALIAS ("can-proto-2" ); +#define BCM_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_ifindex) +/* * easy access to the first 64 bit of can(fd)_frame payload. cp->data is * 64 bit aligned so the offset has to be multiples of 8 which is ensured * by the only callers in bcm_rx_cmp_to_index() bcm_rx_handler(). */
@@ -1290,11 +1292,11 @@ static int bcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)if (!ifindex && msg->msg_name) {/* no bound device as default => check msg_name */ DECLARE_SOCKADDR(struct sockaddr_can *, addr, msg->msg_name); -if (msg->msg_namelen <CAN_REQUIRED_SIZE (*addr, can_ifindex)) +if (msg->msg_namelen <BCM_MIN_NAMELEN )return -EINVAL ;if (addr->can_family !=AF_CAN )return -EINVAL ;
@@ -1532,11 +1534,11 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,struct sock *sk = sock->sk;struct bcm_sock *bo =bcm_sk (sk);struct net *net =sock_net (sk);int ret =0 ; -if (len <CAN_REQUIRED_SIZE (*addr, can_ifindex)) +if (len <BCM_MIN_NAMELEN )return -EINVAL ;lock_sock (sk);if (bo->bound) {
@@ -1598,10 +1600,14 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,int noblock;int err; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; + +if (msg->msg_name && msg->msg_namelen <BCM_MIN_NAMELEN ) +return -EINVAL ; + skb =skb_recv_datagram (sk, flags, noblock, &error);if (!skb)return error;if (skb->len < size)
@@ -1614,12 +1620,12 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, }sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { -__sockaddr_check_size (sizeof (struct sockaddr_can )); - msg->msg_namelen =sizeof (struct sockaddr_can ); +__sockaddr_check_size (BCM_MIN_NAMELEN ); + msg->msg_namelen =BCM_MIN_NAMELEN ;memcpy (msg->msg_name, skb->cb, msg->msg_namelen); }skb_free_datagram (sk, skb);
net/can/isotp.c +10 -4
@@ -75,10 +75,12 @@MODULE_DESCRIPTION ("PF_CAN isotp 15765-2:2016 protocol" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Oliver Hartkopp <[email protected]>" );MODULE_ALIAS ("can-proto-6" ); +#define ISOTP_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_addr.tp) +#define SINGLE_MASK (id) (((id) & CAN_EFF_FLAG) ? \ (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))/* ISO 15765-2:2016 supports more than 4095 byte per ISO PDU as the FF_DL can
@@ -969,10 +971,13 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; +if (msg->msg_name && msg->msg_namelen <ISOTP_MIN_NAMELEN ) +return -EINVAL ; + skb =skb_recv_datagram (sk, flags, noblock, &err);if (!skb)return err;if (size < skb->len)
@@ -987,11 +992,12 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, }sock_recv_timestamp (msg, sk, skb);if (msg->msg_name) { - msg->msg_namelen =sizeof (struct sockaddr_can ); +__sockaddr_check_size (ISOTP_MIN_NAMELEN ); + msg->msg_namelen =ISOTP_MIN_NAMELEN ;memcpy (msg->msg_name, skb->cb, msg->msg_namelen); }skb_free_datagram (sk, skb);
@@ -1057,11 +1063,11 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)struct net_device *dev;int err =0 ;int notify_enetdown =0 ;int do_rx_reg =1 ; - if (len < CAN_REQUIRED_SIZE(struct sockaddr_can, can_addr.tp)) +if (len <ISOTP_MIN_NAMELEN )return -EINVAL ;/* do not register frame reception for functional addressing */ if (so->opt.flags &CAN_ISOTP_SF_BROADCAST ) do_rx_reg =0 ;
@@ -1153,17 +1159,17 @@ static int isotp_getname(struct socket *sock, struct sockaddr *uaddr, int peer)struct isotp_sock *so =isotp_sk (sk);if (peer)return -EOPNOTSUPP ; -memset (addr,0 ,sizeof (*addr)); +memset (addr,0 ,ISOTP_MIN_NAMELEN ); addr->can_family =AF_CAN ; addr->can_ifindex = so->ifindex; addr->can_addr.tp.rx_id = so->rxid; addr->can_addr.tp.tx_id = so->txid; -return sizeof (*addr); +return ISOTP_MIN_NAMELEN ; }static int isotp_setsockopt (struct socket *sock,int level,int optname,sockptr_t optval,unsigned int optlen) {
net/can/raw.c +11 -6
@@ -58,10 +58,12 @@MODULE_DESCRIPTION ("PF_CAN raw protocol" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Urs Thuermann <[email protected]>" );MODULE_ALIAS ("can-proto-1" ); +#define RAW_MIN_NAMELEN CAN_REQUIRED_SIZE(struct sockaddr_can, can_ifindex) +#define MASK_ALL 0/* A raw socket has a list of can_filters attached to it, each receiving * the CAN frames matching that filter. If the filter list is empty, * no CAN frames will be received by the socket. The default after
@@ -392,11 +394,11 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)struct raw_sock *ro =raw_sk (sk);int ifindex;int err =0 ;int notify_enetdown =0 ; -if (len <CAN_REQUIRED_SIZE (*addr, can_ifindex)) +if (len <RAW_MIN_NAMELEN )return -EINVAL ;if (addr->can_family !=AF_CAN )return -EINVAL ;lock_sock (sk);
@@ -473,15 +475,15 @@ static int raw_getname(struct socket *sock, struct sockaddr *uaddr,struct raw_sock *ro =raw_sk (sk);if (peer)return -EOPNOTSUPP ; -memset (addr,0 ,sizeof (*addr)); +memset (addr,0 ,RAW_MIN_NAMELEN ); addr->can_family =AF_CAN ; addr->can_ifindex = ro->ifindex; -return sizeof (*addr); +return RAW_MIN_NAMELEN ; }static int raw_setsockopt (struct socket *sock,int level,int optname,sockptr_t optval,unsigned int optlen) {
@@ -737,11 +739,11 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)int err;if (msg->msg_name) { DECLARE_SOCKADDR(struct sockaddr_can *, addr, msg->msg_name); -if (msg->msg_namelen <CAN_REQUIRED_SIZE (*addr, can_ifindex)) +if (msg->msg_namelen <RAW_MIN_NAMELEN )return -EINVAL ;if (addr->can_family !=AF_CAN )return -EINVAL ;
@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; +if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +if (flags &MSG_ERRQUEUE )return sock_recv_errqueue (sk, msg, size,SOL_CAN_RAW ,SCM_CAN_RAW_ERRQUEUE ); skb =skb_recv_datagram (sk, flags, noblock, &err);
@@ -830,12 +835,12 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, }sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { -__sockaddr_check_size (sizeof (struct sockaddr_can )); - msg->msg_namelen =sizeof (struct sockaddr_can ); +__sockaddr_check_size (RAW_MIN_NAMELEN ); + msg->msg_namelen =RAW_MIN_NAMELEN ;memcpy (msg->msg_name, skb->cb, msg->msg_namelen); }/* assign the flags that have been recorded in raw_rcv() */ msg->msg_flags |= *(raw_flags (skb));
Signature · 1 line
2.30.2
Oliver,
----- Ursprüngliche Mail -----
net/can/raw.c static int raw_recvmsg(struct socket *sock, struct msghdr · line 818
Quoted 10 lines
net/can/raw.c +3
-0@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; +if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +
Like with Kurt's patch, my test fails here too because msg->msg_namelen is 0. ->msg_namelen is always 0 in the recvfrom() case.
Thanks,
//richard
Oliver Hartkopp
maintainerQuoted 10 lines · Richard Weinberger
Oliver,
----- Ursprüngliche Mail -----
Quoted 7 lines
net/can/bcm.c +0
-0@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ;
Quoted 6 lines
net/can/raw.c static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 817
Quoted 3 lines
net/can/raw.c +3
-0+if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +Like with Kurt's patch, my test fails here too because
msg->msg_namelenis 0. ->msg_namelen is always 0 in therecvfrom()case.
Agreed!
I just adopted that part and did no more testing yesterday (needed some sleep).
E.g. 'candump any' also fails at CAN frame reception time due to this wrong check ;-)
Will send an update soon.
Regards,
Oliver
Quoted 18 lines · Oliver Hartkopp
Quoted 10 lines · Richard Weinberger
Oliver,
----- Ursprüngliche Mail -----
Quoted 7 lines
net/can/bcm.c +0
-0@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ;Quoted 6 lines
net/can/raw.c static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 817
Quoted 3 lines
net/can/raw.c +3
-0+if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +Like with Kurt's patch, my test fails here too because
msg->msg_namelenis 0. ->msg_namelen is always 0 in therecvfrom()case.
Quoted 7 lines
Agreed!
I just adopted that part and did no more testing yesterday (needed some sleep).
E.g. 'candump any' also fails at CAN frame reception time due to this wrong check ;-)
I'd like to understand how this check is wrong. msg->msg_namelen should contain the size of msg->msg_name, isn't it. if that is less than RAW_MIN_NAMELEN, you can't store the address.
candump sets msg->msg_namelen to sizeof(), so it is not 0.
Quoted 2 lines
Will send an update soon.
looking forward
Kurt
Quoted 9 lines · Kurt Van Dijck
Quoted 8 lines · Oliver Hartkopp
Quoted 7 lines · Richard Weinberger
Oliver,
----- Ursprüngliche Mail -----
Quoted 4 lines
net/can/bcm.c +0
-0@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int noblock;
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
net/can/raw.c static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 817
Quoted 6 lines
net/can/raw.c +3
-0noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; +if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +
This indeed fails. There exists a thin layer between the syscall and socket's recvmsg that puts a seperate sockaddr and length 0 :-(
Quoted 23 lines
Quoted 11 lines
Quoted 3 lines
Like with Kurt's patch, my test fails here too because
msg->msg_namelenis 0. ->msg_namelen is always 0 in therecvfrom()case.Agreed!
I just adopted that part and did no more testing yesterday (needed some sleep).
E.g. 'candump any' also fails at CAN frame reception time due to this wrong check ;-)
I'd like to understand how this check is wrong.
msg->msg_namelenshould contain the size ofmsg->msg_name, isn't it. if that is less thanRAW_MIN_NAMELEN, you can't store the address.candump sets
msg->msg_namelentosizeof(), so it is not 0.Quoted 2 lines
Will send an update soon.
looking forward
Kurt
Quoted 20 lines · Oliver Hartkopp
Since commit
f5223e9eee65("can: extendsockaddr_canto include j1939 members") thesockaddr_canhas been extended in size and a newCAN_REQUIRED_SIZEmacro has been introduced to calculate the protocol specific needed size.The ABI for the
msg_nameandmsg_namelenhas not been adapted to the newCAN_REQUIRED_SIZEmacro which leads to a problem when an existing binary reads the (increased) structsockaddr_caninmsg_name.Fixes f5223e9eee65 ("can: extend sockaddr_can to include j1939 members")Reported-by Richard Weinberger <[email protected]>Suggested-by Kurt Van Dijck <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>--- net/can/bcm.c | 14 ++++++++++---- net/can/isotp.c | 14 ++++++++++---- net/can/raw.c | 17 +++++++++++------ 3 files changed, 31 insertions(+), 14 deletions(-)
...
Quoted 15 lines
net/can/raw.c +3
-0@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; +if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +if (flags &MSG_ERRQUEUE )return sock_recv_errqueue (sk, msg, size,SOL_CAN_RAW ,SCM_CAN_RAW_ERRQUEUE ); skb =skb_recv_datagram (sk, flags, noblock, &err);
net/can/raw.c static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 841
Quoted 9 lines
net/can/raw.c +2
-2@@ -830,12 +835,12 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, }sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { -__sockaddr_check_size (sizeof (struct sockaddr_can )); - msg->msg_namelen =sizeof (struct sockaddr_can ); +__sockaddr_check_size (RAW_MIN_NAMELEN ); + msg->msg_namelen =RAW_MIN_NAMELEN ;
Why not fill up to MIN(msg->msg_namelen, sizeof(struct sockaddr_can))?
Quoted 8 lines
net/can/raw.c +0
-0memcpy (msg->msg_name, skb->cb, msg->msg_namelen); }/* assign the flags that have been recorded in raw_rcv() */ msg->msg_flags |= *(raw_flags (skb));Signature · 1 line
2.30.2
Oliver Hartkopp
maintainerQuoted 41 lines · Kurt Van Dijck
Quoted 20 lines · Oliver Hartkopp
Since commit
f5223e9eee65("can: extendsockaddr_canto include j1939 members") thesockaddr_canhas been extended in size and a newCAN_REQUIRED_SIZEmacro has been introduced to calculate the protocol specific needed size.The ABI for the
msg_nameandmsg_namelenhas not been adapted to the newCAN_REQUIRED_SIZEmacro which leads to a problem when an existing binary reads the (increased) structsockaddr_caninmsg_name.Fixes f5223e9eee65 ("can: extend sockaddr_can to include j1939 members")Reported-by Richard Weinberger <[email protected]>Suggested-by Kurt Van Dijck <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>--- net/can/bcm.c | 14 ++++++++++---- net/can/isotp.c | 14 ++++++++++---- net/can/raw.c | 17 +++++++++++------ 3 files changed, 31 insertions(+), 14 deletions(-)...
Quoted 19 lines
net/can/raw.c +3
-0@@ -808,10 +810,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,int noblock; noblock = flags &MSG_DONTWAIT ; flags &= ~MSG_DONTWAIT ; +if (msg->msg_name && msg->msg_namelen <RAW_MIN_NAMELEN ) +return -EINVAL ; +if (flags &MSG_ERRQUEUE )return sock_recv_errqueue (sk, msg, size,SOL_CAN_RAW ,SCM_CAN_RAW_ERRQUEUE ); skb =skb_recv_datagram (sk, flags, noblock, &err);@@ -830,12 +835,12 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, }sock_recv_ts_and_drops (msg, sk, skb);
Quoted 8 lines
net/can/raw.c static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, · line 841
Quoted 5 lines
net/can/raw.c +2
-2if (msg->msg_name) { -__sockaddr_check_size (sizeof (struct sockaddr_can )); - msg->msg_namelen =sizeof (struct sockaddr_can ); +__sockaddr_check_size (RAW_MIN_NAMELEN ); + msg->msg_namelen =RAW_MIN_NAMELEN ;Why not fill up to
MIN(msg->msg_namelen, sizeof(struct sockaddr_can))?
I checked that in j1939/socket.c and there the content is also reduced to the minimum size.
At least that makes sense to me to have that consistent.
Regards,
Oliver
Quoted 8 lines
Quoted 8 lines
net/can/raw.c +0
-0memcpy (msg->msg_name, skb->cb, msg->msg_namelen); }/* assign the flags that have been recorded in raw_rcv() */ msg->msg_flags |= *(raw_flags (skb));Signature · 1 line
2.30.2