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=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 D67DEC7618F for ; Mon, 15 Jul 2019 20:04:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADCF02145D for ; Mon, 15 Jul 2019 20:04:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730918AbfGOUEK (ORCPT ); Mon, 15 Jul 2019 16:04:10 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:56886 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730872AbfGOUEK (ORCPT ); Mon, 15 Jul 2019 16:04:10 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id 120AB72CA65; Mon, 15 Jul 2019 23:04:08 +0300 (MSK) Received: from altlinux.org (sole.flsd.net [185.75.180.6]) by imap.altlinux.org (Postfix) with ESMTPSA id E07BF4A4A29; Mon, 15 Jul 2019 23:04:07 +0300 (MSK) Date: Mon, 15 Jul 2019 23:04:07 +0300 From: Vitaly Chikunov To: Mimi Zohar Cc: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org Subject: Re: [PATCH v1 4/5] ima-evm-utils: Fix file2bin stat and fopen relations Message-ID: <20190715200407.dfltjurut4ennd6g@altlinux.org> Mail-Followup-To: Mimi Zohar , Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org References: <20190712212833.29280-1-vt@altlinux.org> <20190712212833.29280-4-vt@altlinux.org> <1563217774.4539.146.camel@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <1563217774.4539.146.camel@linux.ibm.com> User-Agent: NeoMutt/20171215-106-ac61c7 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Mimi, On Mon, Jul 15, 2019 at 03:09:34PM -0400, Mimi Zohar wrote: > On Sat, 2019-07-13 at 00:28 +0300, Vitaly Chikunov wrote: > > @@ -186,18 +187,32 @@ static unsigned char *file2bin(const char *file, const char *ext, int *size) > > > > log_info("Reading to %s\n", name); > > > > - len = get_filesize(name); > > fp = fopen(name, "r"); > > if (!fp) { > > log_err("Failed to open: %s\n", name); > > return NULL; > > } > > + if (fstat(fileno(fp), &stats) == -1) { > > + log_err("Failed to fstat: %s (%s)\n", name, strerror(errno)); > > + fclose(fp); > > + return NULL; > > + } > > + len = stats.st_size; > > + > > data = malloc(len); > > - if (!fread(data, len, 1, fp)) > > - len = 0; > > + if (!data) { > > + log_err("Failed to malloc %zu bytes: %s\n", len, name); > > Missing "free(data)" In the next patch set I will apply all your suggestions except this one, because this is return where data was not allocated. > > + fclose(fp); > > + return NULL; > > + } > > + if (fread(data, len, 1, fp) != len) { > > + log_err("Failed to fread %zu bytes: %s\n", len, name); > > + fclose(fp); > > and here > > + return NULL; > > + } > > fclose(fp); > > > > - *size = len; > > + *size = (int)len; > > return data; > > } > >