ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fsck.minix: fix segmentation fault 

Return from check_file() and check_file2() functions when maximum name
depth is reached.  The use unsafe strncpy() is also removed just to be on
safe side.

Addresses: https://bugs.debian.org/773892
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2015-01-03 09:20:05 +00:00 committed by Karel Zak
parent 64a265bf8a
commit 730ae9c899
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
disk-utils/fsck.minix.c
View File

@ -112,6 +112,7 @@
#include "all-io.h"
#include "closestream.h"
#include "rpmatch.h"
#include "strutils.h"
#define ROOT_INO 1
#define YESNO_LENGTH 64
@ -956,7 +957,9 @@ check_file(struct minix_inode *dir, unsigned int offset) {
ino = 0;
}
if (name_depth < MAX_DEPTH)
strncpy(name_list[name_depth], name, namelen);
xstrncpy(name_list[name_depth], name, namelen);
else
return;
name_depth++;
inode = get_inode(ino);
name_depth--;
@ -981,7 +984,9 @@ check_file(struct minix_inode *dir, unsigned int offset) {
if (!inode)
return;
if (name_depth < MAX_DEPTH)
strncpy(name_list[name_depth], name, namelen);
xstrncpy(name_list[name_depth], name, namelen);
else
return;
name_depth++;
if (list) {
if (verbose)
@ -1024,7 +1029,9 @@ check_file2(struct minix2_inode *dir, unsigned int offset) {
ino = 0;
}
if (name_depth < MAX_DEPTH)
strncpy(name_list[name_depth], name, namelen);
xstrncpy(name_list[name_depth], name, namelen);
else
return;
name_depth++;
inode = get_inode2(ino);
name_depth--;