w1: Split memcpy() of struct cn_msg flexible array

To work around a misbehavior of the compiler's ability to see into
composite flexible array structs (as detailed in the coming memcpy()
hardening series[1]), split the memcpy() of the header and the payload
so no false positive run-time overflow warning will be generated.

[1] https://lore.kernel.org/linux-hardening/20220901065914.1417829[email protected]/

Cc: Evgeniy Polyakov <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
Reviewed-by: Gustavo A. R. Silva <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
index fa490aa4407c03e90dbdfa8fadd2664fd95004da..db110cc442b1307d9ca6164eed9ae0e2c0bf8755 100644 (file)
--- a/drivers/w1/w1_netlink.c
+++ b/drivers/w1/w1_netlink.c
@@ -611,7 +611,8 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
                }
                atomic_set(&block->refcnt, 1);
                block->portid = nsp->portid;
-               memcpy(&block->request_cn, cn, sizeof(*cn) + cn->len);
+               block->request_cn = *cn;
+               memcpy(block->request_cn.data, cn->data, cn->len);
                node = (struct w1_cb_node *)(block->request_cn.data + cn->len);
 
                /* Sneeky, when not bundling, reply_size is the allocated space