From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup] add missing O_CLOEXEC flags to `openat` calls
Date: Mon, 02 Dec 2024 14:44:34 +0100 [thread overview]
Message-ID: <1733145516.ao1kjde75z.astroid@yuna.none> (raw)
In-Reply-To: <20241129153908.4141576-1-d.csapak@proxmox.com>
Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
I wonder whether we want to have a helper/wrapper for this that ensures
we always set O_CLOEXEC? else it's quite easy for a new call to slip
through that is missing it.. OTOH, it would probably still be possible
to miss not using such a wrapper as well..
On November 29, 2024 4:39 pm, Dominik Csapak wrote:
> since we don't want to have lingering file descriptors on reload, which
> does a fork/exec.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> pbs-client/src/pxar/dir_stack.rs | 2 +-
> pbs-datastore/src/backup_info.rs | 2 +-
> pbs-datastore/src/snapshot_reader.rs | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/pbs-client/src/pxar/dir_stack.rs b/pbs-client/src/pxar/dir_stack.rs
> index 616d7545b..6fe55f170 100644
> --- a/pbs-client/src/pxar/dir_stack.rs
> +++ b/pbs-client/src/pxar/dir_stack.rs
> @@ -57,7 +57,7 @@ impl PxarDir {
> let dir = Dir::openat(
> parent,
> self.file_name.as_os_str(),
> - OFlag::O_DIRECTORY,
> + OFlag::O_DIRECTORY | OFlag::O_CLOEXEC,
> Mode::empty(),
> )?;
>
> diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs
> index be262773b..1ca279aca 100644
> --- a/pbs-datastore/src/backup_info.rs
> +++ b/pbs-datastore/src/backup_info.rs
> @@ -143,7 +143,7 @@ impl BackupGroup {
> match openat(
> l2_fd,
> &manifest_path,
> - OFlag::O_RDONLY,
> + OFlag::O_RDONLY | OFlag::O_CLOEXEC,
> nix::sys::stat::Mode::empty(),
> ) {
> Ok(rawfd) => {
> diff --git a/pbs-datastore/src/snapshot_reader.rs b/pbs-datastore/src/snapshot_reader.rs
> index 95e59a421..dea51cbef 100644
> --- a/pbs-datastore/src/snapshot_reader.rs
> +++ b/pbs-datastore/src/snapshot_reader.rs
> @@ -102,7 +102,7 @@ impl SnapshotReader {
> let raw_fd = nix::fcntl::openat(
> self.locked_dir.as_raw_fd(),
> Path::new(filename),
> - nix::fcntl::OFlag::O_RDONLY,
> + nix::fcntl::OFlag::O_RDONLY | nix::fcntl::OFlag::O_CLOEXEC,
> nix::sys::stat::Mode::empty(),
> )?;
> let file = unsafe { File::from_raw_fd(raw_fd) };
> --
> 2.39.5
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-12-02 13:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-29 15:39 Dominik Csapak
2024-12-02 13:44 ` Fabian Grünbichler [this message]
2024-12-03 15:49 ` [pbs-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1733145516.ao1kjde75z.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox