alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-03 00:00:07 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix memory leak in fuse write.

Browse Source 
The write buffer was being leaked in bcachefs_fuse_write().

Signed-off-by: Justin Husted <sigstop@gmail.com>
This commit is contained in:
Justin Husted 2019-11-09 18:53:20 -08:00
parent 5337ad4a43
commit 7bf4aa61a7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd_fusemount.c
View File

@ -609,6 +609,8 @@ static void bcachefs_fuse_write(fuse_req_t req, fuse_ino_t inum,
inum, size, offset); inum, size, offset);
struct fuse_align_io align = align_io(c, size, offset); struct fuse_align_io align = align_io(c, size, offset);
void *aligned_buf = aligned_alloc(PAGE_SIZE, align.size);
BUG_ON(!aligned_buf);
if (get_inode_io_opts(c, inum, &io_opts)) { if (get_inode_io_opts(c, inum, &io_opts)) {
ret = -ENOENT; ret = -ENOENT;
@ -616,7 +618,6 @@ static void bcachefs_fuse_write(fuse_req_t req, fuse_ino_t inum,
} }
/* Realign the data and read in start and end, if needed */ /* Realign the data and read in start and end, if needed */
void *aligned_buf = aligned_alloc(PAGE_SIZE, align.size);
/* Read partial start data. */ /* Read partial start data. */
if (align.pad_start) { if (align.pad_start) {
@ -673,11 +674,13 @@ static void bcachefs_fuse_write(fuse_req_t req, fuse_ino_t inum,
if (!ret) { if (!ret) {
BUG_ON(written == 0); BUG_ON(written == 0);
fuse_reply_write(req, written); fuse_reply_write(req, written);
free(aligned_buf);
return; return;
} }
err: err:
fuse_reply_err(req, -ret); fuse_reply_err(req, -ret);
free(aligned_buf);
} }
static void bcachefs_fuse_symlink(fuse_req_t req, const char *link, static void bcachefs_fuse_symlink(fuse_req_t req, const char *link,
@ -705,6 +708,8 @@ static void bcachefs_fuse_symlink(fuse_req_t req, const char *link,
struct fuse_align_io align = align_io(c, link_len + 1, 0); struct fuse_align_io align = align_io(c, link_len + 1, 0);
void *aligned_buf = aligned_alloc(PAGE_SIZE, align.size); void *aligned_buf = aligned_alloc(PAGE_SIZE, align.size);
BUG_ON(!aligned_buf);
memset(aligned_buf, 0, align.size); memset(aligned_buf, 0, align.size);
memcpy(aligned_buf, link, link_len); /* already terminated */ memcpy(aligned_buf, link, link_len); /* already terminated */