From: Ruediger Meier <sweet_f_a@gmx.de>
To: util-linux@vger.kernel.org
Subject: [PATCH] ipcs,chmem: fix access() usage
Date: Mon, 25 Jun 2018 14:18:31 +0200 [thread overview]
Message-ID: <20180625121831.14610-1-sweet_f_a@gmx.de> (raw)
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Some mistakes happened lately when switching from path_exist()
to ul_path_access(). See f09a98de and 8ca31279.
This caused ipcs tests failures when running i386 binaries on x86_64
hosts, because the syscall fallback was always used. That's why I
reviewed all similar changes and found another one in chmem.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
sys-utils/chmem.c | 2 +-
sys-utils/ipcutils.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c
index e5eab096a..4a4439a22 100644
--- a/sys-utils/chmem.c
+++ b/sys-utils/chmem.c
@@ -428,7 +428,7 @@ int main(int argc, char **argv)
/* The valid_zones sysfs attribute was introduced with kernel 3.18 */
- if (ul_path_access(desc->sysmem, F_OK, "memory0/valid_zones"))
+ if (ul_path_access(desc->sysmem, F_OK, "memory0/valid_zones") == 0)
desc->have_zones = 1;
else if (zone)
warnx(_("zone ignored, no valid_zones sysfs attribute present"));
diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c
index e6dd0c561..5fe297fd4 100644
--- a/sys-utils/ipcutils.c
+++ b/sys-utils/ipcutils.c
@@ -18,9 +18,9 @@
int ipc_msg_get_limits(struct ipc_limits *lim)
{
- if (access(_PATH_PROC_IPC_MSGMNI, F_OK) &&
- access(_PATH_PROC_IPC_MSGMNB, F_OK) &&
- access(_PATH_PROC_IPC_MSGMAX, F_OK)) {
+ if (access(_PATH_PROC_IPC_MSGMNI, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMNB, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMAX, F_OK) == 0) {
ul_path_read_s32(NULL, &lim->msgmni, _PATH_PROC_IPC_MSGMNI);
ul_path_read_s32(NULL, &lim->msgmnb, _PATH_PROC_IPC_MSGMNB);
@@ -71,9 +71,9 @@ int ipc_shm_get_limits(struct ipc_limits *lim)
{
lim->shmmin = SHMMIN;
- if (access(_PATH_PROC_IPC_SHMALL, F_OK) &&
- access(_PATH_PROC_IPC_SHMMAX, F_OK) &&
- access(_PATH_PROC_IPC_SHMMNI, F_OK)) {
+ if (access(_PATH_PROC_IPC_SHMALL, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_SHMMAX, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_SHMMNI, F_OK) == 0) {
ul_path_read_u64(NULL, &lim->shmall, _PATH_PROC_IPC_SHMALL);
ul_path_read_u64(NULL, &lim->shmmax, _PATH_PROC_IPC_SHMMAX);
--
2.13.7
next reply other threads:[~2018-06-25 12:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 12:18 Ruediger Meier [this message]
2018-06-25 14:52 ` [PATCH] ipcs,chmem: fix access() usage Ruediger Meier
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=20180625121831.14610-1-sweet_f_a@gmx.de \
--to=sweet_f_a@gmx.de \
--cc=util-linux@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).