[NETLINK]: Clear padding in netlink messages

[linux-2.6] / include / linux / rtnetlink.h

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 5a5cda1602674b18bfad707a08d636693f8b359e..dc26e82ba0fda4f9497822e881d02d173d99aa4b 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -892,10 +892,23 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi
                 goto rtattr_failure; \
        __rta_fill(skb, attrtype, attrlen, data); }) 
 
-#define RTA_PUT_NOHDR(skb, attrlen, data) \
+#define RTA_APPEND(skb, attrlen, data) \
 ({     if (unlikely(skb_tailroom(skb) < (int)(attrlen))) \
                goto rtattr_failure; \
-       memcpy(skb_put(skb, RTA_ALIGN(attrlen)), data, attrlen); })
+       memcpy(skb_put(skb, attrlen), data, attrlen); })
+
+#define RTA_PUT_NOHDR(skb, attrlen, data) \
+({     RTA_APPEND(skb, RTA_ALIGN(attrlen), data); \
+       memset(skb->tail - (RTA_ALIGN(attrlen) - attrlen), 0, \
+              RTA_ALIGN(attrlen) - attrlen); })
+
+#define RTA_PUT_U8(skb, attrtype, value) \
+({     u8 _tmp = (value); \
+       RTA_PUT(skb, attrtype, sizeof(u8), &_tmp); })
+
+#define RTA_PUT_U16(skb, attrtype, value) \
+({     u16 _tmp = (value); \
+       RTA_PUT(skb, attrtype, sizeof(u16), &_tmp); })
 
 #define RTA_PUT_U32(skb, attrtype, value) \
 ({     u32 _tmp = (value); \
@@ -914,6 +927,9 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi
 #define RTA_PUT_STRING(skb, attrtype, value) \
        RTA_PUT(skb, attrtype, strlen(value) + 1, value)
 
+#define RTA_PUT_FLAG(skb, attrtype) \
+       RTA_PUT(skb, attrtype, 0, NULL);
+
 #define RTA_NEST(skb, type) \
 ({     struct rtattr *__start = (struct rtattr *) (skb)->tail; \
        RTA_PUT(skb, type, 0, NULL); \
@@ -924,9 +940,20 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi
        (skb)->len; })
 
 #define RTA_NEST_CANCEL(skb, start) \
-({     skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
+({     if (start) \
+               skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
        -1; })
 
+#define RTA_GET_U8(rta) \
+({     if (!rta || RTA_PAYLOAD(rta) < sizeof(u8)) \
+               goto rtattr_failure; \
+       *(u8 *) RTA_DATA(rta); })
+
+#define RTA_GET_U16(rta) \
+({     if (!rta || RTA_PAYLOAD(rta) < sizeof(u16)) \
+               goto rtattr_failure; \
+       *(u16 *) RTA_DATA(rta); })
+
 #define RTA_GET_U32(rta) \
 ({     if (!rta || RTA_PAYLOAD(rta) < sizeof(u32)) \
                goto rtattr_failure; \
@@ -939,6 +966,8 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi
        memcpy(&_tmp, RTA_DATA(rta), sizeof(_tmp)); \
        _tmp; })
 
+#define RTA_GET_FLAG(rta) (!!(rta))
+
 #define RTA_GET_SECS(rta) ((unsigned long) RTA_GET_U64(rta) * HZ)
 #define RTA_GET_MSECS(rta) (msecs_to_jiffies((unsigned long) RTA_GET_U64(rta)))
                
@@ -951,6 +980,7 @@ __rta_reserve(struct sk_buff *skb, int attrtype, int attrlen)
        rta = (struct rtattr*)skb_put(skb, RTA_ALIGN(size));
        rta->rta_type = attrtype;
        rta->rta_len = size;
+       memset(RTA_DATA(rta) + attrlen, 0, RTA_ALIGN(size) - size);
        return rta;
 }