From: Sven Eckelmann Date: Sat, 14 May 2011 21:14:49 +0000 (+0200) Subject: batman-adv: Don't do pointer arithmetic with void* X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38e3c5f0dae7a3bbb32c3b2bb28c3f2557d40fe9;p=linux-beck.git batman-adv: Don't do pointer arithmetic with void* The size of void is currently set by gcc to 1, but is not well defined in general. Therefore it is more advisable to cast it to char* before doing pointer arithmetic. Signed-off-by: Sven Eckelmann --- diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 40a30bbcd147..ae54f77f2c1b 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -559,7 +559,7 @@ static int orig_node_del_if(struct orig_node *orig_node, memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size); /* copy second part */ - memcpy(data_ptr + del_if_num * chunk_size, + memcpy((char *)data_ptr + del_if_num * chunk_size, orig_node->bcast_own + ((del_if_num + 1) * chunk_size), (max_if_num - del_if_num) * chunk_size); @@ -579,7 +579,7 @@ free_bcast_own: memcpy(data_ptr, orig_node->bcast_own_sum, del_if_num * sizeof(uint8_t)); - memcpy(data_ptr + del_if_num * sizeof(uint8_t), + memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)), (max_if_num - del_if_num) * sizeof(uint8_t));