Skip to contentSkip to conversation

af_ieee802154: make header uapi conform

PATCH In review Alexander Aring 2 participants 3 messages Jan 1, 2015 – Jan 3, 2015

Subsystems (2)
lore
Share & tools
lore

Alexander Aring

author maintainer
#0 lore raw

PATCH 1/1 af_ieee802154: make header uapi conform

This patch uses __u16 and __u8 instead of u16 and u8 typedefs. These typedefs coming from linux/types.h and are also easily available in standard userspace environments. The af_ieee802154 header is normally an userspace header. For now, we just copy this header in an userspace application.

---
The "int addr_type" should be the above enum. I will fix this later. This header has also other various issues. For now I just want the same version in userspace which is also inside kernelspace.

 include/net/af_ieee802154.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
include/net/af_ieee802154.h +4 -3
index 7d38e2f..63af3f2 100644
@@ -21,6 +21,7 @@
 #define _AF_IEEE802154_H
 
 #include <linux/socket.h> /* for sa_family_t */
+#include <linux/types.h>
 
 enum {
 	IEEE802154_ADDR_NONE = 0x0,
@@ -34,10 +35,10 @@ enum {
 
 struct ieee802154_addr_sa {
 	int addr_type;
-	u16 pan_id;
+	__u16 pan_id;
 	union {
-		u8 hwaddr[IEEE802154_ADDR_LEN];
-		u16 short_addr;
+		__u8 hwaddr[IEEE802154_ADDR_LEN];
+		__u16 short_addr;
 	};
 };
 
Signature · 1 line
2.2.0
#1 lore raw

Hi Alex,

Quoted 30 lines

This patch uses __u16 and __u8 instead of u16 and u8 typedefs. These typedefs coming from linux/types.h and are also easily available in standard userspace environments. The af_ieee802154 header is normally an userspace header. For now, we just copy this header in an userspace application.

---
The "int addr_type" should be the above enum. I will fix this later. This header has also other various issues. For now I just want the same version in userspace which is also inside kernelspace.

include/net/af_ieee802154.h | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)
include/net/af_ieee802154.h +1 -0
index 7d38e2f..63af3f2 100644
@@ -21,6 +21,7 @@
 #define _AF_IEEE802154_H
 
 #include <linux/socket.h> /* for sa_family_t */
+#include <linux/types.h>
 
 enum {
 	IEEE802154_ADDR_NONE = 0x0,
@@ -34,10 +35,10 @@ enum {
 
 struct ieee802154_addr_sa {

include/net/af_ieee802154.h enum { · line 43

Quoted 10 lines
include/net/af_ieee802154.h +3 -3
 	int addr_type;
-	u16 pan_id;
+	__u16 pan_id;
 	union {
-		u8 hwaddr[IEEE802154_ADDR_LEN];
-		u16 short_addr;
+		__u8 hwaddr[IEEE802154_ADDR_LEN];
+		__u16 short_addr;
 	};
 };

which address information is this? Are these the socket addresses you use for bind(), connect() etc.

In that case shouldn't this be sa_family_t instead.

Regards

Marcel

author maintainer
#2 lore raw

Hi Marcel,

Quoted 45 lines · Marcel Holtmann

Hi Alex,

Quoted 30 lines

This patch uses __u16 and __u8 instead of u16 and u8 typedefs. These typedefs coming from linux/types.h and are also easily available in standard userspace environments. The af_ieee802154 header is normally an userspace header. For now, we just copy this header in an userspace application.

---
The "int addr_type" should be the above enum. I will fix this later. This header has also other various issues. For now I just want the same version in userspace which is also inside kernelspace.

include/net/af_ieee802154.h | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)
include/net/af_ieee802154.h +1 -0
index 7d38e2f..63af3f2 100644
@@ -21,6 +21,7 @@
 #define _AF_IEEE802154_H
 
 #include <linux/socket.h> /* for sa_family_t */
+#include <linux/types.h>
 
 enum {
 	IEEE802154_ADDR_NONE = 0x0,
@@ -34,10 +35,10 @@ enum {
 
 struct ieee802154_addr_sa {

include/net/af_ieee802154.h enum { · line 43

Quoted 10 lines
include/net/af_ieee802154.h +3 -3
 	int addr_type;
-	u16 pan_id;
+	__u16 pan_id;
 	union {
-		u8 hwaddr[IEEE802154_ADDR_LEN];
-		u16 short_addr;
+		__u8 hwaddr[IEEE802154_ADDR_LEN];
+		__u16 short_addr;
 	};
 };

which address information is this? Are these the socket addresses you use for bind(), connect() etc.

Quoted 2 lines

In that case shouldn't this be sa_family_t instead.

I making some research related to this and I think there no good news.

First to your question:

The af_ieee802154.h contains an another struct, the "sockaddr_ieee802154":

struct sockaddr_ieee802154 {
        sa_family_t family; /* AF_IEEE802154 */
        struct ieee802154_addr_sa addr;
};

See [0]. I think that is what you mean.

This is struct is for bind(), connect(). I have a small userspace application which based on the old userspace tools "izchat".

This struct will be a cast to "struct sockaddr":

struct sockaddr {

        sa_family_t     sa_family;      /* address family, AF_xxx       */
        char            sa_data[14];    /* 14 bytes of protocol address */

};

See [1].

This will imply that sizeof(struct sockaddr_ieee802154) MUST NOT above the 14 bytes sa_data. (Which is for the protocol address information)

IMPORTANT NOTE: There is no BUILD_BUG_ON to check on this!

I calculate it on 32 bit machines it's:

int (4) + u16 (2) + hwaddr (8) = 14 bytes

Okay that fits, but on 64 bit machines:

int (8) + u16 (2) + hwaddr (8) = 18 bytes

Okay, I don't know if we have a bufferoverflow now here. Maybe the last 4 bytes are simply cutted and this socket interface simple doesn't work on 64 bit machines in some cases. If we have a bufferoverflow we should fix it in stable otherwise maybe just fixing that it works on 64 bit machines.

I didn't work much with the socket interface, I want more 6LoWPAN support, the socket interface for 802.15.4 is more for running closed standards inside userspace to avoid license issues and I suppose the socket interface code needs a complete rework.

Do you have some suggestion how to fix that? Maybe just make "int addr_type" to u8? I am fine with that, simple forget the enum because we have only few bytes for socket address data.

- Alex

[0] http://lxr.free-electrons.com/source/include/net/af_ieee802154.h#L52
[1] http://lxr.free-electrons.com/source/include/linux/socket.h#L29