From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbdJFUNV (ORCPT ); Fri, 6 Oct 2017 16:13:21 -0400 Received: from mail-io0-f182.google.com ([209.85.223.182]:48265 "EHLO mail-io0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752458AbdJFUM0 (ORCPT ); Fri, 6 Oct 2017 16:12:26 -0400 X-Google-Smtp-Source: AOwi7QB3/xPZsbsVFy1ZUmAVjUUsq1lJD1tL4m5pg19gsiFqn90PAADL23HF7UoraUeBifk1WsrS9Q== From: Sherry Yang To: linux-kernel@vger.kernel.org Cc: tkjos@google.com, maco@google.com, Sherry Yang , Greg Kroah-Hartman , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Riley Andrews , devel@driverdev.osuosl.org (open list:ANDROID DRIVERS) Subject: [PATCH 2/2] android: binder: Fix null ptr dereference in debug msg Date: Fri, 6 Oct 2017 16:12:06 -0400 Message-Id: <20171006201206.27073-3-sherryy@android.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20171006201206.27073-1-sherryy@android.com> References: <20170916051158.96588-3-sherryy@android.com> <20171006201206.27073-1-sherryy@android.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't access next->data in kernel debug message when the next buffer is null. Acked-by: Arve Hjønnevåg Signed-off-by: Sherry Yang --- drivers/android/binder_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 47e2c032ad3d..6f6f745605af 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -560,7 +560,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc, binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC, "%d: merge free, buffer %pK do not share page with %pK or %pK\n", alloc->pid, buffer->data, - prev->data, next->data); + prev->data, next ? next->data : NULL); binder_update_page_range(alloc, 0, buffer_start_page(buffer), buffer_start_page(buffer) + PAGE_SIZE); } -- 2.11.0 (Apple Git-81)