Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2552142 authored by hecaiqiang's avatar hecaiqiang
Browse files

Add CVE-2019-2330 patch

Change-Id: Ib817f91c054f5ec3a7d1661ebaaddd9c246785b3
parent 93c747a0
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
 * drivers/staging/android/ion/ion_system_heap.c
 *
 * Copyright (C) 2011 Google, Inc.
 * Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
 * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
@@ -164,6 +164,9 @@ static struct page_info *alloc_from_pool_preferred(
	struct page_info *info;
	int i;

	if (buffer->flags & ION_FLAG_POOL_FORCE_ALLOC)
		goto force_alloc;

	info = kmalloc(sizeof(*info), GFP_KERNEL);
	if (!info)
		return ERR_PTR(-ENOMEM);
@@ -195,6 +198,7 @@ static struct page_info *alloc_from_pool_preferred(
	}

	kfree(info);
force_alloc:
	return alloc_largest_available(heap, buffer, size, max_order);
}