From: Mike Kravetz <mike.kravetz@oracle.com>
To: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Vegard Nossum <vegard.nossum@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Hillf Danton <hillf.zj@alibaba-inc.com>,
Michal Hocko <mhocko@suse.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] hugetlbfs: fix offset overflow in huegtlbfs mmap
Date: Sat, 15 Apr 2017 15:58:59 -0700 [thread overview]
Message-ID: <c5c80a74-b4a8-6987-188e-ab63420f5362@oracle.com> (raw)
In-Reply-To: <20170414033210.GA12973@hori1.linux.bs1.fc.nec.co.jp>
On 04/13/2017 08:32 PM, Naoya Horiguchi wrote:
> On Tue, Apr 11, 2017 at 03:51:58PM -0700, Mike Kravetz wrote:
> ...
>> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
>> index 7163fe0..dde8613 100644
>> --- a/fs/hugetlbfs/inode.c
>> +++ b/fs/hugetlbfs/inode.c
>> @@ -136,17 +136,26 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)
>> vma->vm_flags |= VM_HUGETLB | VM_DONTEXPAND;
>> vma->vm_ops = &hugetlb_vm_ops;
>>
>> + /*
>> + * Offset passed to mmap (before page shift) could have been
>> + * negative when represented as a (l)off_t.
>> + */
>> + if (((loff_t)vma->vm_pgoff << PAGE_SHIFT) < 0)
>> + return -EINVAL;
>> +
>> if (vma->vm_pgoff & (~huge_page_mask(h) >> PAGE_SHIFT))
>> return -EINVAL;
>>
>> vma_len = (loff_t)(vma->vm_end - vma->vm_start);
>> + len = vma_len + ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
>> + /* check for overflow */
>> + if (len < vma_len)
>> + return -EINVAL;
>
> Andrew sent this patch to Linus today, so I know it's a little too late, but
> I think that getting len directly from vma like below might be a simpler fix.
>
> len = (loff_t)(vma->vm_end - vma->vm_start + (vma->vm_pgoff << PAGE_SHIFT));
>
> This shouldn't overflow because vma->vm_{end|start|pgoff} are unsigned long,
> but if worried you can add VM_BUG_ON_VMA(len < 0, vma).
Thanks Naoya,
I am pretty sure the checks are necessary. You are correct in that
vma->vm_{end|start|pgoff} are unsigned long. However, pgoff can be
a REALLY big value that becomes negative when shifted.
Note that pgoff is simply the off_t offset value passed from the user cast
to unsigned long and shifted right by PAGE_SHIFT. There is nothing to
prevent a user from passing a 'signed' negative value. In the reproducer
provided, the value passed from user space is 0x8000000000000000ULL.
--
Mike Kravetz
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-04-15 23:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 22:51 Mike Kravetz
2017-04-12 3:13 ` Hillf Danton
2017-04-12 8:58 ` Vegard Nossum
2017-04-12 20:04 ` Mike Kravetz
2017-04-14 3:32 ` Naoya Horiguchi
2017-04-15 22:58 ` Mike Kravetz [this message]
2017-04-16 23:43 ` Naoya Horiguchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c5c80a74-b4a8-6987-188e-ab63420f5362@oracle.com \
--to=mike.kravetz@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=dvyukov@google.com \
--cc=hillf.zj@alibaba-inc.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=vegard.nossum@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox