From: Denis Kenzior <denkenz@gmail.com>
To: ofono@lists.linux.dev
Cc: Denis Kenzior <denkenz@gmail.com>
Subject: [PATCH v2 12/18] storage: Remove mode argument
Date: Fri, 2 Feb 2024 16:53:44 -0600 [thread overview]
Message-ID: <20240202225405.993792-12-denkenz@gmail.com> (raw)
In-Reply-To: <20240202225405.993792-1-denkenz@gmail.com>
oFono should be making all sub-directories in STORAGEDIR (typically
/var/lib/ofono) as owner readable/writable. No other permissions make
sense. Remove the mode argument from the function signature to make
this explicit.
---
src/storage.c | 7 ++++---
src/storage.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/storage.c b/src/storage.c
index 47429c22d1bc..1b761c4ce57a 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -47,12 +47,13 @@ const char *ofono_storage_dir(void)
return STORAGEDIR;
}
-int create_dirs(const char *filename, const mode_t mode)
+int create_dirs(const char *filename)
{
struct stat st;
char *dir;
const char *prev, *next;
int err;
+ static const mode_t mode = 0700;
if (filename[0] != '/')
return -1;
@@ -133,7 +134,7 @@ ssize_t write_file(const unsigned char *buffer, size_t len,
tmp_path = l_strdup_printf("%s.XXXXXX.tmp", path);
r = -1;
- if (create_dirs(path, mode | S_IXUSR) != 0)
+ if (create_dirs(path) != 0)
goto error_create_dirs;
fd = L_TFR(g_mkstemp_full(tmp_path, O_WRONLY | O_CREAT | O_TRUNC, mode));
@@ -204,7 +205,7 @@ void storage_sync(const char *imsi, const char *store, GKeyFile *keyfile)
if (path == NULL)
return;
- if (create_dirs(path, S_IRUSR | S_IWUSR | S_IXUSR) != 0) {
+ if (create_dirs(path) != 0) {
l_free(path);
return;
}
diff --git a/src/storage.h b/src/storage.h
index 76069949e747..46efd2d1a208 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -22,7 +22,7 @@
#include <fcntl.h>
#include <sys/types.h>
-int create_dirs(const char *filename, const mode_t mode);
+int create_dirs(const char *filename);
ssize_t read_file(unsigned char *buffer, size_t len,
const char *path_fmt, ...)
--
2.43.0
next prev parent reply other threads:[~2024-02-02 22:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 22:53 [PATCH v2 01/18] umlrunner: Also mount /var/lib as tmpfs Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 02/18] build: Only enable backtrace(3) in maintainer mode Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 03/18] build: Bring in more ell classes Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 04/18] build: Enable _auto_ syntax Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 05/18] provisiondb: Remove some duplicate MCCMNC entries Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 06/18] storage: Introduce storage_get_file_path() Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 07/18] storage: Convert g_strdup_* use to l_strdup_* Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 08/18] common: Drop GLib use from gprs_auth_proto_to_string Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 09/18] common: Drop GLib use from gprs_proto_to_string Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 10/18] storage: Remove mode parameter Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 11/18] storage: Use l_malloc Denis Kenzior
2024-02-02 22:53 ` Denis Kenzior [this message]
2024-02-02 22:53 ` [PATCH v2 13/18] storage: Use void * instead of unsigned char * Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 14/18] storage: use l_file_set_contents Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 15/18] lte: Refactor lte settings management Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 16/18] lte: Add provisioning support Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 17/18] phonesim: Add lte atom Denis Kenzior
2024-02-02 22:53 ` [PATCH v2 18/18] lte: Write provisioned info to disk Denis Kenzior
2024-02-02 23:30 ` [PATCH v2 01/18] umlrunner: Also mount /var/lib as tmpfs patchwork-bot+ofono
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=20240202225405.993792-12-denkenz@gmail.com \
--to=denkenz@gmail.com \
--cc=ofono@lists.linux.dev \
/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