Skip to content

bubblewrap: Fix leak of xasprintf-ed source path for --(ro)-bind-fd flag #762

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

Open
bbhtt wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −0
Open

bubblewrap: Fix leak of xasprintf-ed source path for --(ro)-bind-fd flag #762

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
14 changes: 14 additions & 0 deletions bubblewrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ struct _SetupOp
SetupOpFlag flags;
int perms;
size_t size; /* number of bytes, zero means unset/default */
bool source_owned;
SetupOp *next;
};

Expand Down Expand Up @@ -1375,6 +1376,13 @@ close_ops_fd (void)
(void) close (op->fd);
op->fd = -1;
}

if (op->source_owned)
{
free ((char *) op->source);
op->source = NULL;
op->source_owned = false;
}
}
}

Expand Down Expand Up @@ -1407,6 +1415,11 @@ resolve_symlinks_in_ops (void)
else
die_with_error("Can't find source path %s", old_source);
}
else if (op->source_owned)
{
free ((char *) old_source);
}
op->source_owned = false;
break;

case SETUP_RO_OVERLAY_MOUNT:
Expand Down Expand Up @@ -1734,6 +1747,7 @@ parse_args_recurse (int *argcp,
else
op = setup_op_new (SETUP_BIND_MOUNT);
op->source = xasprintf ("/proc/self/fd/%d", src_fd);
op->source_owned = true;
op->fd = src_fd;
op->dest = argv[2];

Expand Down