The patch titled
Fix taskstats size calculation (use the new genetlink utility functions)
has been added to the -mm tree. Its filename is
fix-taskstats-size-calculation-use-the-new-genetlink-utility-functions.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix taskstats size calculation (use the new genetlink utility functions)
From: Balbir Singh <balbir@xxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Jamal Hadi <hadi@xxxxxxxxxx>
Cc: Shailabh Nagar <nagar@xxxxxxxxxxxxxx>
Cc: Thomas Graf <tgraf@xxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Jay Lan <jlan@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/taskstats.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/taskstats.c~fix-taskstats-size-calculation-use-the-new-genetlink-utility-functions kernel/taskstats.c
--- a/kernel/taskstats.c~fix-taskstats-size-calculation-use-the-new-genetlink-utility-functions
+++ a/kernel/taskstats.c
@@ -75,7 +75,7 @@ static int prepare_reply(struct genl_inf
/*
* If new attributes are added, please revisit this allocation
*/
- skb = nlmsg_new(size, GFP_KERNEL);
+ skb = nlmsg_new(genlmsg_total_size(size), GFP_KERNEL);
if (!skb)
return -ENOMEM;
_
Patches currently in -mm which might be from balbir@xxxxxxxxxx are
add-genetlink-utilities-for-payload-length-calculation.patch
fix-taskstats-size-calculation-use-the-new-genetlink-utility-functions.patch
fix-getdelaysc-cpumask-length-and-error-reporting.patch
csa-basic-accounting-over-taskstats.patch
csa-extended-system-accounting-over-taskstats.patch
csa-convert-config-tag-for-extended-accounting-routines.patch
csa-accounting-taskstats-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
