From patchwork Fri Nov 16 08:32:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 199517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 854F82C007C for ; Fri, 16 Nov 2012 19:33:03 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TZHME-0005w8-Cn; Fri, 16 Nov 2012 08:33:02 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TZHM9-0005tT-HU for fwts-devel@lists.ubuntu.com; Fri, 16 Nov 2012 08:32:57 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TZHM9-0002H2-F4 for fwts-devel@lists.ubuntu.com; Fri, 16 Nov 2012 08:32:57 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 2/3] lib: fwts_oops: fix fwts_oops_check dereference checks on oopses and warn_ons Date: Fri, 16 Nov 2012 08:32:55 +0000 Message-Id: <1353054776-4856-3-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353054776-4856-1-git-send-email-colin.king@canonical.com> References: <1353054776-4856-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King fwts_oops_check() dereferences oopses and warn_ons before we check if they are NULL. Fix this by checking if they are NULL before assiging zero to them. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Keng-Yu Lin --- src/lib/src/fwts_oops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/src/fwts_oops.c b/src/lib/src/fwts_oops.c index 4eaad1f..18a14ee 100644 --- a/src/lib/src/fwts_oops.c +++ b/src/lib/src/fwts_oops.c @@ -117,14 +117,15 @@ static void fwts_klog_stack_dump( int fwts_oops_check(fwts_framework *fw, fwts_list *klog, int *oopses, int *warn_ons) { fwts_list_link *item; - *oopses = 0; - *warn_ons = 0; /* Sanity check */ if ((fw == NULL) || (oopses == NULL) || (warn_ons == NULL) || (klog == NULL)) return FWTS_ERROR; + *oopses = 0; + *warn_ons = 0; + fwts_list_foreach(item, klog) { char *line = fwts_klog_remove_timestamp(fwts_list_data(char *, item)); if ((strncmp("BUG:", line, 4) == 0) ||