From patchwork Wed Sep 15 13:11:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12496199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D22A9C433EF for ; Wed, 15 Sep 2021 13:11:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A38F66121F for ; Wed, 15 Sep 2021 13:11:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232940AbhIONMh (ORCPT ); Wed, 15 Sep 2021 09:12:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbhIONMh (ORCPT ); Wed, 15 Sep 2021 09:12:37 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7CF3C061574 for ; Wed, 15 Sep 2021 06:11:17 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id i21so6100422ejd.2 for ; Wed, 15 Sep 2021 06:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Qjceff96Sn2+3Jyu/y/ZW4CMJAWqJxMoWfyBvGgL/Qg=; b=iTdggq5XtKXuHyRyKpMvRKJn4rUgXscIteGMGQSIqO472wL9vk1ENsAXhZjBD152lT 2sfNmAuNoQbwxDzmWmWrqLQ2ysk05acXCEaU5fYVAmFmrpfCIt5QylJGvzBQDMAUk51R kiq9qkH6DFy19NLAIf/MmAAqYB3oIGunHMqbQYvC00oIiN83JyZkW/118tzqYuCgjrTX xf8H71d6yKZmInMKgBXqCtQpGK4SCF4duXw/nFttVNeBCZBCi8P6W2+Kd0TDx6mKzjAS kcNXJFI8isjb/o3HttLL86jdqzdLYtEWC/0IjIxkzlCcUVBNV6SIdTI58v4mMKjy6AzA poMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qjceff96Sn2+3Jyu/y/ZW4CMJAWqJxMoWfyBvGgL/Qg=; b=bt5xflLGBOMo52QwVVyD41nCmO7O6np8oxUSma+fGYCryW7BtsqRxpKt0pWFGX7nYY XZZB/uGrs8FYwndsxHbYwq8wEa90zgE11tgUMPSJvAI5CGx0TpOeyqENltHW0kqkS31Y WrOxScbuw6wR34fK/KGJxFXBq+zuI/lPd0AtbAVGx06Qj5YYdOQ+dvpOt9g0Oqxx/HoP A/irhrtQQw3av63D6JncwUc1AxhgxyKxRSwUTW1nuf8CcRP0nHNbTP7UlyOgToDMwgpO ndfVo51n7NJO0Y+IaqQcZxHV4yzLVVOjpsNnMNYIQ4h5TjQdxm8DszHXwv+BBTRhhHKO 5mjw== X-Gm-Message-State: AOAM530FrpIoKlR7nCC8IJ1MlPs1yrD+ty8yKA3CB6Hdhii7vZT+uVhL Qwci7PO9H9m7FKanJn3Ez9c907Ma7OE= X-Google-Smtp-Source: ABdhPJw0N+HgO0eDRQnk1/zdToiCKiFl/xpEw70W/dTOTwfawCme2jrRx3oEOJ4/WIBr3S0TXSso7A== X-Received: by 2002:a17:906:6b0c:: with SMTP id q12mr25074549ejr.0.1631711475643; Wed, 15 Sep 2021 06:11:15 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-112-239-251.95.112.pool.telefonica.de. [95.112.239.251]) by smtp.gmail.com with ESMTPSA id z97sm7013323ede.72.2021.09.15.06.11.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 06:11:15 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 02/13] libsepol: free memory after policy validation Date: Wed, 15 Sep 2021 15:11:09 +0200 Message-Id: <20210915131109.25114-1-cgzones@googlemail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210914124828.19488-3-cgzones@googlemail.com> References: <20210914124828.19488-3-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Found while running the checkpolicy/test/dispol binary. Direct leak of 24 byte(s) in 1 object(s) allocated from: #0 0x49bacd in __interceptor_malloc (./checkpolicy/test/dispol+0x49bacd) #1 0x5551e1 in ebitmap_set_bit ./libsepol/src/ebitmap.c:326:27 #2 0x517873 in create_gap_ebitmap ./libsepol/src/policydb_validate.c:23:8 #3 0x517873 in validate_init ./libsepol/src/policydb_validate.c:34:6 #4 0x50fa47 in validate_array_init ./libsepol/src/policydb_validate.c:44:6 #5 0x50fa47 in validate_policydb ./libsepol/src/policydb_validate.c:732:6 #6 0x4f22df in policydb_read ./libsepol/src/policydb.c:4538:6 #7 0x4cddb3 in main ./checkpolicy/test/dispol.c:437:8 #8 0x7f5980e47e49 in __libc_start_main csu/../csu/libc-start.c:314:16 Indirect leak of 48 byte(s) in 2 object(s) allocated from: #0 0x49bacd in __interceptor_malloc (./checkpolicy/test/dispol+0x49bacd) #1 0x5551e1 in ebitmap_set_bit ./libsepol/src/ebitmap.c:326:27 #2 0x517873 in create_gap_ebitmap ./libsepol/src/policydb_validate.c:23:8 #3 0x517873 in validate_init ./libsepol/src/policydb_validate.c:34:6 #4 0x50fa47 in validate_array_init ./libsepol/src/policydb_validate.c:44:6 #5 0x50fa47 in validate_policydb ./libsepol/src/policydb_validate.c:732:6 #6 0x4f22df in policydb_read ./libsepol/src/policydb.c:4538:6 #7 0x4cddb3 in main ./checkpolicy/test/dispol.c:437:8 #8 0x7f5980e47e49 in __libc_start_main csu/../csu/libc-start.c:314:16 Signed-off-by: Christian Göttsche --- v2: - name function validate_array_destroy(), similar to the allocating validate_array_init() libsepol/src/policydb_validate.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c index 246aa6e3..3ab072a8 100644 --- a/libsepol/src/policydb_validate.c +++ b/libsepol/src/policydb_validate.c @@ -722,12 +722,21 @@ bad: return -1; } +static void validate_array_destroy(validate_t flavors[]) +{ + unsigned int i; + + for (i = 0; i < SYM_NUM; i++) { + ebitmap_destroy(&flavors[i].gaps); + } +} + /* * Validate policydb */ int validate_policydb(sepol_handle_t *handle, policydb_t *p) { - validate_t flavors[SYM_NUM]; + validate_t flavors[SYM_NUM] = {}; if (validate_array_init(p, flavors)) goto bad; @@ -756,9 +765,12 @@ int validate_policydb(sepol_handle_t *handle, policydb_t *p) if (validate_datum_arrays(handle, p, flavors)) goto bad; + validate_array_destroy(flavors); + return 0; bad: ERR(handle, "Invalid policydb"); + validate_array_destroy(flavors); return -1; } From patchwork Wed Sep 15 13:11:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12496201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07BE3C433EF for ; Wed, 15 Sep 2021 13:11:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DBF8860F4A for ; Wed, 15 Sep 2021 13:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233291AbhIONNA (ORCPT ); Wed, 15 Sep 2021 09:13:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233634AbhIONM7 (ORCPT ); Wed, 15 Sep 2021 09:12:59 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0D29C061574 for ; Wed, 15 Sep 2021 06:11:40 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id kt8so5955159ejb.13 for ; Wed, 15 Sep 2021 06:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VLXZ3sasAFzlRpVzSFDkB6qcIN6o5DJcUdfdi4hYnY8=; b=X+HsGjiJ1kkNnlsD743fGlbe6kLz5uHHVMHMVcKEpdRmHr6Gk42M4I+sqYcVDKl0Y5 kmTXfofFDnaOJGcza7ta8Xn79VRp6DSAzXhCE3Zoi7znKIafKGHyPTo1Q3iFokpz8phH VCkPZyc/9cmJDtg0v1gNATsG7Qhgf6ZVg9CcRRYooD7hqhn1CungwE2XsyXPg8nBwCb8 h3wXVFOPd1zjx9dVXt6dNrw2EVGuDgsWDZQPPYdRHBY/bify1vuW01vf0muHA6mpUcSD fIyCU9aMcnwK//bqD3uYTGzqP4+KuUWyUECP7lUrnBs1xY5FxYAt0BQMumWUapHfXHhZ 18AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VLXZ3sasAFzlRpVzSFDkB6qcIN6o5DJcUdfdi4hYnY8=; b=VrfO4jVrjzh1f+XscdnAi1B8lbKXlFT85gc8Y5dLqTFGGLeU5Pqf9zu2wJukP3Mht9 8kDUpIzIIRPITeN4Qy19TreZrx94rQcB+HWiW5SC5Ar4fapC6/eI0ckKi0OPWVnUxaHt Zbic6wmGpc9ak1U2LsTgeIPaXhQs25UNd/3QZKjyb0sXwblN7kdyidbCGgo8dwj1ESTY sIvuoxz7jeWQhaHX6vmRNyV6sHjYK3d4JqAGj4gzOoIKW2zWk2yao0uy2dczP/+8R4Qh ytQfiEmsZDZ3a/2ZdzrYyc2hLJ7A/39d9/u3gH2MBkQl23HFVXDxjtN/4SDXrNPb8c+z eH8A== X-Gm-Message-State: AOAM530vGRnNlmOBVUfrp9mq6qQGUKHSZYEWzsGN3+F4N/EAhXSkFufe HwlGbtRrpgrKZzWnVGuCtv2mXPIygg0= X-Google-Smtp-Source: ABdhPJzwKSVKjHlKHi/aUlKFND06660czCtmOulNVkJH/K/9DkF8GPYGY/UyYHtrnLpWNUB/vAjgaw== X-Received: by 2002:a17:906:d541:: with SMTP id cr1mr25734878ejc.81.1631711494176; Wed, 15 Sep 2021 06:11:34 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-112-239-251.95.112.pool.telefonica.de. [95.112.239.251]) by smtp.gmail.com with ESMTPSA id s11sm1836254edy.64.2021.09.15.06.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 06:11:33 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 09/13] checkpolicy: resolve dismod memory leaks Date: Wed, 15 Sep 2021 15:11:30 +0200 Message-Id: <20210915131130.25173-1-cgzones@googlemail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210914124828.19488-10-cgzones@googlemail.com> References: <20210914124828.19488-10-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Example leak: Indirect leak of 4 byte(s) in 1 object(s) allocated from: #0 0x49bacd in __interceptor_malloc (./checkpolicy/test/dismod+0x49bacd) #1 0x58ae54 in add_i_to_a ./libsepol/src/util.c:55:21 #2 0x53ea8e in symtab_insert ./libsepol/src/policydb.c:1729:6 #3 0x536252 in roles_init ./libsepol/src/policydb.c:772:7 #4 0x536252 in policydb_init ./libsepol/src/policydb.c:892:7 #5 0x562ff1 in sepol_policydb_create ./libsepol/src/policydb_public.c:69:6 #6 0x521a7c in module_package_init ./libsepol/src/module.c:96:6 #7 0x521a7c in sepol_module_package_create ./libsepol/src/module.c:126:7 #8 0x4cfb80 in read_policy ./checkpolicy/test/dismod.c:750:7 #9 0x4cda10 in main ./checkpolicy/test/dismod.c:878:6 #10 0x7f8538d01e49 in __libc_start_main csu/../csu/libc-start.c:314:16 Signed-off-by: Christian Göttsche --- v2: - use sepol_policydb_free() checkpolicy/test/dismod.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c index 90c29318..1ff161da 100644 --- a/checkpolicy/test/dismod.c +++ b/checkpolicy/test/dismod.c @@ -751,12 +751,14 @@ static int read_policy(char *filename, policydb_t * policy) fprintf(stderr, "%s: Out of memory!\n", __FUNCTION__); exit(1); } + sepol_policydb_free(package->policy); package->policy = (sepol_policydb_t *) policy; package->file_contexts = NULL; retval = sepol_module_package_read(package, (sepol_policy_file_t *) & f, 1); - free(package->file_contexts); + package->policy = NULL; + sepol_module_package_free(package); } else { if (policydb_init(policy)) { fprintf(stderr, "%s: Out of memory!\n", __FUNCTION__); From patchwork Wed Sep 15 13:11:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12496203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B52CC433F5 for ; Wed, 15 Sep 2021 13:12:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34F4760F11 for ; Wed, 15 Sep 2021 13:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233325AbhIONNT (ORCPT ); Wed, 15 Sep 2021 09:13:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233238AbhIONNS (ORCPT ); Wed, 15 Sep 2021 09:13:18 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A6EBC061574 for ; Wed, 15 Sep 2021 06:11:59 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id o20so6040975ejd.7 for ; Wed, 15 Sep 2021 06:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Efz4C0s5yc05LUG8sfustSDCd7muvd4bWvgMXaaNNLQ=; b=UxNkmTP8w8yBF0E1WiRu/Xle/C/4CQ+F0MDFlar++yXg3uGlrCfRMteN5Zdt0sDqhD yxafljESsrLGr581pr5WfNYCEfYPLrXCSeRzPnAtapRgU+xF6j/lPcIrDd2Z3ER1YUoU 3f364rNPWEvbMMnkil08/Z+u12YQh850sx2CHQPe6erGFkMpyaCezbdJcA+Jy06ryBFa aBnklb6OkbtWRVAMSFGsuBj+4EhZmFyt4DkIXd9L2aQVzoaEcSbRLkBeRlhaS8MzNzrz Q7BglilhUlZxTEvpjr10OdXkfhfybWJeQi+lXAvzwUKZo3OhQRHYuWb/tRsvTRUBFITW Shfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Efz4C0s5yc05LUG8sfustSDCd7muvd4bWvgMXaaNNLQ=; b=zUMfpu+fikMg1WeUCcB5sBjOBco74Z4o/rB1LuOcc0mopBn0H3r2+iigcvBuf2Uasa MFxU+YFrGdP/NHN3fEnPPxho1KRs5gzeuAUNwfiqpHrAUuyfSUTO/rcMOUNfbZFtez8x SIwhXstRmLZOoJfTngIoXYALlyMGoRNdBKlwkePEyUjhO5ltanRDDca4BHYIix0co4X4 xb5i6u8YGkFL1OdBv4fhwm2aCYEO8TRZ/cDBYH8dNhYWAedvCWHrk5vFBQ8RhwHL5o8F Lmxq9dFRMgSaeWoT1ruZKt/Aq8PedKr+qlSL7vCVrkMMWOxPe4rFyr5VWX6Yex2o2cQ8 ZesQ== X-Gm-Message-State: AOAM530MM+u9IgcPzix47zCC17m1UE948A3JAjBpYYyXjVwgAMaTtjMR o1rTybFmlnYQcjHNkJsmWJNlZUPgHuw= X-Google-Smtp-Source: ABdhPJyc1sVkug9nzYB//RyTaXIYru3FJm8+jbQR0El52KeEIwbXUcOyuqkWry+1SLyVW5mQCoSU8Q== X-Received: by 2002:a17:906:3a57:: with SMTP id a23mr24733987ejf.469.1631711517875; Wed, 15 Sep 2021 06:11:57 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-112-239-251.95.112.pool.telefonica.de. [95.112.239.251]) by smtp.gmail.com with ESMTPSA id m15sm6263328ejx.73.2021.09.15.06.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 06:11:57 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 11/13] checkpolicy: error out on parsing too big integers Date: Wed, 15 Sep 2021 15:11:53 +0200 Message-Id: <20210915131153.25416-1-cgzones@googlemail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210914124828.19488-12-cgzones@googlemail.com> References: <20210914124828.19488-12-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Error out instead of silently converting too big integer values in policy sources. policy_parse.y:893:41: runtime error: implicit conversion from type 'unsigned long' of value 18446744073709551615 (64-bit, unsigned) to type 'unsigned int' changed the value to 4294967295 (32-bit, unsigned) Signed-off-by: Christian Göttsche --- v2: - only check usigned long against UINT_MAX, if ULONG_MAX is actually bigger checkpolicy/policy_parse.y | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/checkpolicy/policy_parse.y b/checkpolicy/policy_parse.y index 6098eb50..45f973ff 100644 --- a/checkpolicy/policy_parse.y +++ b/checkpolicy/policy_parse.y @@ -890,10 +890,26 @@ filename : FILENAME { yytext[strlen(yytext) - 1] = '\0'; if (insert_id(yytext + 1,0)) return -1; } ; number : NUMBER - { $$ = strtoul(yytext,NULL,0); } + { unsigned long x; + errno = 0; + x = strtoul(yytext, NULL, 0); + if (errno) + return -1; +#if ULONG_MAX > UINT_MAX + if (x > UINT_MAX) + return -1; +#endif + $$ = (unsigned int) x; + } ; number64 : NUMBER - { $$ = strtoull(yytext,NULL,0); } + { unsigned long long x; + errno = 0; + x = strtoull(yytext, NULL, 0); + if (errno) + return -1; + $$ = (uint64_t) x; + } ; ipv6_addr : IPV6_ADDR { if (insert_id(yytext,0)) return -1; }