The patch titled mqueue: apply mathematics distributivity on mq_bytes calculation has been added to the -mm tree. Its filename is mqueue-apply-mathematics-distributivity-on-mq_bytes-calculation.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mqueue: apply mathematics distributivity on mq_bytes calculation From: André Goddard Rosa <andre.goddard@xxxxxxxxx> Code size reduction: text data bss dec hex filename 9941 72 16 10029 272d ipc/mqueue-BEFORE.o 9925 72 16 10013 271d ipc/mqueue-AFTER.o Signed-off-by: André Goddard Rosa <andre.goddard@xxxxxxxxx> Cc: Serge E. Hallyn <serue@xxxxxxxxxx> Cc: Cedric Le Goater <clg@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/mqueue.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN ipc/mqueue.c~mqueue-apply-mathematics-distributivity-on-mq_bytes-calculation ipc/mqueue.c --- a/ipc/mqueue.c~mqueue-apply-mathematics-distributivity-on-mq_bytes-calculation +++ a/ipc/mqueue.c @@ -261,8 +261,9 @@ static void mqueue_delete_inode(struct i clear_inode(inode); - mq_bytes = (info->attr.mq_maxmsg * sizeof(struct msg_msg *) + - (info->attr.mq_maxmsg * info->attr.mq_msgsize)); + /* Total amount of bytes accounted for the mqueue */ + mq_bytes = info->attr.mq_maxmsg * (sizeof(struct msg_msg *) + + info->attr.mq_msgsize); user = info->user; if (user) { spin_lock(&mq_lock); @@ -601,8 +602,8 @@ static int mq_attr_ok(struct ipc_namespa /* check for overflow */ if (attr->mq_msgsize > ULONG_MAX/attr->mq_maxmsg) return 0; - if ((unsigned long)(attr->mq_maxmsg * attr->mq_msgsize) + - (attr->mq_maxmsg * sizeof (struct msg_msg *)) < + if ((unsigned long)(attr->mq_maxmsg * (attr->mq_msgsize + + sizeof (struct msg_msg *))) < (unsigned long)(attr->mq_maxmsg * attr->mq_msgsize)) return 0; return 1; _ Patches currently in -mm which might be from andre.goddard@xxxxxxxxx are linux-next.patch mqueue-fix-mq_open-file-descriptor-leak-on-user-space-processes.patch mqueue-remove-unneeded-info-messages-initialization.patch mqueue-apply-mathematics-distributivity-on-mq_bytes-calculation.patch mqueue-simplify-do_open-error-handling.patch mqueue-only-set-error-codes-if-they-are-really-necessary.patch mqueue-fix-typo-failues-failures.patch lib-stringc-simplify-stricmp.patch lib-stringc-simplify-strnstr.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