Skip to content

HDFS-15944. Prevent truncation by snprintf #2853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goiri merged 1 commit into from
Apr 2, 2021
Merged

HDFS-15944. Prevent truncation by snprintf #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/test/fuse_workload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,11 @@ static int testOpenTrunc(const char *base)
const char * const SAMPLE2 = "this is the second file that we wrote. "
"It's #2!";

snprintf(path, sizeof(path), "%s/trunc.txt", base);
int szToWrite = snprintf(NULL, 0, "%s/trunc.txt", base);
EXPECT_INT_LT(szToWrite, PATH_MAX);
int szWritten = snprintf(path, sizeof(path), "%s/trunc.txt", base);
EXPECT_NONNEGATIVE(szWritten);

fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0644);
if (fd < 0) {
err = errno;
Expand Down Expand Up @@ -252,24 +256,38 @@ int runFuseWorkloadImpl(const char *root, const char *pcomp,
EXPECT_NONZERO(S_ISDIR(stBuf.st_mode));

// mkdir <base>/a
snprintf(tmp, sizeof(tmp), "%s/a", base);
int szToWrite = snprintf(NULL, 0, "%s/a", base);
EXPECT_INT_LT(szToWrite, PATH_MAX);
int szWritten = snprintf(tmp, sizeof(tmp), "%s/a", base);
EXPECT_NONNEGATIVE(szWritten);
RETRY_ON_EINTR_GET_ERRNO(ret, mkdir(tmp, 0755));
EXPECT_ZERO(ret);

/* readdir test */
EXPECT_INT_EQ(1, testReadDir(base, expectDirs, DIRS_A_AND_B));

// mkdir <base>/b
snprintf(tmp, sizeof(tmp), "%s/b", base);
szToWrite = snprintf(NULL, 0, "%s/b", base);
EXPECT_INT_LT(szToWrite, PATH_MAX);
szWritten = snprintf(tmp, sizeof(tmp), "%s/b", base);
EXPECT_NONNEGATIVE(szWritten);
RETRY_ON_EINTR_GET_ERRNO(ret, mkdir(tmp, 0755));
EXPECT_ZERO(ret);

// readdir a and b
EXPECT_INT_EQ(2, testReadDir(base, expectDirs, DIRS_A_AND_B));

// rename a -> c
snprintf(src, sizeof(src), "%s/a", base);
snprintf(dst, sizeof(dst), "%s/c", base);
szToWrite = snprintf(NULL, 0, "%s/a", base);
EXPECT_INT_LT(szToWrite, PATH_MAX);
szWritten = snprintf(src, sizeof(src), "%s/a", base);
EXPECT_NONNEGATIVE(szWritten);

szToWrite = snprintf(NULL, 0, "%s/c", base);
EXPECT_INT_LT(szToWrite, PATH_MAX);
szWritten = snprintf(dst, sizeof(dst), "%s/c", base);
EXPECT_NONNEGATIVE(szWritten);

EXPECT_ZERO(rename(src, dst));

// readdir c and b
Expand All @@ -294,7 +312,11 @@ int runFuseWorkloadImpl(const char *root, const char *pcomp,

// open some files and write to them
for (i = 0; i < NUM_FILE_CTX; i++) {
snprintf(tmp, sizeof(tmp), "%s/b/%d", base, i);
szToWrite = snprintf(NULL, 0, "%s/b/%d", base, i);
EXPECT_INT_LT(szToWrite, PATH_MAX);
szWritten = snprintf(tmp, sizeof(tmp), "%s/b/%d", base, i);
EXPECT_NONNEGATIVE(szWritten);

ctx[i].path = strdup(tmp);
if (!ctx[i].path) {
fprintf(stderr, "FUSE_WORKLOAD: OOM on line %d\n", __LINE__);
Expand Down
5 changes: 4 additions & 1 deletion ...s-project/hadoop-hdfs-native-client/src/main/native/libhdfs-tests/test_libhdfs_threaded.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,10 @@ static int doTestHdfsOperations(struct tlhThreadInfo *ti, hdfsFS fs,
int nFile;
for (nFile = 0; nFile < 10000; nFile++) {
char filename[PATH_MAX];
snprintf(filename, PATH_MAX, "%s/many_files_%d", listDirTest, nFile);
int szToWrite = snprintf(NULL, 0, "%s/many_files_%d", listDirTest, nFile);
EXPECT_INT_LT(szToWrite, PATH_MAX);
int szWritten = snprintf(filename, PATH_MAX, "%s/many_files_%d", listDirTest, nFile);
EXPECT_NONNEGATIVE(szWritten);
file = hdfsOpenFile(fs, filename, O_WRONLY, 0, 0, 0);
EXPECT_NONNULL(file);
EXPECT_ZERO(hdfsCloseFile(fs, file));
Expand Down