From patchwork Tue Aug 25 02:01:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Parkinson X-Patchwork-Id: 1350758 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wolfssl.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Pibk921z; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BbC1W4smFz9sTX for ; Tue, 25 Aug 2020 12:02:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Date:Message-Id:Subject:Mime-Version:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=rK96WeAQO0Oystf8+UFP5XQvElDA/XkArCT2tJkuPmM=; b=Pibk921z4XUj5fLcv5UTBxzaao zNdJ2CVnPIyyIK7O7Pxg8M3fErbyI1qtqs4kROMAQsaDqRFaJdbb9+yo5RKkg5FuWa9nhcXKv7yvi nplPaVzEg8WPBq75OSXTL5NTdGleZMcsDVhFztmMeWDmd0Ed5eLhHYlhpjqHYfjGWpQLt1H0mCuDb EVaAHjDZ7Fbqp2TZlahZbIY2EsqwpAJPRKfGcsNIlOp0FSQAG5Iq1wKyem5ROwT6Ld/ZjNUnxNp1t aebQIbnJwaGNdW+T95t6JVPRJ7f3qseWMYyTt6OrK2D+KxqxLDdwpGtE4sZJ2z7QyjlMulNP9RYJW fll8+cfQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAOHJ-0003uN-Vq; Tue, 25 Aug 2020 02:01:38 +0000 Received: from p3plsmtpa07-03.prod.phx3.secureserver.net ([173.201.192.232]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAOHH-0003si-Dg for hostap@lists.infradead.org; Tue, 25 Aug 2020 02:01:37 +0000 Received: from [192.168.1.2] ([58.179.78.69]) by :SMTPAUTH: with ESMTPSA id AOHAkJgjwWb3lAOHBkSIzL; Mon, 24 Aug 2020 19:01:30 -0700 X-CMAE-Analysis: v=2.3 cv=HogI5HbS c=1 sm=1 tr=0 a=uBixLVkstYWn5FALe/Mh3w==:117 a=uBixLVkstYWn5FALe/Mh3w==:17 a=kj9zAlcOel0A:10 a=VTTltBjBAAAA:8 a=osVonhLV74WHpQD8u6sA:9 a=BzQBI3txwMyOb3yH:21 a=zuzVQMwVIm5HRyxD:21 a=CjuIK1q_8ugA:10 a=on_vo79ac8RWgsiwd8Ea:22 X-SECURESERVER-ACCT: sean@wolfssl.com From: Sean Parkinson Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: [PATCH] wolfSSL TLS layer: Check NULL return from wolfSSL_sk_value Message-Id: <5AAC7242-4A5B-4982-B1B9-0F76E7F44441@wolfssl.com> Date: Tue, 25 Aug 2020 12:01:10 +1000 To: "hostap@lists.infradead.org" X-Mailer: Apple Mail (2.3608.120.23.2.1) X-CMAE-Envelope: MS4wfGGbJ+BC8PD3PnDrnSJEIH3aq4m7QodobK4LQpvKdaIBsaM4E4N4LnV+dO+MMAh5Y3xq8NNtkRzNSAc7cZEiRNiaQ85rJ+ze8zFp0QKs60THUbTBXRsl uitYisjoPCCRa1kYLnyMNyC1kgRzq1I/yctmsdnB/wbY5YPDnJnVekcMXUdxZepWFQ4rTOs5cFasg5l7Vx7WZC1ngUWcs6eBpsg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_220135_612496_BF60BAFC X-CRM114-Status: GOOD ( 11.49 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [173.201.192.232 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [173.201.192.232 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: msuiche@comae.com Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Sean Parkinson --- src/crypto/tls_wolfssl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/crypto/tls_wolfssl.c b/src/crypto/tls_wolfssl.c index 11e658220..1382cc802 100644 --- a/src/crypto/tls_wolfssl.c +++ b/src/crypto/tls_wolfssl.c @@ -585,7 +585,7 @@ static int tls_match_alt_subject_component(WOLFSSL_X509 *cert, int type, for (i = 0; ext && i < wolfSSL_sk_num(ext); i++) { gen = wolfSSL_sk_value(ext, i); - if (gen->type != type) + if (gen == NULL || gen->type != type) continue; if (os_strlen((char *) gen->obj) == len && os_memcmp(value, gen->obj, len) == 0) @@ -690,7 +690,7 @@ static int tls_match_suffix_helper(WOLFSSL_X509 *cert, const char *match, for (j = 0; ext && j < wolfSSL_sk_num(ext); j++) { gen = wolfSSL_sk_value(ext, j); - if (gen->type != ASN_DNS_TYPE) + if (gen == NULL || gen->type != ASN_DNS_TYPE) continue; dns_name++; wpa_hexdump_ascii(MSG_DEBUG, "TLS: Certificate dNSName", @@ -899,9 +899,10 @@ static void wolfssl_tls_cert_event(struct tls_connection *conn, if (num_alt_subject == TLS_MAX_ALT_SUBJECT) break; gen = wolfSSL_sk_value((void *) ext, i); - if (gen->type != GEN_EMAIL && - gen->type != GEN_DNS && - gen->type != GEN_URI) + if (gen == NULL || + (gen->type != GEN_EMAIL && + gen->type != GEN_DNS && + gen->type != GEN_URI)) continue; pos = os_malloc(10 + os_strlen((char *) gen->obj) + 1);