diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-01-30 21:30:08 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-02-07 17:23:52 +0100 |
| commit | 3035b1cc5d40c40c3158a5e25af6765459f25315 (patch) | |
| tree | bcfb28b7ca683d405045413b5ee20477b6239068 /patches/genext2fs-1.4.1 | |
| parent | e0749034b9d6f48e61b57eeb3fa331419d1aa397 (diff) | |
| download | ptxdist-3035b1cc5d40c40c3158a5e25af6765459f25315.tar.gz ptxdist-3035b1cc5d40c40c3158a5e25af6765459f25315.tar.xz | |
genext2fs: fix off-by-one in symlink creation
This fixes a failure when genext2fs tries to create a symlink where the target
has a length of exactly 60 bytes.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/genext2fs-1.4.1')
| -rw-r--r-- | patches/genext2fs-1.4.1/0001-fix-inode-based-symlink-string-length-limit.patch | 39 | ||||
| -rw-r--r-- | patches/genext2fs-1.4.1/series | 4 |
2 files changed, 43 insertions, 0 deletions
diff --git a/patches/genext2fs-1.4.1/0001-fix-inode-based-symlink-string-length-limit.patch b/patches/genext2fs-1.4.1/0001-fix-inode-based-symlink-string-length-limit.patch new file mode 100644 index 000000000..9a8182c0c --- /dev/null +++ b/patches/genext2fs-1.4.1/0001-fix-inode-based-symlink-string-length-limit.patch @@ -0,0 +1,39 @@ +From: Alexander Stohr <Alexander.Stohr@gmx.de> +Date: Sat, 31 Mar 2012 14:33:02 +0000 +Subject: [PATCH] fix inode based symlink string length limit + +Origin: http://genext2fs.cvs.sourceforge.net/viewvc/genext2fs/genext2fs/genext2fs.c?r1=1.95&r2=1.96 +[ukl: I'm annoyed because this patch is more complicated than necessary. +Just doing s/>/>=/ in the 2nd line after the 2nd hunk has the same +effect as the 2nd hunk without code duplication and dead code] +--- + genext2fs.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/genext2fs.c b/genext2fs.c +index 3087479511c4..bdc8aefc1fac 100644 +--- a/genext2fs.c ++++ b/genext2fs.c +@@ -1415,9 +1415,10 @@ mklink_fs(filesystem *fs, uint32 parent_nod, const char *name, size_t size, uint + uint32 nod = mknod_fs(fs, parent_nod, name, FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO, uid, gid, 0, 0, ctime, mtime); + extend_blk(fs, nod, 0, - (int)get_nod(fs, nod)->i_blocks / INOBLK); + get_nod(fs, nod)->i_size = size; +- if(size <= 4 * (EXT2_TIND_BLOCK+1)) ++ if(size < 4 * (EXT2_TIND_BLOCK+1)) + { + strncpy((char*)get_nod(fs, nod)->i_block, (char*)b, size); ++ ((char*)get_nod(fs, nod)->i_block)[size+1] = '\0'; + return nod; + } + extend_blk(fs, nod, b, rndup(size, BLOCKSIZE) / BLOCKSIZE); +@@ -1643,6 +1644,10 @@ add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_per + switch(st.st_mode & S_IFMT) + { + case S_IFLNK: ++ if((st.st_mode & S_IFMT) == S_IFREG || st.st_size >= 4 * (EXT2_TIND_BLOCK+1)) ++ stats->nblocks += (st.st_size + BLOCKSIZE - 1) / BLOCKSIZE; ++ stats->ninodes++; ++ break; + case S_IFREG: + if((st.st_mode & S_IFMT) == S_IFREG || st.st_size > 4 * (EXT2_TIND_BLOCK+1)) + stats->nblocks += (st.st_size + BLOCKSIZE - 1) / BLOCKSIZE; diff --git a/patches/genext2fs-1.4.1/series b/patches/genext2fs-1.4.1/series new file mode 100644 index 000000000..03d224b75 --- /dev/null +++ b/patches/genext2fs-1.4.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fix-inode-based-symlink-string-length-limit.patch +# 09c5ef697ea11b2119735d1468222726 - git-ptx-patches magic |