From 4a5aea3471c3bb3aefc2984f9ef76d15fa25cc7f Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Fri, 30 Oct 2020 14:13:14 +0000 Subject: [PATCH] ANDROID: Revert out of tree difference by unclean revert Commit 88adaf726ee3 ("Revert "ANDROID: drivers: gpu: drm: fix bugs encountered while fuzzing"") introduced an out-of-tree difference that this patch compensates. Fixes: 88adaf726ee3 ("Revert "ANDROID: drivers: gpu: drm: fix bugs encountered while fuzzing"") Signed-off-by: Matthias Maennich Change-Id: Ie6d125567365fea8db735e9ad9d8af4262d958fc --- drivers/gpu/drm/drm_property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c index 892ce636ef72..6ee04803c362 100644 --- a/drivers/gpu/drm/drm_property.c +++ b/drivers/gpu/drm/drm_property.c @@ -561,7 +561,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length, struct drm_property_blob *blob; int ret; - if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob)) + if (!length || length > INT_MAX - sizeof(struct drm_property_blob)) return ERR_PTR(-EINVAL); blob = kvzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);