Patchwork e1000: fix build on Ubuntu with _FORTIFY_SOURCE

login
register
mail settings
Submitter Thomas Monjalon
Date March 31, 2010, 9:22 a.m.
Message ID <1270027371-25548-1-git-send-email-thomas_ml@monjalon.net>
Download mbox | patch
Permalink /patch/49111/
State New
Headers show

Comments

Thomas Monjalon - March 31, 2010, 9:22 a.m.
From: Thomas Monjalon <thomas@monjalon.net>

There was a pointer cast warning on Ubuntu since _FORTIFY_SOURCE has been reenabled.

_FORTIFY_SOURCE had been disabled by 4a24470497360d8b77568b83008d0e9d6eb0787d
and reenabled by 849583050d5f6f782718be8cb50688978973fbea.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 hw/e1000.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Aurelien Jarno - April 8, 2010, 7:32 p.m.
On Wed, Mar 31, 2010 at 11:22:51AM +0200, Thomas Monjalon wrote:
> From: Thomas Monjalon <thomas@monjalon.net>
> 
> There was a pointer cast warning on Ubuntu since _FORTIFY_SOURCE has been reenabled.
> 
> _FORTIFY_SOURCE had been disabled by 4a24470497360d8b77568b83008d0e9d6eb0787d
> and reenabled by 849583050d5f6f782718be8cb50688978973fbea.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Thanks, applied.

> ---
>  hw/e1000.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/e1000.c b/hw/e1000.c
> index fd3059a..34cc451 100644
> --- a/hw/e1000.c
> +++ b/hw/e1000.c
> @@ -642,7 +642,7 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
>  
>      if (vlan_enabled(s) && is_vlan_packet(s, buf)) {
>          vlan_special = cpu_to_le16(be16_to_cpup((uint16_t *)(buf + 14)));
> -        memmove((void *)(buf + 4), buf, 12);
> +        memmove((uint8_t *)buf + 4, buf, 12);
>          vlan_status = E1000_RXD_STAT_VP;
>          vlan_offset = 4;
>          size -= 4;
> -- 
> 1.7.0.3
> 
> 
> 
> 
> 
>

Patch

diff --git a/hw/e1000.c b/hw/e1000.c
index fd3059a..34cc451 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -642,7 +642,7 @@  e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
 
     if (vlan_enabled(s) && is_vlan_packet(s, buf)) {
         vlan_special = cpu_to_le16(be16_to_cpup((uint16_t *)(buf + 14)));
-        memmove((void *)(buf + 4), buf, 12);
+        memmove((uint8_t *)buf + 4, buf, 12);
         vlan_status = E1000_RXD_STAT_VP;
         vlan_offset = 4;
         size -= 4;