GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/libpayload/drivers/storage: Get rid of void pointer math 

Pointer math with void pointers is illegal in many compilers, though it
works with GCC because it assumes size of void to be 1. In this particular
situation, dev->buf is already pointer to u8, and there's no need to convert
to void *.

BUG=b:118484178
TEST=Build libpayload.

Change-Id: Ib70b8ce11abc88c35be4092f097cfff385921f46
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/29442
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Richard Spiegel 2018-11-02 14:23:52 -07:00 committed by Patrick Georgi
parent b59c1f4345
commit 509d99ca6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
payloads/libpayload/drivers/storage/ahci_common.c
View File

@ -72,7 +72,7 @@ static u8 *ahci_prdbuf_init(ahci_dev_t *const dev,
if ((u32)user_buf & 1) { if ((u32)user_buf & 1) {
printf("ahci: Odd buffer pointer (%p).\n", user_buf); printf("ahci: Odd buffer pointer (%p).\n", user_buf);
if (dev->buf) /* orphaned buffer */ if (dev->buf) /* orphaned buffer */
free((void *)dev->buf - *(dev->buf - 1)); free(dev->buf - *(dev->buf - 1));
dev->buf = malloc(len + 2); dev->buf = malloc(len + 2);
if (!dev->buf) if (!dev->buf)
return NULL; return NULL;
@ -100,7 +100,7 @@ static void ahci_prdbuf_finalize(ahci_dev_t *const dev)
if (dev->buf) { if (dev->buf) {
if (dev->write_back) if (dev->write_back)
memcpy(dev->user_buf, dev->buf, dev->buflen); memcpy(dev->user_buf, dev->buf, dev->buflen);
free((void *)dev->buf - *(dev->buf - 1)); free(dev->buf - *(dev->buf - 1));
} }
dev->buf = NULL; dev->buf = NULL;
dev->user_buf = NULL; dev->user_buf = NULL;