[PATCH] fs: ext4: fix symlink read function

[PATCH] fs: ext4: fix symlink read function

[Antony Pavlov]

From: Ronald Zachariah <rozachar@cisco.com>

From U-Boot commit:

| commit 37f23885e4905ff500a8524328aa3084ac11cdb4
| Author: Ronald Zachariah <rozachar@cisco.com>
| Date:   Thu Apr 28 07:08:34 2016 +0200
|
|     fs: ext4: fix symlink read function
|
|     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>
|     Reviewed-by: Stephen Warren <swarren@nvidia.com>
|     Cc: Tom Rini <trini@konsulko.com>

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.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 1ecbb8d..6c4083e 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -377,7 +377,7 @@ 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) < sizeof(diro->inode.b.symlink)) {
 		strncpy(symlink, diro->inode.b.symlink,
 			 __le32_to_cpu(diro->inode.size));
 	} else {
-- 
2.8.1


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

Re: [PATCH] fs: ext4: fix symlink read function

[Sascha Hauer]

On Wed, Jul 06, 2016 at 10:58:44PM +0300, Antony Pavlov wrote:
> From: Ronald Zachariah <rozachar@cisco.com>
> 
> From U-Boot commit:
> 
> | commit 37f23885e4905ff500a8524328aa3084ac11cdb4
> | Author: Ronald Zachariah <rozachar@cisco.com>
> | Date:   Thu Apr 28 07:08:34 2016 +0200
> |
> |     fs: ext4: fix symlink read function
> |
> |     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>
> |     Reviewed-by: Stephen Warren <swarren@nvidia.com>
> |     Cc: Tom Rini <trini@konsulko.com>
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> ---
>  fs/ext4/ext4_common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
> index 1ecbb8d..6c4083e 100644
> --- a/fs/ext4/ext4_common.c
> +++ b/fs/ext4/ext4_common.c
> @@ -377,7 +377,7 @@ 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) < sizeof(diro->inode.b.symlink)) {
>  		strncpy(symlink, diro->inode.b.symlink,
>  			 __le32_to_cpu(diro->inode.size));
>  	} else {
> -- 
> 2.8.1
> 
> 

-- 
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