[PATCH] ubifs: restore symlink support

[Sascha Hauer]

On Thu, Dec 08, 2016 at 02:14:28PM +0000, Renaud Barbier wrote:
> In commit a63059d7 of the latest u-boot port, the function that
> returns the inode number also resolves symlink. This prevents the
> readlink entry point from doing its job and breaks the user command
> readlink and the display of symlink with the ls command.
> Remove the code following the link to restore original functionality.
> 
> Signed-off-by: Renaud Barbier <renaud.barbier at abaco.com>
> ---
>  fs/ubifs/ubifs.c |   29 -----------------------------
>  1 files changed, 0 insertions(+), 29 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
> index 7935688..0bb1c26 100644
> --- a/fs/ubifs/ubifs.c
> +++ b/fs/ubifs/ubifs.c
> @@ -496,12 +496,9 @@ static unsigned long ubifs_findfile(struct super_block *sb, const char *filename
>  	int ret;
>  	char *next;
>  	char fpath[128];
> -	char symlinkpath[128];
>  	char *name = fpath;
>  	unsigned long root_inum = 1;
>  	unsigned long inum;
> -	int symlink_count = 0; /* Don't allow symlink recursion */
> -	char link_name[64];
>  
>  	strcpy(fpath, filename);
>  
> @@ -537,32 +534,6 @@ static unsigned long ubifs_findfile(struct super_block *sb, const char *filename
>  			return 0;
>  		ui = ubifs_inode(inode);
>  
> -		if ((inode->i_mode & S_IFMT) == S_IFLNK) {
> -			char buf[128];
> -
> -			/* We have some sort of symlink recursion, bail out */
> -			if (symlink_count++ > 8) {
> -				printf("Symlink recursion, aborting\n");
> -				return 0;
> -			}
> -			memcpy(link_name, ui->data, ui->data_len);
> -			link_name[ui->data_len] = '\0';
> -
> -			if (link_name[0] == '/') {
> -				/* Absolute path, redo everything without
> -				 * the leading slash */
> -				next = name = link_name + 1;
> -				root_inum = 1;
> -				continue;
> -			}
> -			/* Relative to cur dir */
> -			sprintf(buf, "%s/%s",
> -					link_name, next == NULL ? "" : next);
> -			memcpy(symlinkpath, buf, sizeof(buf));
> -			next = name = symlinkpath;
> -			continue;
> -		}
> -
>  		/*
>  		 * Check if directory with this name exists
>  		 */
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

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