logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0002-Avoid-pointer-arithmetic-on-void.patch (9982B)

    

  1. From 2bb631b109219f0e9bea49294b9408269ce9b5ee Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sat, 1 May 2021 01:37:10 -0700
  4. Subject: [PATCH] Avoid pointer arithmetic on `void *`
  6. void is an incomplete type, so cannot be used in pointer arithmetic.
  7. ---
  8.  tools/aisimage.c      |  2 +-
  9.  tools/default_image.c |  4 ++--
  10.  tools/mtk_image.c     |  6 +++---
  11.  tools/omapimage.c     | 10 +++++-----
  12.  tools/rkcommon.c      | 10 +++++-----
  13.  tools/rkspi.c         |  6 +++---
  14.  tools/socfpgaimage.c  |  2 +-
  15.  tools/stm32image.c    |  2 +-
  16.  tools/zynqmpbif.c     |  8 ++++----
  17.  tools/zynqmpimage.c   |  8 ++++----
  18.  10 files changed, 29 insertions(+), 29 deletions(-)
  20. diff --git a/tools/aisimage.c b/tools/aisimage.c
  21. index b8b3ee3207..58eb596844 100644
  22. --- a/tools/aisimage.c
  23. +++ b/tools/aisimage.c
  24. @@ -148,7 +148,7 @@ static void aisimage_print_header(const void *hdr)
  25.  		fprintf(stdout, "AIS cmd   :   %s\n",
  26.  			get_table_entry_name(aisimage_cmds, NULL, id));
  27.  		ptr += cmd_table[id].nargs + IS_FNC_EXEC(id) + 1;
  28. -		if (((void *)ptr - hdr) > ais_img_size) {
  29. +		if ((char *)ptr - (char *)hdr > ais_img_size) {
  30.  			fprintf(stderr,
  31.  				"AIS Image not terminated by JMPCLOSE\n");
  32.  			return;
  33. diff --git a/tools/default_image.c b/tools/default_image.c
  34. index e164c0c27d..d2e3688908 100644
  35. --- a/tools/default_image.c
  36. +++ b/tools/default_image.c
  37. @@ -98,8 +98,8 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
  38.  	image_header_t * hdr = (image_header_t *)ptr;
  39.  
  40.  	checksum = crc32(0,
  41. -			(const unsigned char *)(ptr +
  42. -				sizeof(image_header_t)),
  43. +			(const unsigned char *)ptr +
  44. +				sizeof(image_header_t),
  45.  			sbuf->st_size - sizeof(image_header_t));
  46.  
  47.  	time = imagetool_get_source_date(params->cmdname, sbuf->st_mtime);
  48. diff --git a/tools/mtk_image.c b/tools/mtk_image.c
  49. index bde1e5da4b..3038402413 100644
  50. --- a/tools/mtk_image.c
  51. +++ b/tools/mtk_image.c
  52. @@ -688,7 +688,7 @@ static void mtk_image_set_gen_header(void *ptr, off_t filesize,
  53.  	hdr->brlyt.total_size_2 = hdr->brlyt.total_size;
  54.  
  55.  	/* GFH header */
  56. -	gfh = (struct gfh_header *)(ptr + sizeof(struct gen_device_header));
  57. +	gfh = (struct gfh_header *)((char *)ptr + sizeof(struct gen_device_header));
  58.  	put_ghf_header(gfh, filesize, sizeof(struct gen_device_header),
  59.  		       loadaddr, GFH_FLASH_TYPE_GEN);
  60.  
  61. @@ -714,7 +714,7 @@ static void mtk_image_set_nand_header(void *ptr, off_t filesize,
  62.  	payload_pages = (filesize + le16_to_cpu(hdr_nand->pagesize) - 1) /
  63.  			le16_to_cpu(hdr_nand->pagesize);
  64.  	brlyt = (struct brom_layout_header *)
  65. -		(ptr + le16_to_cpu(hdr_nand->pagesize));
  66. +		((char *)ptr + le16_to_cpu(hdr_nand->pagesize));
  67.  	put_brom_layout_header(brlyt, hdr_media);
  68.  	brlyt->header_size = cpu_to_le32(2);
  69.  	brlyt->total_size = cpu_to_le32(payload_pages);
  70. @@ -723,7 +723,7 @@ static void mtk_image_set_nand_header(void *ptr, off_t filesize,
  71.  	brlyt->unused = cpu_to_le32(1);
  72.  
  73.  	/* GFH header */
  74. -	gfh = (struct gfh_header *)(ptr + 2 * le16_to_cpu(hdr_nand->pagesize));
  75. +	gfh = (struct gfh_header *)((char *)ptr + 2 * le16_to_cpu(hdr_nand->pagesize));
  76.  	put_ghf_header(gfh, filesize, 2 * le16_to_cpu(hdr_nand->pagesize),
  77.  		       loadaddr, GFH_FLASH_TYPE_NAND);
  78.  
  79. diff --git a/tools/omapimage.c b/tools/omapimage.c
  80. index c59cdcc79b..90c279fb05 100644
  81. --- a/tools/omapimage.c
  82. +++ b/tools/omapimage.c
  83. @@ -89,7 +89,7 @@ static void omapimage_print_header(const void *ptr)
  84.  {
  85.  	const struct ch_toc *toc = (struct ch_toc *)ptr;
  86.  	const struct gp_header *gph =
  87. -			(struct gp_header *)(ptr+OMAP_CH_HDR_SIZE);
  88. +			(struct gp_header *)((char *)ptr+OMAP_CH_HDR_SIZE);
  89.  	uint32_t offset, size;
  90.  
  91.  	while (toc->section_offset != 0xffffffff
  92. @@ -111,7 +111,7 @@ static void omapimage_print_header(const void *ptr)
  93.  			toc->section_offset,
  94.  			toc->section_size);
  95.  
  96. -		omapimage_print_section((struct ch_settings *)(ptr+offset));
  97. +		omapimage_print_section((struct ch_settings *)((char *)ptr+offset));
  98.  		toc++;
  99.  	}
  100.  
  101. @@ -120,7 +120,7 @@ static void omapimage_print_header(const void *ptr)
  102.  
  103.  static int toc_offset(void *hdr, void *member)
  104.  {
  105. -	return member - hdr;
  106. +	return (char *)member - (char *)hdr;
  107.  }
  108.  
  109.  static void omapimage_set_header(void *ptr, struct stat *sbuf, int ifd,
  110. @@ -128,8 +128,8 @@ static void omapimage_set_header(void *ptr, struct stat *sbuf, int ifd,
  111.  {
  112.  	struct ch_toc *toc = (struct ch_toc *)ptr;
  113.  	struct ch_settings *chs = (struct ch_settings *)
  114. -					(ptr + 2 * sizeof(*toc));
  115. -	struct gp_header *gph = (struct gp_header *)(ptr + OMAP_CH_HDR_SIZE);
  116. +					((char *)ptr + 2 * sizeof(*toc));
  117. +	struct gp_header *gph = (struct gp_header *)((char *)ptr + OMAP_CH_HDR_SIZE);
  118.  
  119.  	toc->section_offset = toc_offset(ptr, chs);
  120.  	toc->section_size = sizeof(struct ch_settings);
  121. diff --git a/tools/rkcommon.c b/tools/rkcommon.c
  122. index d55cd2c2d5..8853b2560c 100644
  123. --- a/tools/rkcommon.c
  124. +++ b/tools/rkcommon.c
  125. @@ -249,7 +249,7 @@ static void rkcommon_set_header0(void *buf, struct image_tool_params *params)
  126.  void rkcommon_set_header(void *buf,  struct stat *sbuf,  int ifd,
  127.  			 struct image_tool_params *params)
  128.  {
  129. -	struct header1_info *hdr = buf + RK_SPL_HDR_START;
  130. +	struct header1_info *hdr = (void *)((char *)buf + RK_SPL_HDR_START);
  131.  
  132.  	rkcommon_set_header0(buf, params);
  133.  
  134. @@ -262,7 +262,7 @@ void rkcommon_set_header(void *buf,  struct stat *sbuf,  int ifd,
  135.  
  136.  	if (spl_params.boot_file) {
  137.  		if (rkcommon_need_rc4_spl(params))
  138. -			rkcommon_rc4_encode_spl(buf + RK_SPL_HDR_START,
  139. +			rkcommon_rc4_encode_spl((char *)buf + RK_SPL_HDR_START,
  140.  						spl_params.init_size,
  141.  						spl_params.boot_size);
  142.  	}
  143. @@ -302,8 +302,8 @@ static int rkcommon_parse_header(const void *buf, struct header0_info *header0,
  144.  		return -ENOSYS;
  145.  
  146.  	hdr1_offset = le16_to_cpu(header0->init_offset) * RK_BLK_SIZE;
  147. -	hdr1_sdmmc = (struct header1_info *)(buf + hdr1_offset);
  148. -	hdr1_spi = (struct header1_info *)(buf +
  149. +	hdr1_sdmmc = (struct header1_info *)((char *)buf + hdr1_offset);
  150. +	hdr1_spi = (struct header1_info *)((char *)buf +
  151.  					   rkcommon_offset_to_spi(hdr1_offset));
  152.  
  153.  	for (i = 0; i < ARRAY_SIZE(spl_infos); i++) {
  154. @@ -392,7 +392,7 @@ void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size)
  155.  	while (remaining > 0) {
  156.  		int step = (remaining > RK_BLK_SIZE) ? RK_BLK_SIZE : remaining;
  157.  
  158. -		rc4_encode(buf + offset, step, rc4_key);
  159. +		rc4_encode((char *)buf + offset, step, rc4_key);
  160.  		offset += RK_BLK_SIZE;
  161.  		remaining -= step;
  162.  	}
  163. diff --git a/tools/rkspi.c b/tools/rkspi.c
  164. index f2530f7bde..7bd13f3749 100644
  165. --- a/tools/rkspi.c
  166. +++ b/tools/rkspi.c
  167. @@ -37,10 +37,10 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
  168.  
  169.  	for (sector = size / RKSPI_SECT_LEN - 1; sector >= 0; sector--) {
  170.  		debug("sector %u\n", sector);
  171. -		memmove(buf + sector * RKSPI_SECT_LEN * 2,
  172. -			buf + sector * RKSPI_SECT_LEN,
  173. +		memmove((char *)buf + sector * RKSPI_SECT_LEN * 2,
  174. +			(char *)buf + sector * RKSPI_SECT_LEN,
  175.  			RKSPI_SECT_LEN);
  176. -		memset(buf + sector * RKSPI_SECT_LEN * 2 + RKSPI_SECT_LEN,
  177. +		memset((char *)buf + sector * RKSPI_SECT_LEN * 2 + RKSPI_SECT_LEN,
  178.  		       '\0', RKSPI_SECT_LEN);
  179.  	}
  180.  }
  181. diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c
  182. index eba812fec9..a206323d6c 100644
  183. --- a/tools/socfpgaimage.c
  184. +++ b/tools/socfpgaimage.c
  185. @@ -315,7 +315,7 @@ static void socfpgaimage_print_header_v1(struct socfpga_header_v1 *header)
  186.  
  187.  static void socfpgaimage_print_header(const void *ptr)
  188.  {
  189. -	const void *header = ptr + HEADER_OFFSET;
  190. +	const void *header = (char *)ptr + HEADER_OFFSET;
  191.  	struct socfpga_header_v0 *header_v0;
  192.  
  193.  	if (sfp_verify_buffer(ptr) == 0) {
  194. diff --git a/tools/stm32image.c b/tools/stm32image.c
  195. index 18357c0518..9252362654 100644
  196. --- a/tools/stm32image.c
  197. +++ b/tools/stm32image.c
  198. @@ -58,7 +58,7 @@ static uint32_t stm32image_checksum(void *start, uint32_t len)
  199.  	if (len < hdr_len)
  200.  		return 0;
  201.  
  202. -	p = start + hdr_len;
  203. +	p = (uint8_t *)((char *)start + hdr_len);
  204.  	len -= hdr_len;
  205.  
  206.  	while (len > 0) {
  207. diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
  208. index 82ce0ac1a5..04325afa20 100644
  209. --- a/tools/zynqmpbif.c
  210. +++ b/tools/zynqmpbif.c
  211. @@ -262,7 +262,7 @@ static int bif_add_blob(const void *data, size_t len, size_t *offset)
  212.  
  213.  	new_size = ROUND(bif_output.data_len + len, 64);
  214.  	new_data = realloc(bif_output.data, new_size);
  215. -	memcpy(new_data + bif_output.data_len, data, len);
  216. +	memcpy((char *)new_data + bif_output.data_len, data, len);
  217.  	if (offset)
  218.  		*offset = bif_output.data_len;
  219.  	bif_output.data = new_data;
  220. @@ -270,11 +270,11 @@ static int bif_add_blob(const void *data, size_t len, size_t *offset)
  221.  
  222.  	/* Readjust internal pointers */
  223.  	if (bif_output.header)
  224. -		bif_output.header = new_data + header_off;
  225. +		bif_output.header = (void *)((char *)new_data + header_off);
  226.  	if (bif_output.last_part)
  227. -		bif_output.last_part = new_data + last_part_off;
  228. +		bif_output.last_part = (void *)((char *)new_data + last_part_off);
  229.  	if (bif_output.imgheader)
  230. -		bif_output.imgheader = new_data + imgheader_off;
  231. +		bif_output.imgheader = (void *)((char *)new_data + imgheader_off);
  232.  
  233.  	return 0;
  234.  }
  235. diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c
  236. index 19b2f02ff1..20122d1320 100644
  237. --- a/tools/zynqmpimage.c
  238. +++ b/tools/zynqmpimage.c
  239. @@ -250,15 +250,15 @@ void zynqmpimage_print_header(const void *ptr)
  240.  	}
  241.  
  242.  	if (zynqhdr->image_header_table_offset) {
  243. -		struct image_header_table *iht = (void *)ptr +
  244. -			zynqhdr->image_header_table_offset;
  245. +		struct image_header_table *iht = (void *)((char *)ptr +
  246. +			zynqhdr->image_header_table_offset);
  247.  		struct partition_header *ph;
  248.  		uint32_t ph_offset;
  249.  		uint32_t next;
  250.  		int i;
  251.  
  252.  		ph_offset = le32_to_cpu(iht->partition_header_offset) * 4;
  253. -		ph = (void *)ptr + ph_offset;
  254. +		ph = (void *)((char *)ptr + ph_offset);
  255.  		for (i = 0; i < le32_to_cpu(iht->nr_parts); i++) {
  256.  			next = le32_to_cpu(ph->next_partition_offset) * 4;
  257.  
  258. @@ -266,7 +266,7 @@ void zynqmpimage_print_header(const void *ptr)
  259.  			if (i)
  260.  				print_partition(ptr, ph);
  261.  
  262. -			ph = (void *)ptr + next;
  263. +			ph = (void *)((char *)ptr + next);
  264.  		}
  265.  	}
  266.  
  267. -- 
  268. 2.31.1