[PATCH v2] kexec/kexec.c: Add missing close() call

[PATCH v2] kexec/kexec.c: Add missing close() call

[Youling Tang]

Add missing close() call.

Signed-off-by: Youling Tang <tangyouling@loongson.cn>
---
 kexec/kexec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kexec/kexec.c b/kexec/kexec.c
index a62b362..bb88caa 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -585,6 +585,7 @@ static char *slurp_file_generic(const char *filename, off_t *r_size,
 		die("Read on %s ended before stat said it should\n", filename);
 
 	*r_size = size;
+	close(fd);
 	return buf;
 }
 
@@ -1257,12 +1258,14 @@ static int do_kexec_file_load(int fileind, int argc, char **argv,
 	if (i == file_types) {
 		fprintf(stderr, "Cannot determine the file type " "of %s\n",
 				kernel);
+		close(kernel_fd);
 		return EFAILED;
 	}
 
 	ret = file_type[i].load(argc, argv, kernel_buf, kernel_size, &info);
 	if (ret < 0) {
 		fprintf(stderr, "Cannot load %s\n", kernel);
+		close(kernel_fd);
 		return ret;
 	}
 
-- 
2.1.0


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH v2] kexec/kexec.c: Add missing close() call

[Khalid Aziz]

On 8/25/20 6:51 PM, Youling Tang wrote:
> Add missing close() call.
> 
> Signed-off-by: Youling Tang <tangyouling@loongson.cn>
> ---
>  kexec/kexec.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/kexec/kexec.c b/kexec/kexec.c
> index a62b362..bb88caa 100644
> --- a/kexec/kexec.c
> +++ b/kexec/kexec.c
> @@ -585,6 +585,7 @@ static char *slurp_file_generic(const char *filename, off_t *r_size,
>  		die("Read on %s ended before stat said it should\n", filename);
>  
>  	*r_size = size;
> +	close(fd);
>  	return buf;
>  }
>  
> @@ -1257,12 +1258,14 @@ static int do_kexec_file_load(int fileind, int argc, char **argv,
>  	if (i == file_types) {
>  		fprintf(stderr, "Cannot determine the file type " "of %s\n",
>  				kernel);
> +		close(kernel_fd);
>  		return EFAILED;
>  	}
>  
>  	ret = file_type[i].load(argc, argv, kernel_buf, kernel_size, &info);
>  	if (ret < 0) {
>  		fprintf(stderr, "Cannot load %s\n", kernel);
> +		close(kernel_fd);
>  		return ret;
>  	}
>  
> 

This looks good to me.

Reviewed-by: Khalid Aziz <khalid@gonehiking.org>

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH v2] kexec/kexec.c: Add missing close() call

[Simon Horman]

On Wed, Aug 26, 2020 at 09:53:34AM -0600, Khalid Aziz wrote:
> On 8/25/20 6:51 PM, Youling Tang wrote:
> > Add missing close() call.
> > 
> > Signed-off-by: Youling Tang <tangyouling@loongson.cn>
> > ---
> >  kexec/kexec.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/kexec/kexec.c b/kexec/kexec.c
> > index a62b362..bb88caa 100644
> > --- a/kexec/kexec.c
> > +++ b/kexec/kexec.c
> > @@ -585,6 +585,7 @@ static char *slurp_file_generic(const char *filename, off_t *r_size,
> >  		die("Read on %s ended before stat said it should\n", filename);
> >  
> >  	*r_size = size;
> > +	close(fd);
> >  	return buf;
> >  }
> >  
> > @@ -1257,12 +1258,14 @@ static int do_kexec_file_load(int fileind, int argc, char **argv,
> >  	if (i == file_types) {
> >  		fprintf(stderr, "Cannot determine the file type " "of %s\n",
> >  				kernel);
> > +		close(kernel_fd);
> >  		return EFAILED;
> >  	}
> >  
> >  	ret = file_type[i].load(argc, argv, kernel_buf, kernel_size, &info);
> >  	if (ret < 0) {
> >  		fprintf(stderr, "Cannot load %s\n", kernel);
> > +		close(kernel_fd);
> >  		return ret;
> >  	}
> >  
> > 
> 
> This looks good to me.
> 
> Reviewed-by: Khalid Aziz <khalid@gonehiking.org>

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec