linux: make UBSAN quiet

yuwata · yuwata · commit ffba064ae4d1 · 2019-06-25T11:44:08.000+09:00
diff --git a/src/shared/linux/README b/src/shared/linux/README
@@ -5,3 +5,4 @@ The files in this directory are copied from kernel-5.2, and the following modifi
 - bpf_insn.h: BPF_JMP_A() macro is also imported from include/linux/filter.h
 - dm-ioctl.h: set DM_VERSION_MINOR to 27
 - ethtool.h: define __KERNEL_DIV_ROUND_UP if not defined
+- ethtool.h: add casts in ethtool_cmd_speed()
diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h
@@ -126,7 +126,7 @@ static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
 
 static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
 {
-	return (ep->speed_hi << 16) | ep->speed;
+	return ((__u32) ep->speed_hi << 16) | (__u32) ep->speed;
 }
 
 /* Device supports clause 22 register access to PHY or peripherals

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,`
`126`	`126`
`127`	`127`	`static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)`
`128`	`128`	`{`
`129`		`- return (ep->speed_hi << 16) \| ep->speed;`
	`129`	`+ return ((__u32) ep->speed_hi << 16) \| (__u32) ep->speed;`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/* Device supports clause 22 register access to PHY or peripherals`