mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] proc: make struct proc_dir_entry::name const
Date: Wed, 29 Nov 2023 12:46:57 +0300	[thread overview]
Message-ID: <d724d33e-7c0d-422b-8d23-3d677cc414fe@p183> (raw)

Multiply ::name into "mut_name" and "name" which is "const char*".

PDE's name must not be mutated on live PDE, hint modules they should not
do it.

Many other members must not be mutated live as well, but start with
obvious one.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 fs/proc/generic.c  |    2 +-
 fs/proc/internal.h |    5 ++++-
 fs/proc/proc_net.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -436,7 +436,7 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
 		}
 	}
 
-	memcpy(ent->name, fn, qstr.len + 1);
+	memcpy(ent->mut_name, fn, qstr.len + 1);
 	ent->namelen = qstr.len;
 	ent->mode = mode;
 	ent->nlink = nlink;
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -59,7 +59,10 @@ struct proc_dir_entry {
 	struct proc_dir_entry *parent;
 	struct rb_root subdir;
 	struct rb_node subdir_node;
-	char *name;
+	union {
+		const char *name;
+		char *mut_name;
+	};
 	umode_t mode;
 	u8 flags;
 	u8 namelen;
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -368,7 +368,7 @@ static __net_init int proc_net_ns_init(struct net *net)
 	netd->namelen = 3;
 	netd->parent = &proc_root;
 	netd->name = netd->inline_name;
-	memcpy(netd->name, "net", 4);
+	memcpy(netd->mut_name, "net", 4);
 
 	uid = make_kuid(net->user_ns, 0);
 	if (!uid_valid(uid))

             reply	other threads:[~2023-11-29  9:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-29  9:46 Alexey Dobriyan [this message]
2023-11-29 22:07 ` Andrew Morton
2023-11-30  6:58   ` Alexey Dobriyan

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=d724d33e-7c0d-422b-8d23-3d677cc414fe@p183 \
    --to=adobriyan@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@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

all inboxes | Powered by JetHome®