diff --git a/[refs] b/[refs] index d7b60d07c1c9..7db9ca1046af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de145b44b95b9d3212a82d1c0f29b09778ef33c5 +refs/heads/master: a3ed2a15719219769bb095b28009c1d654a419e8 diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c index 722b0130aa94..59a009dc54a8 100644 --- a/trunk/ipc/mqueue.c +++ b/trunk/ipc/mqueue.c @@ -158,7 +158,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) { spin_unlock(&mq_lock); - kfree(info->messages); + /* mqueue_delete_inode() releases info->messages */ goto out_inode; } u->mq_bytes += mq_bytes;