diff options
author | Colin Cross <ccross@android.com> | 2013-11-13 14:44:53 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2013-11-15 16:10:14 -0800 |
commit | 49bdc418a3c1129d49fe92d89cf77111584fb51f (patch) | |
tree | b35cd45a9ce97a6890e290d4a9c945c35c79e919 | |
parent | 33a57aa073dac709bcdcba23bc4e2e7fcc6330f6 (diff) |
ion: fix crash when alloc len is -1
If userspace passes a length between -4095 and -1 to allocate it
will pass the len != 0 check, but when len is page aligned it will
be 0. Check len after page aligning.
Drop the warning as well, userspace shouldn't be able to trigger
a warning in the kernel.
Change-Id: I96c7142637638991f3a9af9be7cfbb50f79f3803
Signed-off-by: Colin Cross <ccross@android.com>
-rw-r--r-- | drivers/staging/android/ion/ion.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 0e379a33810..a8d4735b462 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -485,11 +485,11 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len, * request of the caller allocate from it. Repeat until allocate has * succeeded or all heaps have been tried */ - if (WARN_ON(!len)) - return ERR_PTR(-EINVAL); - len = PAGE_ALIGN(len); + if (!len) + return ERR_PTR(-EINVAL); + down_read(&dev->lock); plist_for_each_entry(heap, &dev->heaps, node) { /* if the caller didn't specify this heap id */ |