From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S946146AbcJSQSW (ORCPT ); Wed, 19 Oct 2016 12:18:22 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34886 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941476AbcJSQST (ORCPT ); Wed, 19 Oct 2016 12:18:19 -0400 From: Wei Yongjun To: Daniel Vetter , Jani Nikula , David Airlie , Yulei Zhang , Zhenyu Wang , Zhi Wang Cc: Wei Yongjun , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] drm/i915/gvt: fix return value check Date: Wed, 19 Oct 2016 16:18:03 +0000 Message-Id: <1476893883-8096-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun In case of error, the function i915_gem_object_create() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun --- drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 5808ee7..6abb2a6 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -1640,8 +1640,8 @@ static int perform_bb_shadow(struct parser_exec_state *s) entry_obj->obj = i915_gem_object_create(&(s->vgpu->gvt->dev_priv->drm), round_up(bb_size, PAGE_SIZE)); - if (entry_obj->obj == NULL) - return -ENOMEM; + if (IS_ERR(entry_obj->obj)) + return PTR_ERR(entry_obj->obj); entry_obj->len = bb_size; INIT_LIST_HEAD(&entry_obj->list); @@ -2712,8 +2712,8 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx) wa_ctx->indirect_ctx.obj = i915_gem_object_create(dev, round_up(ctx_size + CACHELINE_BYTES, PAGE_SIZE)); - if (wa_ctx->indirect_ctx.obj == NULL) - return -ENOMEM; + if (IS_ERR(wa_ctx->indirect_ctx.obj)) + return PTR_ERR(wa_ctx->indirect_ctx.obj); ret = i915_gem_object_get_pages(wa_ctx->indirect_ctx.obj); if (ret) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Yongjun Subject: [PATCH -next] drm/i915/gvt: fix return value check Date: Wed, 19 Oct 2016 16:18:03 +0000 Message-ID: <1476893883-8096-1-git-send-email-weiyj.lk@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Jani Nikula , David Airlie , Yulei Zhang , Zhenyu Wang , Zhi Wang Cc: intel-gfx@lists.freedesktop.org, Wei Yongjun , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogV2VpIFlvbmdqdW4gPHdlaXlvbmdqdW4xQGh1YXdlaS5jb20+CgpJbiBjYXNlIG9mIGVy cm9yLCB0aGUgZnVuY3Rpb24gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZSgpIHJldHVybnMKRVJSX1BU UigpIG5vdCBOVUxMLiBUaGUgTlVMTCB0ZXN0IGluIHRoZSByZXR1cm4gdmFsdWUgY2hlY2sgc2hv dWxkCmJlIHJlcGxhY2VkIHdpdGggSVNfRVJSKCkuCgpTaWduZWQtb2ZmLWJ5OiBXZWkgWW9uZ2p1 biA8d2VpeW9uZ2p1bjFAaHVhd2VpLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQv Y21kX3BhcnNlci5jIHwgOCArKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygr KSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQv Y21kX3BhcnNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2NtZF9wYXJzZXIuYwppbmRl eCA1ODA4ZWU3Li42YWJiMmE2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQv Y21kX3BhcnNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9jbWRfcGFyc2VyLmMK QEAgLTE2NDAsOCArMTY0MCw4IEBAIHN0YXRpYyBpbnQgcGVyZm9ybV9iYl9zaGFkb3coc3RydWN0 IHBhcnNlcl9leGVjX3N0YXRlICpzKQogCiAJZW50cnlfb2JqLT5vYmogPSBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlKCYocy0+dmdwdS0+Z3Z0LT5kZXZfcHJpdi0+ZHJtKSwKIAkJcm91bmRfdXAoYmJf c2l6ZSwgUEFHRV9TSVpFKSk7Ci0JaWYgKGVudHJ5X29iai0+b2JqID09IE5VTEwpCi0JCXJldHVy biAtRU5PTUVNOworCWlmIChJU19FUlIoZW50cnlfb2JqLT5vYmopKQorCQlyZXR1cm4gUFRSX0VS UihlbnRyeV9vYmotPm9iaik7CiAJZW50cnlfb2JqLT5sZW4gPSBiYl9zaXplOwogCUlOSVRfTElT VF9IRUFEKCZlbnRyeV9vYmotPmxpc3QpOwogCkBAIC0yNzEyLDggKzI3MTIsOCBAQCBzdGF0aWMg aW50IHNoYWRvd19pbmRpcmVjdF9jdHgoc3RydWN0IGludGVsX3NoYWRvd193YV9jdHggKndhX2N0 eCkKIAogCXdhX2N0eC0+aW5kaXJlY3RfY3R4Lm9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUo ZGV2LAogCQkJcm91bmRfdXAoY3R4X3NpemUgKyBDQUNIRUxJTkVfQllURVMsIFBBR0VfU0laRSkp OwotCWlmICh3YV9jdHgtPmluZGlyZWN0X2N0eC5vYmogPT0gTlVMTCkKLQkJcmV0dXJuIC1FTk9N RU07CisJaWYgKElTX0VSUih3YV9jdHgtPmluZGlyZWN0X2N0eC5vYmopKQorCQlyZXR1cm4gUFRS X0VSUih3YV9jdHgtPmluZGlyZWN0X2N0eC5vYmopOwogCiAJcmV0ID0gaTkxNV9nZW1fb2JqZWN0 X2dldF9wYWdlcyh3YV9jdHgtPmluZGlyZWN0X2N0eC5vYmopOwogCWlmIChyZXQpCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK