<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29442">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads/libpayload/drivers/storage: Get rid of void pointer math<br><br>Pointer math with void pointers is illegal in many compilers, though it<br>works with GCC because it assumes size of void to be 1. In this particular<br>situation, dev->buf is already pointer to u8, and there's no need to convert<br>to void *.<br><br>BUG=b:118484178<br>TEST=Build libpayload.<br><br>Change-Id: Ib70b8ce11abc88c35be4092f097cfff385921f46<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M payloads/libpayload/drivers/storage/ahci_common.c<br>1 file changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/29442/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/drivers/storage/ahci_common.c b/payloads/libpayload/drivers/storage/ahci_common.c</span><br><span>index bcb0ce7..ef9d43d 100644</span><br><span>--- a/payloads/libpayload/drivers/storage/ahci_common.c</span><br><span>+++ b/payloads/libpayload/drivers/storage/ahci_common.c</span><br><span>@@ -72,7 +72,7 @@</span><br><span>       if ((u32)user_buf & 1) {</span><br><span>                 printf("ahci: Odd buffer pointer (%p).\n", user_buf);</span><br><span>              if (dev->buf) /* orphaned buffer */</span><br><span style="color: hsl(0, 100%, 40%);">-                  free((void *)dev->buf - *(dev->buf - 1));</span><br><span style="color: hsl(120, 100%, 40%);">+                       free(dev->buf - *(dev->buf - 1));</span><br><span>              dev->buf = malloc(len + 2);</span><br><span>               if (!dev->buf)</span><br><span>                    return NULL;</span><br><span>@@ -100,7 +100,7 @@</span><br><span>   if (dev->buf) {</span><br><span>           if (dev->write_back)</span><br><span>                      memcpy(dev->user_buf, dev->buf, dev->buflen);</span><br><span style="color: hsl(0, 100%, 40%);">-          free((void *)dev->buf - *(dev->buf - 1));</span><br><span style="color: hsl(120, 100%, 40%);">+               free(dev->buf - *(dev->buf - 1));</span><br><span>      }</span><br><span>    dev->buf = NULL;</span><br><span>  dev->user_buf = NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29442">change 29442</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29442"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib70b8ce11abc88c35be4092f097cfff385921f46 </div>
<div style="display:none"> Gerrit-Change-Number: 29442 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>