From mboxrd@z Thu Jan 1 00:00:00 1970 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=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 6E319C31E5B for ; Mon, 17 Jun 2019 21:19:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4195B208E4 for ; Mon, 17 Jun 2019 21:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806342; bh=Hdy65pl9aaW/j2RWGkgGiRNaTj6XOwC3oaVLul7OVVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ThWNuT6zvl8/eO85l+LFMctYg6IvT1c84CmAmrnCdLn4ksG04FPCd4q6GLVROFnJl T16NGmSVO4RZtCncmU1/9k99TrMDzg2Poc9lvpftaQhZwFf4nPG5TgXe9dsRNke+kF O5aEapt5bkQgFsvZEyiuId2X6d3qSDN/UtN8vj8w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728561AbfFQVTA (ORCPT ); Mon, 17 Jun 2019 17:19:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:42556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728518AbfFQVS6 (ORCPT ); Mon, 17 Jun 2019 17:18:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EEA10208E4; Mon, 17 Jun 2019 21:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806337; bh=Hdy65pl9aaW/j2RWGkgGiRNaTj6XOwC3oaVLul7OVVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wXQzxvKnI1p4U6UiqFKwvIPe73Lul795zEWMKFhxM1+KWURoYJmK6C1kC1GD9W71r kL5Gb5mT101qJg8vA/Ykgnv6xblGVBRStBdG/rocK6Te8DygegGRVCJJe30B2LMis2 Slv6U3pv+Jiy4h4n3onUrT6LSI4PrEvXTnOCheIM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gen Zhang , Paul Moore Subject: [PATCH 5.1 018/115] selinux: fix a missing-check bug in selinux_add_mnt_opt( ) Date: Mon, 17 Jun 2019 23:08:38 +0200 Message-Id: <20190617210800.846376843@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gen Zhang commit e2e0e09758a6f7597de0f9b819647addfb71b6bd upstream. In selinux_add_mnt_opt(), 'val' is allocated by kmemdup_nul(). It returns NULL when fails. So 'val' should be checked. And 'mnt_opts' should be freed when error. Signed-off-by: Gen Zhang Fixes: 757cbe597fe8 ("LSM: new method: ->sb_add_mnt_opt()") Cc: [PM: fixed some indenting problems] Signed-off-by: Paul Moore Signed-off-by: Greg Kroah-Hartman --- security/selinux/hooks.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1048,15 +1048,24 @@ static int selinux_add_mnt_opt(const cha if (token == Opt_error) return -EINVAL; - if (token != Opt_seclabel) + if (token != Opt_seclabel) { val = kmemdup_nul(val, len, GFP_KERNEL); + if (!val) { + rc = -ENOMEM; + goto free_opt; + } + } rc = selinux_add_opt(token, val, mnt_opts); if (unlikely(rc)) { kfree(val); - if (*mnt_opts) { - selinux_free_mnt_opts(*mnt_opts); - *mnt_opts = NULL; - } + goto free_opt; + } + return rc; + +free_opt: + if (*mnt_opts) { + selinux_free_mnt_opts(*mnt_opts); + *mnt_opts = NULL; } return rc; }