diff options
author | Balbir Singh <balbir@in.ibm.com> | 2006-10-01 02:28:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:29 -0400 |
commit | 0ae646845b603e9df5711084436d389f8371ffb3 (patch) | |
tree | 1554ba465812cc10c10b9bd28020a34effe0d8d4 | |
parent | 17db952cd16cecc76937b138c685ae3d198ab17c (diff) |
[PATCH] Fix taskstats size calculation (use the new genetlink utility functions)
The addition of the CSA patch pushed the size of struct taskstats to 256
bytes. This exposed a problem with prepare_reply(), we were not allocating
space for the netlink and genetlink header. It worked earlier because
alloc_skb() would align the skb to SMP_CACHE_BYTES, which added some additonal
bytes.
Signed-off-by: Balbir Singh <balbir@in.ibm.com>
Cc: Jamal Hadi <hadi@cyberus.ca>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: Thomas Graf <tgraf@suug.ch>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jay Lan <jlan@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | kernel/taskstats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/taskstats.c b/kernel/taskstats.c index 2ed4040d0dc5..c451af2ddb50 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c | |||
@@ -75,7 +75,7 @@ static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp, | |||
75 | /* | 75 | /* |
76 | * If new attributes are added, please revisit this allocation | 76 | * If new attributes are added, please revisit this allocation |
77 | */ | 77 | */ |
78 | skb = nlmsg_new(size, GFP_KERNEL); | 78 | skb = nlmsg_new(genlmsg_total_size(size), GFP_KERNEL); |
79 | if (!skb) | 79 | if (!skb) |
80 | return -ENOMEM; | 80 | return -ENOMEM; |
81 | 81 | ||