* [U-Boot] [PATCH] fs: ext4: fix symlink read function
@ 2016-04-27 16:40 Stefan Roese
2016-04-27 17:34 ` Stephen Warren
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Roese @ 2016-04-27 16:40 UTC (permalink / raw)
To: u-boot
From: Ronald Zachariah <rozachar@cisco.com>
The function ext4fs_read_symlink was unable to handle a symlink
which had target name of exactly 60 characters.
Signed-off-by: Ronald Zachariah <rozachar@cisco.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Tom Rini <trini@konsulko.com>
---
fs/ext4/ext4_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 84fba76..868c281 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -2040,7 +2040,7 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node)
if (!symlink)
return 0;
- if (__le32_to_cpu(diro->inode.size) <= 60) {
+ if (__le32_to_cpu(diro->inode.size) < 60) {
strncpy(symlink, diro->inode.b.symlink,
__le32_to_cpu(diro->inode.size));
} else {
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] fs: ext4: fix symlink read function
2016-04-27 16:40 [U-Boot] [PATCH] fs: ext4: fix symlink read function Stefan Roese
@ 2016-04-27 17:34 ` Stephen Warren
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2016-04-27 17:34 UTC (permalink / raw)
To: u-boot
On 04/27/2016 10:40 AM, Stefan Roese wrote:
> From: Ronald Zachariah <rozachar@cisco.com>
>
> The function ext4fs_read_symlink was unable to handle a symlink
> which had target name of exactly 60 characters.
Reviewed-by: Stephen Warren <swarren@nvidia.com>
This seems to match how the Linux kernel encodes symlinks.
> - if (__le32_to_cpu(diro->inode.size) <= 60) {
> + if (__le32_to_cpu(diro->inode.size) < 60) {
It'd be nice if "60" was replaced with sizeof(diro->inode.b.symlink),
but that's probably a topic for a different patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] fs: ext4: fix symlink read function
@ 2015-09-07 9:20 Gary Bisson
2015-09-08 3:56 ` Simon Glass
0 siblings, 1 reply; 6+ messages in thread
From: Gary Bisson @ 2015-09-07 9:20 UTC (permalink / raw)
To: u-boot
Since last API changes for files >2GB, the read of symlink is broken as
ext4fs_read_file now returns 0 instead of the length of the actual read.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Hi all,
Switching from an old v2014.07 to v2015.07 we've noticed that we couldn't
read symlinks any more. This is due to the API changes made to
ext4fs_read_file (commit 9f12cd0).
This patch makes the read symlink check both for errors (status < 0) and
actual read length.
Regards,
Gary
---
fs/ext4/ext4_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index cab5465..e2ab145 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -2040,7 +2040,7 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node)
status = ext4fs_read_file(diro, 0,
__le32_to_cpu(diro->inode.size),
symlink, &actread);
- if (status == 0) {
+ if ((status < 0) || (actread == 0)) {
free(symlink);
return 0;
}
--
2.5.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] fs: ext4: fix symlink read function
2015-09-07 9:20 Gary Bisson
@ 2015-09-08 3:56 ` Simon Glass
2015-09-08 8:30 ` Gary Bisson
0 siblings, 1 reply; 6+ messages in thread
From: Simon Glass @ 2015-09-08 3:56 UTC (permalink / raw)
To: u-boot
Hi Gary,
On 7 September 2015 at 03:20, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
> Since last API changes for files >2GB, the read of symlink is broken as
> ext4fs_read_file now returns 0 instead of the length of the actual read.
>
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> ---
> Hi all,
>
> Switching from an old v2014.07 to v2015.07 we've noticed that we couldn't
> read symlinks any more. This is due to the API changes made to
> ext4fs_read_file (commit 9f12cd0).
>
> This patch makes the read symlink check both for errors (status < 0) and
> actual read length.
>
> Regards,
> Gary
Thanks for fixing this. Does the filesystem test (test/fs-test.sh)
show this error? How could we enhance the test to detect this?
> ---
> fs/ext4/ext4_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
> index cab5465..e2ab145 100644
> --- a/fs/ext4/ext4_common.c
> +++ b/fs/ext4/ext4_common.c
> @@ -2040,7 +2040,7 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node)
> status = ext4fs_read_file(diro, 0,
> __le32_to_cpu(diro->inode.size),
> symlink, &actread);
> - if (status == 0) {
> + if ((status < 0) || (actread == 0)) {
> free(symlink);
> return 0;
> }
> --
> 2.5.1
>
Regards,
Simon
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] fs: ext4: fix symlink read function
2015-09-08 3:56 ` Simon Glass
@ 2015-09-08 8:30 ` Gary Bisson
2015-09-09 18:08 ` Simon Glass
0 siblings, 1 reply; 6+ messages in thread
From: Gary Bisson @ 2015-09-08 8:30 UTC (permalink / raw)
To: u-boot
Hi Simon,
On Tue, Sep 8, 2015 at 5:56 AM, Simon Glass <sjg@chromium.org> wrote:
> Hi Gary,
>
> On 7 September 2015 at 03:20, Gary Bisson
> <gary.bisson@boundarydevices.com> wrote:
>> Since last API changes for files >2GB, the read of symlink is broken as
>> ext4fs_read_file now returns 0 instead of the length of the actual read.
>>
>> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
>> ---
>> Hi all,
>>
>> Switching from an old v2014.07 to v2015.07 we've noticed that we couldn't
>> read symlinks any more. This is due to the API changes made to
>> ext4fs_read_file (commit 9f12cd0).
>>
>> This patch makes the read symlink check both for errors (status < 0) and
>> actual read length.
>>
>> Regards,
>> Gary
>
> Thanks for fixing this. Does the filesystem test (test/fs-test.sh)
> show this error? How could we enhance the test to detect this?
I wasn't aware of this testing script, a quick look at it makes me
think it doesn't check anything symlink-related. I guess it would
require to add SYMLINK_FILE that points to either SMALL_FILE or
BIG_FILE, read it and check the md5sum.
Regards,
Gary
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] fs: ext4: fix symlink read function
2015-09-08 8:30 ` Gary Bisson
@ 2015-09-09 18:08 ` Simon Glass
0 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2015-09-09 18:08 UTC (permalink / raw)
To: u-boot
Hi Gary,
On Tuesday, 8 September 2015, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
>
> Hi Simon,
>
> On Tue, Sep 8, 2015 at 5:56 AM, Simon Glass <sjg@chromium.org> wrote:
> > Hi Gary,
> >
> > On 7 September 2015 at 03:20, Gary Bisson
> > <gary.bisson@boundarydevices.com> wrote:
> >> Since last API changes for files >2GB, the read of symlink is broken as
> >> ext4fs_read_file now returns 0 instead of the length of the actual read.
> >>
> >> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> >> ---
> >> Hi all,
> >>
> >> Switching from an old v2014.07 to v2015.07 we've noticed that we couldn't
> >> read symlinks any more. This is due to the API changes made to
> >> ext4fs_read_file (commit 9f12cd0).
> >>
> >> This patch makes the read symlink check both for errors (status < 0) and
> >> actual read length.
> >>
> >> Regards,
> >> Gary
> >
> > Thanks for fixing this. Does the filesystem test (test/fs-test.sh)
> > show this error? How could we enhance the test to detect this?
>
> I wasn't aware of this testing script, a quick look at it makes me
> think it doesn't check anything symlink-related. I guess it would
> require to add SYMLINK_FILE that points to either SMALL_FILE or
> BIG_FILE, read it and check the md5sum.
Yes I think that will work. Are you going to take a look?
Regards,
Simon
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-27 17:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-27 16:40 [U-Boot] [PATCH] fs: ext4: fix symlink read function Stefan Roese
2016-04-27 17:34 ` Stephen Warren
-- strict thread matches above, loose matches on Subject: below --
2015-09-07 9:20 Gary Bisson
2015-09-08 3:56 ` Simon Glass
2015-09-08 8:30 ` Gary Bisson
2015-09-09 18:08 ` Simon Glass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox