From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sudip Mukherjee Subject: [PATCH] drm/atomic: fix null dereference Date: Sat, 11 Jul 2015 22:54:39 +0530 Message-ID: <1436635479-1460-1-git-send-email-sudipm.mukherjee@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF02A6E3B5 for ; Sat, 11 Jul 2015 10:24:49 -0700 (PDT) Received: by padck2 with SMTP id ck2so19645645pad.0 for ; Sat, 11 Jul 2015 10:24:49 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sudip Mukherjee List-Id: dri-devel@lists.freedesktop.org V2UgYXJlIGNoZWNraW5nIHRoZSBzaXplIG9mIGUtPmV2ZW50IGJ1dCB3ZSB3ZXJlIGRvaW5nIGl0 IHdoZW4gZSBpcwprbm93biB0byBiZSBOVUxMLgoKU2lnbmVkLW9mZi1ieTogU3VkaXAgTXVraGVy amVlIDxzdWRpcEB2ZWN0b3JpbmRpYS5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWMuYyB8IDEgLQogMSBmaWxlIGNoYW5nZWQsIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMu YwppbmRleCBhY2ViZDE2Li41MWQzYTg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKQEAgLTEzMTEsNyAr MTMxMSw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpjcmVhdGVf dmJsYW5rX2V2ZW50KAogCWUgPSBremFsbG9jKHNpemVvZiAqZSwgR0ZQX0tFUk5FTCk7CiAJaWYg KGUgPT0gTlVMTCkgewogCQlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFn cyk7Ci0JCWZpbGVfcHJpdi0+ZXZlbnRfc3BhY2UgKz0gc2l6ZW9mIGUtPmV2ZW50OwogCQlzcGlu X3VubG9ja19pcnFyZXN0b3JlKCZkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKIAkJZ290byBvdXQ7 CiAJfQotLSAKMS44LjEuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751270AbbGKRYv (ORCPT ); Sat, 11 Jul 2015 13:24:51 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:33835 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751010AbbGKRYt (ORCPT ); Sat, 11 Jul 2015 13:24:49 -0400 From: Sudip Mukherjee To: David Airlie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sudip Mukherjee Subject: [PATCH] drm/atomic: fix null dereference Date: Sat, 11 Jul 2015 22:54:39 +0530 Message-Id: <1436635479-1460-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are checking the size of e->event but we were doing it when e is known to be NULL. Signed-off-by: Sudip Mukherjee --- drivers/gpu/drm/drm_atomic.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index acebd16..51d3a85 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1311,7 +1311,6 @@ static struct drm_pending_vblank_event *create_vblank_event( e = kzalloc(sizeof *e, GFP_KERNEL); if (e == NULL) { spin_lock_irqsave(&dev->event_lock, flags); - file_priv->event_space += sizeof e->event; spin_unlock_irqrestore(&dev->event_lock, flags); goto out; } -- 1.8.1.2