From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Teresa Gámez" <t.gamez@phytec.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] read_file_2: Fix return value
Date: Thu, 25 Sep 2014 07:44:28 +0200 [thread overview]
Message-ID: <20140925054428.GD4992@pengutronix.de> (raw)
In-Reply-To: <1411541391-19948-1-git-send-email-t.gamez@phytec.de>
On Wed, Sep 24, 2014 at 08:49:51AM +0200, Teresa Gámez wrote:
> Set return value correct in error case.
> This prevents barebox from crashing in some conditions.
>
> Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Applied, thanks
Sascha
> ---
> lib/libfile.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/lib/libfile.c b/lib/libfile.c
> index c6fb6d7..c626e2f 100644
> --- a/lib/libfile.c
> +++ b/lib/libfile.c
> @@ -163,8 +163,10 @@ again:
> buf = xzalloc(read_size + 1);
>
> fd = open(filename, O_RDONLY);
> - if (fd < 0)
> + if (fd < 0) {
> + ret = fd;
> goto err_out;
> + }
>
> ret = read_full(fd, buf, read_size);
> if (ret < 0)
> --
> 1.7.0.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2014-09-25 5:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 6:49 Teresa Gámez
2014-09-25 5:44 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140925054428.GD4992@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=t.gamez@phytec.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox