From patchwork Mon Jun 10 10:17:42 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: 1112994 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 45Mpwq4sffz9s4Y; Mon, 10 Jun 2019 20:17:47 +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 1haHN2-0001mT-Ri; Mon, 10 Jun 2019 10:17:44 +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 1haHN0-0001mN-Od for fwts-devel@lists.ubuntu.com; Mon, 10 Jun 2019 10:17:42 +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 1haHN0-0007GU-BX; Mon, 10 Jun 2019 10:17:42 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] fwts_modprobe: fix potential null pointer dereference Date: Mon, 10 Jun 2019 11:17:42 +0100 Message-Id: <20190610101742.27518-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 null pointer check is currently incorrect; if ptr is null then we currently have a null pointer dereference. The check should be for a null ptr rather rather than the contents of the object being pointed to being non-zero. Addresses-Coverity: ("Dereference null pointer") Fixes: cbf322756c13 ("src/lib: add module probing helper functions") Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/lib/src/fwts_modprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/src/fwts_modprobe.c b/src/lib/src/fwts_modprobe.c index 05871f2c..a05a581f 100644 --- a/src/lib/src/fwts_modprobe.c +++ b/src/lib/src/fwts_modprobe.c @@ -131,7 +131,7 @@ int fwts_module_loaded(fwts_framework *fw, const char *module, bool *loaded) while (fgets(buffer, sizeof(buffer) - 1, fp) != NULL) { char *ptr = strchr(buffer, ' '); - if (*ptr) + if (ptr) *ptr = '\0'; if (!strcmp(buffer, module)) {