From patchwork Mon Jun 10 10:57:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 1113025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45MqpZ183Vz9s6w; Mon, 10 Jun 2019 20:57:26 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1haHzP-0003ji-Fh; Mon, 10 Jun 2019 10:57:23 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1haHzO-0003jY-HN for fwts-devel@lists.ubuntu.com; Mon, 10 Jun 2019 10:57:22 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1haHzO-00013U-5c; Mon, 10 Jun 2019 10:57:22 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: s3: check for null pointer Date: Mon, 10 Jun 2019 11:57:21 +0100 Message-Id: <20190610105721.16120-1-colin.king@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King The pointer 'klog_diff' can potentially be null, so check for this. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/s3/s3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c index 79df1a6c..c754af81 100644 --- a/src/acpi/s3/s3.c +++ b/src/acpi/s3/s3.c @@ -551,8 +551,9 @@ static int s3_test_multiple(fwts_framework *fw) fwts_progress_message(fw, percent, "(Checking logs for errors)"); klog_diff = fwts_klog_find_changes(klog_pre, klog_post); - s3_check_log(fw, klog_diff, &klog_errors, &klog_oopses, &klog_warn_ons, - &suspend_too_long, &resume_too_long); + if (klog_diff) + s3_check_log(fw, klog_diff, &klog_errors, &klog_oopses, &klog_warn_ons, + &suspend_too_long, &resume_too_long); fwts_klog_free(klog_pre); fwts_klog_free(klog_post);