Messages in this thread Patch in this message |  | | From | Christoph Rohland <> | Subject | Re: [PATCH] tmpfs symlink size bug | Date | 29 Oct 2001 09:49:30 +0100 |
| |
Hi Herbert,
On Sun, 28 Oct 2001, Herbert Xu wrote: > Since 2.4.12 the size of symlinks on tmpfs has been off by one. The > following patch corrects that error.
Thanks for spotting. I prefer the following patch.
Alan, Linus, please apply.
Greetings Christoph
--- 2.4.13/mm/shmem.c Sun Oct 28 16:59:03 2001 +++ t2.4.13/mm/shmem.c Mon Oct 29 09:45:51 2001 @@ -1151,16 +1151,16 @@ if (error) return error; - len = strlen(symname) + 1; - if (len > PAGE_CACHE_SIZE) + len = strlen(symname); + if (len >= PAGE_CACHE_SIZE) return -ENAMETOOLONG; inode = dentry->d_inode; info = SHMEM_I(inode); inode->i_size = len; - if (len <= sizeof(struct shmem_inode_info)) { + if (len < sizeof(struct shmem_inode_info)) { /* do it inline */ - memcpy(info, symname, len); + memcpy(info, symname, len + 1); inode->i_op = &shmem_symlink_inline_operations; } else { spin_lock (&shmem_ilock); @@ -1173,7 +1173,7 @@ return PTR_ERR(page); } kaddr = kmap(page); - memcpy(kaddr, symname, len); + memcpy(kaddr, symname, len + 1); kunmap(page); SetPageDirty(page); UnlockPage(page); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |