can-isotp: introduce CAN_REQUIRED_SIZE macro

The size of this structure will be increased with J1939 support. To stay binary compatible, the CAN_REQUIRED_SIZE macro is introduced for existing CAN protocols. Follow upstream commit 9868b5d44f3d ("can: introduce CAN_REQUIRED_SIZE macro") Signed-off-by: Oliver Hartkopp <[email protected]>
hartkopp · Jan 15, 2020 · fbed98a · fbed98a
1 parent b31bce9
commit fbed98a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/net/can/isotp.c b/net/can/isotp.c
@@ -1096,7 +1096,11 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len)
 	int err = 0;
 	int notify_enetdown = 0;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+	if (len < CAN_REQUIRED_SIZE(*addr, can_ifindex))
+#else
 	if (len < sizeof(*addr))
+#endif
 		return -EINVAL;
 
 	if (addr->can_addr.tp.rx_id == addr->can_addr.tp.tx_id)