| Message ID | 20241111123304.651436-1-lautrbach@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 267d4f9bf5bc |
| Delegated to: | Petr Lautrbach |
| Headers | show |
| Series | libsemanage: open lock_file with O_RDWR | expand |
On Mon, Nov 11, 2024 at 7:33 AM Petr Lautrbach <lautrbach@redhat.com> wrote: > > man 2 flock: > Since Linux 2.6.12, NFS clients support flock() locks by emulating > them as fcntl(2) byte-range locks on the entire file. This means > that fcntl(2) and flock() locks do interact with one another > over NFS. It also means that in order to place an exclusive lock, > the file must be opened for writing. > > Fixes: > # semanage fcontext -d -e /home /tmp/testdir > libsemanage.semanage_get_lock: Error obtaining direct transaction lock at /var/lib/selinux/targeted/semanage.trans.LOCK. (Bad file descriptor). > OSError: Bad file descriptor > > Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> Acked-by: James Carter <jwcart2@gmail.com> > --- > libsemanage/src/semanage_store.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c > index 0ac2e5b2ad39..c26f5667b3cd 100644 > --- a/libsemanage/src/semanage_store.c > +++ b/libsemanage/src/semanage_store.c > @@ -1899,14 +1899,12 @@ static int semanage_get_lock(semanage_handle_t * sh, > struct timeval origtime, curtime; > int got_lock = 0; > > - if ((fd = open(lock_file, O_RDONLY)) == -1) { > - if ((fd = > - open(lock_file, O_RDWR | O_CREAT | O_TRUNC, > - S_IRUSR | S_IWUSR)) == -1) { > - ERR(sh, "Could not open direct %s at %s.", lock_name, > - lock_file); > - return -1; > - } > + if ((fd = > + open(lock_file, O_RDWR | O_CREAT | O_TRUNC, > + S_IRUSR | S_IWUSR)) == -1) { > + ERR(sh, "Could not open direct %s at %s.", lock_name, > + lock_file); > + return -1; > } > if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) { > ERR(sh, "Could not set close-on-exec for %s at %s.", lock_name, > -- > 2.47.0 > >
On Fri, Nov 15, 2024 at 9:16 AM James Carter <jwcart2@gmail.com> wrote: > > On Mon, Nov 11, 2024 at 7:33 AM Petr Lautrbach <lautrbach@redhat.com> wrote: > > > > man 2 flock: > > Since Linux 2.6.12, NFS clients support flock() locks by emulating > > them as fcntl(2) byte-range locks on the entire file. This means > > that fcntl(2) and flock() locks do interact with one another > > over NFS. It also means that in order to place an exclusive lock, > > the file must be opened for writing. > > > > Fixes: > > # semanage fcontext -d -e /home /tmp/testdir > > libsemanage.semanage_get_lock: Error obtaining direct transaction lock at /var/lib/selinux/targeted/semanage.trans.LOCK. (Bad file descriptor). > > OSError: Bad file descriptor > > > > Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> > > Acked-by: James Carter <jwcart2@gmail.com> > Merged. Thanks, Jim > > --- > > libsemanage/src/semanage_store.c | 14 ++++++-------- > > 1 file changed, 6 insertions(+), 8 deletions(-) > > > > diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c > > index 0ac2e5b2ad39..c26f5667b3cd 100644 > > --- a/libsemanage/src/semanage_store.c > > +++ b/libsemanage/src/semanage_store.c > > @@ -1899,14 +1899,12 @@ static int semanage_get_lock(semanage_handle_t * sh, > > struct timeval origtime, curtime; > > int got_lock = 0; > > > > - if ((fd = open(lock_file, O_RDONLY)) == -1) { > > - if ((fd = > > - open(lock_file, O_RDWR | O_CREAT | O_TRUNC, > > - S_IRUSR | S_IWUSR)) == -1) { > > - ERR(sh, "Could not open direct %s at %s.", lock_name, > > - lock_file); > > - return -1; > > - } > > + if ((fd = > > + open(lock_file, O_RDWR | O_CREAT | O_TRUNC, > > + S_IRUSR | S_IWUSR)) == -1) { > > + ERR(sh, "Could not open direct %s at %s.", lock_name, > > + lock_file); > > + return -1; > > } > > if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) { > > ERR(sh, "Could not set close-on-exec for %s at %s.", lock_name, > > -- > > 2.47.0 > > > >
diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c index 0ac2e5b2ad39..c26f5667b3cd 100644 --- a/libsemanage/src/semanage_store.c +++ b/libsemanage/src/semanage_store.c @@ -1899,14 +1899,12 @@ static int semanage_get_lock(semanage_handle_t * sh, struct timeval origtime, curtime; int got_lock = 0; - if ((fd = open(lock_file, O_RDONLY)) == -1) { - if ((fd = - open(lock_file, O_RDWR | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR)) == -1) { - ERR(sh, "Could not open direct %s at %s.", lock_name, - lock_file); - return -1; - } + if ((fd = + open(lock_file, O_RDWR | O_CREAT | O_TRUNC, + S_IRUSR | S_IWUSR)) == -1) { + ERR(sh, "Could not open direct %s at %s.", lock_name, + lock_file); + return -1; } if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) { ERR(sh, "Could not set close-on-exec for %s at %s.", lock_name,
man 2 flock: Since Linux 2.6.12, NFS clients support flock() locks by emulating them as fcntl(2) byte-range locks on the entire file. This means that fcntl(2) and flock() locks do interact with one another over NFS. It also means that in order to place an exclusive lock, the file must be opened for writing. Fixes: # semanage fcontext -d -e /home /tmp/testdir libsemanage.semanage_get_lock: Error obtaining direct transaction lock at /var/lib/selinux/targeted/semanage.trans.LOCK. (Bad file descriptor). OSError: Bad file descriptor Signed-off-by: Petr Lautrbach <lautrbach@redhat.com> --- libsemanage/src/semanage_store.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)