From patchwork Fri Sep 20 05:59:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 11153775 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF1AD16B1 for ; Fri, 20 Sep 2019 06:00:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E49C20882 for ; Fri, 20 Sep 2019 06:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404717AbfITGAH (ORCPT ); Fri, 20 Sep 2019 02:00:07 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:57313 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404716AbfITGAG (ORCPT ); Fri, 20 Sep 2019 02:00:06 -0400 Received: from localhost.localdomain (85-168-38-217.rev.numericable.fr [85.168.38.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 3223956128C for ; Fri, 20 Sep 2019 08:00:01 +0200 (CEST) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH v2 1/2] libselinux: ensure strlen() is not called on NULL Date: Fri, 20 Sep 2019 07:59:54 +0200 Message-Id: <20190920055955.2780-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Fri Sep 20 08:00:01 2019 +0200 (CEST)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.000000, queueID=ACE93561293 X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org When compile_regex() calls regex_prepare_data() and this function fails in the following condition: *regex = regex_data_create(); if (!(*regex)) return -1; ... error_data has been zero-ed and compile_regex() calls: regex_format_error(&error_data, regex_error_format_buffer, sizeof(regex_error_format_buffer)); This leads to a call to strlen(error_data->error_buffer), where error_data->error_buffer is NULL. Avoid this by checking that error_data->error_buffer is not NULL before trying to format it. This issue has been found using clang's static analyzer: https://337-118970575-gh.circle-artifacts.com/0/output-scan-build/2019-09-01-181851-6152-1/report-0b122b.html#EndPath Signed-off-by: Nicolas Iooss Acked-by: Stephen Smalley --- libselinux/src/regex.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libselinux/src/regex.c b/libselinux/src/regex.c index a6fcbbfec1f3..c835dd1b0e5d 100644 --- a/libselinux/src/regex.c +++ b/libselinux/src/regex.c @@ -519,6 +519,29 @@ void regex_format_error(struct regex_error_data const *error_data, char *buffer, if (pos >= buf_size) goto truncated; + /* Return early if there is no error to format */ +#ifdef USE_PCRE2 + if (!error_data->error_code) { + rc = snprintf(buffer + pos, buf_size - pos, "no error code"); + if (rc < 0) + abort(); + pos += rc; + if (pos >= buf_size) + goto truncated; + return; + } +#else + if (!error_data->error_buffer) { + rc = snprintf(buffer + pos, buf_size - pos, "empty error"); + if (rc < 0) + abort(); + pos += rc; + if (pos >= buf_size) + goto truncated; + return; + } +#endif + if (error_data->error_offset > 0) { #ifdef USE_PCRE2 rc = snprintf(buffer + pos, buf_size - pos, "At offset %zu: ", From patchwork Fri Sep 20 05:59:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 11153773 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F5201599 for ; Fri, 20 Sep 2019 06:00:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CB652080F for ; Fri, 20 Sep 2019 06:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404732AbfITGAG (ORCPT ); Fri, 20 Sep 2019 02:00:06 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:44940 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404717AbfITGAG (ORCPT ); Fri, 20 Sep 2019 02:00:06 -0400 Received: from localhost.localdomain (85-168-38-217.rev.numericable.fr [85.168.38.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 0034756128C for ; Fri, 20 Sep 2019 08:00:02 +0200 (CEST) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH v2 2/2] libselinux: do not add rc to pos twice Date: Fri, 20 Sep 2019 07:59:55 +0200 Message-Id: <20190920055955.2780-2-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190920055955.2780-1-nicolas.iooss@m4x.org> References: <20190920055955.2780-1-nicolas.iooss@m4x.org> MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Fri Sep 20 08:00:03 2019 +0200 (CEST)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.000000, queueID=3F980561295 X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org In regex_format_error(), when error_data->error_offset is zero, rc is not updated and should not be added to pos again. Signed-off-by: Nicolas Iooss Acked-by: Stephen Smalley --- libselinux/src/regex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libselinux/src/regex.c b/libselinux/src/regex.c index c835dd1b0e5d..770bc3ea1310 100644 --- a/libselinux/src/regex.c +++ b/libselinux/src/regex.c @@ -552,10 +552,10 @@ void regex_format_error(struct regex_error_data const *error_data, char *buffer, #endif if (rc < 0) abort(); + pos += rc; + if (pos >= buf_size) + goto truncated; } - pos += rc; - if (pos >= buf_size) - goto truncated; #ifdef USE_PCRE2 rc = pcre2_get_error_message(error_data->error_code,