Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ef7375db277ac6a9398ee31a27e95eed717c4832.camel@linux.ibm.com>
Subject: Re: [PATCH] ima: Fix memory leak in __ima_inode_hash()
From:   Mimi Zohar <zohar@linux.ibm.com>
To:     Roberto Sassu <roberto.sassu@huaweicloud.com>,
        dmitry.kasatkin@gmail.com, paul@paul-moore.com, jmorris@namei.org,
        serge@hallyn.com
Cc:     linux-integrity@vger.kernel.org,
        linux-security-module@vger.kernel.org, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org, isaac.jmatt@gmail.com,
        Roberto Sassu <roberto.sassu@huawei.com>,
        stable@vger.kernel.org
Date:   Wed, 02 Nov 2022 18:04:55 -0400
In-Reply-To: <20221102163006.1039343-1-roberto.sassu@huaweicloud.com>
References: <20221102163006.1039343-1-roberto.sassu@huaweicloud.com>
Content-Type: text/plain; charset="ISO-8859-15"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Roberto,

On Wed, 2022-11-02 at 17:30 +0100, Roberto Sassu wrote:
> From: Roberto Sassu <roberto.sassu@huawei.com>

Any chance you could fix your mailer?

> 
> Commit f3cc6b25dcc5 ("ima: always measure and audit files in policy") lets
> measurement or audit happen even if the file digest cannot be calculated.
> 
> As a result, iint->ima_hash could have been allocated despite
> ima_collect_measurement() returning an error.
> 
> Since ima_hash belongs to a temporary inode metadata structure, declared
> at the beginning of __ima_inode_hash(), just add a kfree() call if
> ima_collect_measurement() returns an error different from -ENOMEM (in that
> case, ima_hash should not have been allocated).
> 
> Cc: stable@vger.kernel.org
> Fixes: 280fe8367b0d ("ima: Always return a file measurement in ima_file_hash()")
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>

Thanks,

Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>