From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 045/167] drm/amdgpu: validate user GEM object size Date: Tue, 3 Sep 2019 12:23:17 -0400 Message-ID: <20190903162519.7136-45-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Yu Zhao , =?UTF-8?q?Michel=20D=C3=A4nzer?= , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Alex Deucher List-Id: amd-gfx.lists.freedesktop.org RnJvbTogWXUgWmhhbyA8eXV6aGFvQGdvb2dsZS5jb20+CgpbIFVwc3RyZWFtIGNvbW1pdCBjNGEz MmIyNjZkYTdiYjcwMmU2MDM4MWNhMGMzNWVhZGRiYzg5YTZjIF0KCldoZW4gY3JlYXRpbmcgZnJh bWUgYnVmZmVyLCB1c2Vyc3BhY2UgbWF5IHJlcXVlc3QgdG8gYXR0YWNoIHRvIGEKcHJldmlvdXNs eSBhbGxvY2F0ZWQgR0VNIG9iamVjdCB0aGF0IGlzIHNtYWxsZXIgdGhhbiB3aGF0IEdQVQpyZXF1 aXJlcy4gVmFsaWRhdGlvbiBtdXN0IGJlIGRvbmUgdG8gcHJldmVudCBvdXQtb2YtYm91bmQgRE1B LApvdGhlcndpc2UgaXQgY291bGQgYmUgZXhwbG9pdGVkIHRvIHJldmVhbCBzZW5zaXRpdmUgZGF0 YS4KClRoaXMgZml4IGlzIG5vdCBkb25lIGluIGEgY29tbW9uIGNvZGUgcGF0aCBiZWNhdXNlIGlu ZGl2aWR1YWwKZHJpdmVyIG1pZ2h0IGhhdmUgZGlmZmVyZW50IHJlcXVpcmVtZW50LgoKQ2M6IHN0 YWJsZUB2Z2VyLmtlcm5lbC5vcmcgIyB2NC4yKwpSZXZpZXdlZC1ieTogTWljaGVsIETDpG56ZXIg PG1pY2hlbC5kYWVuemVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFl1IFpoYW8gPHl1emhhb0Bn b29nbGUuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVy QGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5jIHwgOCArKysr KysrKwogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5jCmluZGV4IDZlNjc4MTRkMzNlMjkuLjEwMzVhNDdm ODFjOWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rpc3BsYXkuYwpA QCAtNTI3LDYgKzUyNyw3IEBAIGFtZGdwdV9kaXNwbGF5X3VzZXJfZnJhbWVidWZmZXJfY3JlYXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmo7CiAJ c3RydWN0IGFtZGdwdV9mcmFtZWJ1ZmZlciAqYW1kZ3B1X2ZiOwogCWludCByZXQ7CisJaW50IGhl aWdodDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ aW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKG1vZGVfY21kLT5waXhlbF9mb3JtYXQsIDAp OwogCWludCBwaXRjaCA9IG1vZGVfY21kLT5waXRjaGVzWzBdIC8gY3BwOwpAQCAtNTUxLDYgKzU1 MiwxMyBAQCBhbWRncHVfZGlzcGxheV91c2VyX2ZyYW1lYnVmZmVyX2NyZWF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKIAl9CiAKKwloZWlnaHQg PSBBTElHTihtb2RlX2NtZC0+aGVpZ2h0LCA4KTsKKwlpZiAob2JqLT5zaXplIDwgcGl0Y2ggKiBo ZWlnaHQpIHsKKwkJRFJNX0RFQlVHX0tNUygiSW52YWxpZCBHRU0gc2l6ZTogZXhwZWN0aW5nID49 ICVkIGJ1dCBnb3QgJXp1XG4iLAorCQkJICAgICAgcGl0Y2ggKiBoZWlnaHQsIG9iai0+c2l6ZSk7 CisJCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOworCX0KKwogCWFtZGdwdV9mYiA9IGt6YWxsb2Mo c2l6ZW9mKCphbWRncHVfZmIpLCBHRlBfS0VSTkVMKTsKIAlpZiAoYW1kZ3B1X2ZiID09IE5VTEwp IHsKIAkJZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKG9iaik7Ci0tIAoyLjIwLjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57295C3A5A2 for ; Tue, 3 Sep 2019 16:26:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FDB5238C6 for ; Tue, 3 Sep 2019 16:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528010; bh=iMc28nEHo4LwcU2m4S1Z3UyNfivaugakbuC8bbOlxuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g6AM6gyV+CMamzhmy0p0yylWi6qrOBpqbdaynM6nTKQUniKrV/jCZQKaSDVb+iM95 B1ERXPQ3Z7K85arCF3MVHv9Ej+OsvVWR6LON1RMKtm8kBl2aC9nM2uazaUbVA++3BR CMCG+eHqts9037+KB6SfcHVOHUDNXUqmC2ZGCnGg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730718AbfICQ0t (ORCPT ); Tue, 3 Sep 2019 12:26:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:47630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730165AbfICQ0i (ORCPT ); Tue, 3 Sep 2019 12:26:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 933CF238C7; Tue, 3 Sep 2019 16:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527997; bh=iMc28nEHo4LwcU2m4S1Z3UyNfivaugakbuC8bbOlxuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t4IVzicSxrtGse5+0+iqgN3MbGIqlNjux/jQ6/1O6W4IeMBDn0J3XM9kkgKYghIkr 8vn3nOW85xRAevJoNC+U8taw9O/QTkHRsjbkzTl7jJiHNr4ghDrUV23cbTM1Wh+e9U 84UlSh6CHDxU1dPuxQzAJb4e3nfKbxrtGU2008zM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yu Zhao , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 045/167] drm/amdgpu: validate user GEM object size Date: Tue, 3 Sep 2019 12:23:17 -0400 Message-Id: <20190903162519.7136-45-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yu Zhao [ Upstream commit c4a32b266da7bb702e60381ca0c35eaddbc89a6c ] When creating frame buffer, userspace may request to attach to a previously allocated GEM object that is smaller than what GPU requires. Validation must be done to prevent out-of-bound DMA, otherwise it could be exploited to reveal sensitive data. This fix is not done in a common code path because individual driver might have different requirement. Cc: stable@vger.kernel.org # v4.2+ Reviewed-by: Michel Dänzer Signed-off-by: Yu Zhao Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 6e67814d33e29..1035a47f81c9c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -527,6 +527,7 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, struct drm_gem_object *obj; struct amdgpu_framebuffer *amdgpu_fb; int ret; + int height; struct amdgpu_device *adev = dev->dev_private; int cpp = drm_format_plane_cpp(mode_cmd->pixel_format, 0); int pitch = mode_cmd->pitches[0] / cpp; @@ -551,6 +552,13 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, return ERR_PTR(-EINVAL); } + height = ALIGN(mode_cmd->height, 8); + if (obj->size < pitch * height) { + DRM_DEBUG_KMS("Invalid GEM size: expecting >= %d but got %zu\n", + pitch * height, obj->size); + return ERR_PTR(-EINVAL); + } + amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL); if (amdgpu_fb == NULL) { drm_gem_object_put_unlocked(obj); -- 2.20.1