From 7c3f8d3663cbee7e406bf949a263ce82f6b34ae8 Mon Sep 17 00:00:00 2001 From: Michael Grzeschik Date: Wed, 8 Nov 2017 19:07:47 +0100 Subject: uimage: fix: add can_lseek_backward and use in uimage_open Since commit ce0cc7fe we support forward seek on tftpfs. This feature breaks the condition to check rather we open an uimage over tftp. Since backward seeking is the problem here, we add the function can_lseek_backward and check for it instead of the simple lseek. Signed-off-by: Michael Grzeschik Signed-off-by: Sascha Hauer --- common/uimage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/uimage.c') diff --git a/common/uimage.c b/common/uimage.c index 28a25bba2d..b6f0f109ca 100644 --- a/common/uimage.c +++ b/common/uimage.c @@ -111,9 +111,9 @@ again: /* * Hack around tftp fs. We need lseek for uImage support, but * this cannot be implemented in tftp fs, so we detect this - * by doing a test lseek and copy the file to ram if it fails + * and copy the file to ram if it fails */ - if (IS_BUILTIN(CONFIG_FS_TFTP) && lseek(fd, 0, SEEK_SET)) { + if (IS_BUILTIN(CONFIG_FS_TFTP) && !can_lseek_backward(fd)) { close(fd); ret = copy_file(filename, uimage_tmp, 0); if (ret) -- cgit v1.2.3