diff options
author | Patrick McHardy <kaber@trash.net> | 2005-06-28 15:54:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-06-28 15:54:43 -0400 |
commit | b3563c4fbff906991a1b4ef4609f99cca2a0de6a (patch) | |
tree | e5c0e4cb4a0a48ebeeb8b1515128c115c5aa528c /include/linux | |
parent | 4095ebf1e641b0f37ee1cd04c903bb85cf4ed25b (diff) |
[NETLINK]: Clear padding in netlink messages
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/netlink.h | 1 | ||||
-rw-r--r-- | include/linux/rtnetlink.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 3029cad63a01..27e4d164a108 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
@@ -168,6 +168,7 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags) | |||
168 | nlh->nlmsg_flags = flags; | 168 | nlh->nlmsg_flags = flags; |
169 | nlh->nlmsg_pid = pid; | 169 | nlh->nlmsg_pid = pid; |
170 | nlh->nlmsg_seq = seq; | 170 | nlh->nlmsg_seq = seq; |
171 | memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size); | ||
171 | return nlh; | 172 | return nlh; |
172 | } | 173 | } |
173 | 174 | ||
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index d021888b58f1..dc26e82ba0fd 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
@@ -898,7 +898,9 @@ extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const voi | |||
898 | memcpy(skb_put(skb, attrlen), data, attrlen); }) | 898 | memcpy(skb_put(skb, attrlen), data, attrlen); }) |
899 | 899 | ||
900 | #define RTA_PUT_NOHDR(skb, attrlen, data) \ | 900 | #define RTA_PUT_NOHDR(skb, attrlen, data) \ |
901 | RTA_APPEND(skb, RTA_ALIGN(attrlen), data) | 901 | ({ RTA_APPEND(skb, RTA_ALIGN(attrlen), data); \ |
902 | memset(skb->tail - (RTA_ALIGN(attrlen) - attrlen), 0, \ | ||
903 | RTA_ALIGN(attrlen) - attrlen); }) | ||
902 | 904 | ||
903 | #define RTA_PUT_U8(skb, attrtype, value) \ | 905 | #define RTA_PUT_U8(skb, attrtype, value) \ |
904 | ({ u8 _tmp = (value); \ | 906 | ({ u8 _tmp = (value); \ |
@@ -978,6 +980,7 @@ __rta_reserve(struct sk_buff *skb, int attrtype, int attrlen) | |||
978 | rta = (struct rtattr*)skb_put(skb, RTA_ALIGN(size)); | 980 | rta = (struct rtattr*)skb_put(skb, RTA_ALIGN(size)); |
979 | rta->rta_type = attrtype; | 981 | rta->rta_type = attrtype; |
980 | rta->rta_len = size; | 982 | rta->rta_len = size; |
983 | memset(RTA_DATA(rta) + attrlen, 0, RTA_ALIGN(size) - size); | ||
981 | return rta; | 984 | return rta; |
982 | } | 985 | } |
983 | 986 | ||