[PATCH 1/1] mac80211: Tkip fix sparse endianity complain in tkip code

[PATCH 1/1] mac80211: Tkip fix sparse endianity complain in tkip code

[Tomas Winkler]

This patch fix wrong cast in tkip code

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 net/mac80211/tkip.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index f61f1dd..0ce2a84 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -118,7 +118,7 @@ static u8 *set_ext_iv(u8 *pos, u16 iv16)
 
 static u8 *set_tkip_iv(u8 *pos, u32 iv32)
 {
-	*((u32 *)pos) = cpu_to_le32(iv32);
+	*((__le32 *)pos) = cpu_to_le32(iv32);
 	return pos + 4;
 }
 
-- 
1.5.4.1

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH 1/1] mac80211: Tkip fix sparse endianity complain in tkip code

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 785 bytes --]


On Thu, 2008-03-13 at 20:05 +0200, Tomas Winkler wrote:
> This patch fix wrong cast in tkip code
> 
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
>  net/mac80211/tkip.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
> index f61f1dd..0ce2a84 100644
> --- a/net/mac80211/tkip.c
> +++ b/net/mac80211/tkip.c
> @@ -118,7 +118,7 @@ static u8 *set_ext_iv(u8 *pos, u16 iv16)
>  
>  static u8 *set_tkip_iv(u8 *pos, u32 iv32)
>  {
> -	*((u32 *)pos) = cpu_to_le32(iv32);
> +	*((__le32 *)pos) = cpu_to_le32(iv32);

The patch introducing this code will be reverted because this is also
rather bad code since it's not known that "pos" is aligned to a
four-byte boundary.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH 1/1] mac80211: Tkip fix sparse endianity complain in tkip code

[Tomas Winkler]

On Thu, Mar 13, 2008 at 11:02 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
>
>  On Thu, 2008-03-13 at 20:05 +0200, Tomas Winkler wrote:
>  > This patch fix wrong cast in tkip code
>  >
>  > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
>  > ---
>  >  net/mac80211/tkip.c |    2 +-
>  >  1 files changed, 1 insertions(+), 1 deletions(-)
>  >
>  > diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
>  > index f61f1dd..0ce2a84 100644
>  > --- a/net/mac80211/tkip.c
>  > +++ b/net/mac80211/tkip.c
>  > @@ -118,7 +118,7 @@ static u8 *set_ext_iv(u8 *pos, u16 iv16)
>  >
>  >  static u8 *set_tkip_iv(u8 *pos, u32 iv32)
>  >  {
>  > -     *((u32 *)pos) = cpu_to_le32(iv32);
>  > +     *((__le32 *)pos) = cpu_to_le32(iv32);
>
>  The patch introducing this code will be reverted because this is also
>  rather bad code since it's not known that "pos" is aligned to a
>  four-byte boundary.

Agree, actually I was puzzled it was even merged in after all these
discussions. Anyhow it sparsed into my eye so I put a patch on it.

>
>  johannes
>

Re: [PATCH 1/1] mac80211: Tkip fix sparse endianity complain in tkip code

[John W. Linville]

On Fri, Mar 14, 2008 at 01:57:39AM +0200, Tomas Winkler wrote:
> On Thu, Mar 13, 2008 at 11:02 PM, Johannes Berg
> <johannes@sipsolutions.net> wrote:

> >  The patch introducing this code will be reverted because this is also
> >  rather bad code since it's not known that "pos" is aligned to a
> >  four-byte boundary.
> 
> Agree, actually I was puzzled it was even merged in after all these
> discussions. Anyhow it sparsed into my eye so I put a patch on it.

The beauty of the wireless-testing tree is it gives me more freedom
to merge patches without being married to them. :-)

John
-- 
John W. Linville
linville@tuxdriver.com