Hi Sascha,
On Wed, Jan 24, 2018 at 08:45:32AM +0100, Sascha Hauer wrote:
> We have helper functions now to ease file caching when a file
> is on TFTP. Use them.
>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> ---
> common/uimage.c | 47 ++++++++++++++++++++++-------------------------
> include/image.h | 1 +
> 2 files changed, 23 insertions(+), 25 deletions(-)
>
> diff --git a/common/uimage.c b/common/uimage.c
> index b6f0f109ca..18bc2e5d7b 100644
> --- a/common/uimage.c
> +++ b/common/uimage.c
> @@ -85,8 +85,6 @@ ssize_t uimage_get_size(struct uimage_handle *handle, unsigned int image_no)
> }
> EXPORT_SYMBOL(uimage_get_size);
>
> -static const char uimage_tmp[] = "/.uImage_tmp";
> -
> /*
> * open a uimage. This will check the header contents and
> * return a handle to the uImage
> @@ -99,32 +97,26 @@ struct uimage_handle *uimage_open(const char *filename)
> struct image_header *header;
> int i;
> int ret;
> - struct stat s;
> + char *copy = NULL;
> +
> + if (is_tftp_fs(filename)) {
> + ret = cache_file(filename, ©);
> + if (ret)
> + return NULL;
> + filename = copy;
> + }
>
> -again:
> fd = open(filename, O_RDONLY);
> if (fd < 0) {
> printf("could not open: %s\n", errno_str());
Leaking the allocated string in 'copy' here. Missing code:
free(copy);
> return NULL;
> }
>
> - /*
> - * Hack around tftp fs. We need lseek for uImage support, but
> - * this cannot be implemented in tftp fs, so we detect this
> - * and copy the file to ram if it fails
> - */
> - if (IS_BUILTIN(CONFIG_FS_TFTP) && !can_lseek_backward(fd)) {
> - close(fd);
> - ret = copy_file(filename, uimage_tmp, 0);
> - if (ret)
> - return NULL;
> - filename = uimage_tmp;
> - goto again;
> - }
> -
> handle = xzalloc(sizeof(struct uimage_handle));
> header = &handle->header;
>
> + handle->copy = copy;
> +
> if (read(fd, header, sizeof(*header)) < 0) {
> printf("could not read: %s\n", errno_str());
> goto err_out;
> @@ -202,9 +194,13 @@ again:
> return handle;
> err_out:
> close(fd);
> +
> + if (handle->copy) {
> + unlink(handle->copy);
> + free(handle->copy);
> + }
Not introduced by this patch, but here the line
free(handle->name);
is missing. The function uimage_close() below frees the string in 'name'
correctly, but the free call is absent in this error path.
Kind regards,
Stefan
> free(handle);
> - if (IS_BUILTIN(CONFIG_FS_TFTP) && !stat(uimage_tmp, &s))
> - unlink(uimage_tmp);
> +
> return NULL;
> }
> EXPORT_SYMBOL(uimage_open);
> @@ -214,14 +210,15 @@ EXPORT_SYMBOL(uimage_open);
> */
> void uimage_close(struct uimage_handle *handle)
> {
> - struct stat s;
> -
> close(handle->fd);
> +
> + if (handle->copy) {
> + unlink(handle->copy);
> + free(handle->copy);
> + }
> +
> free(handle->name);
> free(handle);
> -
> - if (IS_BUILTIN(CONFIG_FS_TFTP) && !stat(uimage_tmp, &s))
> - unlink(uimage_tmp);
> }
> EXPORT_SYMBOL(uimage_close);
>
> diff --git a/include/image.h b/include/image.h
> index 3e75d49b88..add9c85874 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -246,6 +246,7 @@ struct resource *file_to_sdram(const char *filename, unsigned long adr);
> struct uimage_handle {
> struct image_header header;
> char *name;
> + char *copy;
> struct uimage_handle_data ihd[MAX_MULTI_IMAGE_COUNT];
> int nb_data_entries;
> size_t data_offset;
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
