kobject: make kobject_get_ownership() take a constant kobject *
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 1/5 kobject: make kobject_get_ownership() take a constant kobject *
The call, kobject_get_ownership(), does not modify the kobject passed into it, so make it const. This propagates down into the kobj_type function callbacks so make the kobject passed into them also const, ensuring that nothing in the kobject is being changed here.
This helps make it more obvious what calls and callbacks do, and do not, modify structures passed to them.
--- drivers/base/class.c | 2 +- drivers/base/core.c | 8 ++++---- fs/nfs/sysfs.c | 4 ++-- include/linux/kobject.h | 8 ++++---- lib/kobject.c | 4 ++-- net/bridge/br_if.c | 2 +- net/core/net-sysfs.c | 8 ++++---- net/sunrpc/sysfs.c | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-)
drivers/base/class.c +1 -1
@@ -62,7 +62,7 @@ static void class_release(struct kobject *kobj)kfree (cp); } -static const struct kobj_ns_type_operations *class_child_ns_type (struct kobject *kobj) +static const struct kobj_ns_type_operations *class_child_ns_type (const struct kobject *kobj) {struct subsys_private *cp =to_subsys_private (kobj);struct class *class = cp->class;
drivers/base/core.c +4 -4
@@ -2335,7 +2335,7 @@ static void device_release(struct kobject *kobj)kfree (p); } -static const void *device_namespace (struct kobject *kobj) +static const void *device_namespace (const struct kobject *kobj) {const struct device *dev =kobj_to_dev (kobj);const void *ns =NULL ;
@@ -2346,7 +2346,7 @@ static const void *device_namespace(struct kobject *kobj)return ns; } -static void device_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +static void device_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {const struct device *dev =kobj_to_dev (kobj);
@@ -2986,9 +2986,9 @@ static void class_dir_release(struct kobject *kobj) }static const -struct kobj_ns_type_operations *class_dir_child_ns_type (struct kobject *kobj) +struct kobj_ns_type_operations *class_dir_child_ns_type (const struct kobject *kobj) { -struct class_dir *dir =to_class_dir (kobj); +const struct class_dir *dir =to_class_dir (kobj);return dir->class->ns_type; }
fs/nfs/sysfs.c +2 -2
@@ -26,7 +26,7 @@ static void nfs_netns_object_release(struct kobject *kobj) }static const struct kobj_ns_type_operations *nfs_netns_object_child_ns_type ( -struct kobject *kobj) +const struct kobject *kobj) {return &net_ns_type_operations; }
@@ -130,7 +130,7 @@ static void nfs_netns_client_release(struct kobject *kobj)kfree (c); } -static const void *nfs_netns_client_namespace (struct kobject *kobj) +static const void *nfs_netns_client_namespace (const struct kobject *kobj) { return container_of(kobj, struct nfs_netns_client, kobject)->net; }
include/linux/kobject.h +4 -4
@@ -113,7 +113,7 @@ extern struct kobject * __must_check kobject_get_unless_zero(extern void kobject_put (struct kobject *kobj);extern const void *kobject_namespace (struct kobject *kobj); -extern void kobject_get_ownership (struct kobject *kobj, +extern void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid);extern char *kobject_get_path (const struct kobject *kobj,gfp_t flag);
@@ -121,9 +121,9 @@ struct kobj_type {void (*release)(struct kobject *kobj);const struct sysfs_ops *sysfs_ops;const struct attribute_group **default_groups; -const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj); -const void *(*namespace)(struct kobject *kobj); -void (*get_ownership)(struct kobject *kobj,kuid_t *uid,kgid_t *gid); +const struct kobj_ns_type_operations *(*child_ns_type)(const struct kobject *kobj); +const void *(*namespace)(const struct kobject *kobj); +void (*get_ownership)(const struct kobject *kobj,kuid_t *uid,kgid_t *gid); };struct kobj_uevent_env {
lib/kobject.c +2 -2
@@ -45,7 +45,7 @@ const void *kobject_namespace(struct kobject *kobj)* representation of given kobject. Normally used to adjust ownership of * objects in a container. */ -void kobject_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) { *uid =GLOBAL_ROOT_UID ; *gid =GLOBAL_ROOT_GID ;
@@ -907,7 +907,7 @@ static void kset_release(struct kobject *kobj)kfree (kset); } -static void kset_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +static void kset_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {if (kobj->parent)kobject_get_ownership (kobj->parent, uid, gid);
net/bridge/br_if.c +1 -1
@@ -262,7 +262,7 @@ static void release_nbp(struct kobject *kobj)kfree (p); } -static void brport_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +static void brport_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {struct net_bridge_port *p =kobj_to_brport (kobj);
net/core/net-sysfs.c +4 -4
@@ -1020,7 +1020,7 @@ static void rx_queue_release(struct kobject *kobj)netdev_put (queue->dev, &queue->dev_tracker); } -static const void *rx_queue_namespace (struct kobject *kobj) +static const void *rx_queue_namespace (const struct kobject *kobj) {struct netdev_rx_queue *queue =to_rx_queue (kobj);struct device *dev = &queue->dev->dev;
@@ -1032,7 +1032,7 @@ static const void *rx_queue_namespace(struct kobject *kobj)return ns; } -static void rx_queue_get_ownership (struct kobject *kobj, +static void rx_queue_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {const struct net *net =rx_queue_namespace (kobj);
@@ -1623,7 +1623,7 @@ static void netdev_queue_release(struct kobject *kobj)netdev_put (queue->dev, &queue->dev_tracker); } -static const void *netdev_queue_namespace (struct kobject *kobj) +static const void *netdev_queue_namespace (const struct kobject *kobj) {struct netdev_queue *queue =to_netdev_queue (kobj);struct device *dev = &queue->dev->dev;
@@ -1635,7 +1635,7 @@ static const void *netdev_queue_namespace(struct kobject *kobj)return ns; } -static void netdev_queue_get_ownership (struct kobject *kobj, +static void netdev_queue_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {const struct net *net =netdev_queue_namespace (kobj);
net/sunrpc/sysfs.c +4 -4
@@ -31,7 +31,7 @@ static void rpc_sysfs_object_release(struct kobject *kobj) }static const struct kobj_ns_type_operations * -rpc_sysfs_object_child_ns_type (struct kobject *kobj) +rpc_sysfs_object_child_ns_type (const struct kobject *kobj) {return &net_ns_type_operations; }
@@ -381,17 +381,17 @@ static void rpc_sysfs_xprt_release(struct kobject *kobj)kfree (xprt); } -static const void *rpc_sysfs_client_namespace (struct kobject *kobj) +static const void *rpc_sysfs_client_namespace (const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_client, kobject)->net; } -static const void *rpc_sysfs_xprt_switch_namespace (struct kobject *kobj) +static const void *rpc_sysfs_xprt_switch_namespace (const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_xprt_switch, kobject)->net; } -static const void *rpc_sysfs_xprt_namespace (struct kobject *kobj) +static const void *rpc_sysfs_xprt_namespace (const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_xprt, kobject)->xprt->xprt_net;
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 3/5 kobject: kset_uevent_ops: make filter() callback take a const *
The filter() callback in struct kset_uevent_ops does not modify the kobject passed into it, so make the pointer const to enforce this restriction. When doing so, fix up all existing filter() callbacks to have the correct signature to preserve the build.
--- drivers/base/bus.c | 2 +- drivers/base/core.c | 4 ++-- drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- include/linux/kobject.h | 2 +- kernel/params.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/base/bus.c +1 -1
@@ -163,7 +163,7 @@ static struct kobj_type bus_ktype = { .release = bus_release, }; -static int bus_uevent_filter (struct kobject *kobj) +static int bus_uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);
drivers/base/core.c +2 -2
@@ -2362,12 +2362,12 @@ static struct kobj_type device_ktype = { }; -static int dev_uevent_filter (struct kobject *kobj) +static int dev_uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);if (ktype == &device_ktype) { -struct device *dev =kobj_to_dev (kobj); +const struct device *dev =kobj_to_dev (kobj);if (dev->bus)return 1 ;if (dev->class)
drivers/dma-buf/dma-buf-sysfs-stats.c +1 -1
@@ -132,7 +132,7 @@ void dma_buf_stats_teardown(struct dma_buf *dmabuf)/* Statistics files do not need to send uevents. */ -static int dmabuf_sysfs_uevent_filter (struct kobject *kobj) +static int dmabuf_sysfs_uevent_filter (const struct kobject *kobj) {return 0 ; }
include/linux/kobject.h +1 -1
@@ -135,7 +135,7 @@ struct kobj_uevent_env { };struct kset_uevent_ops { -int (*const filter)(struct kobject *kobj); +int (*const filter)(const struct kobject *kobj);const char *(*const name)(struct kobject *kobj);int (*const uevent)(struct kobject *kobj,struct kobj_uevent_env *env); };
kernel/params.c +1 -1
@@ -926,7 +926,7 @@ static const struct sysfs_ops module_sysfs_ops = { .store = module_attr_store, }; -static int uevent_filter (struct kobject *kobj) +static int uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 2/5 kobject: make kobject_namespace take a const *
In reply to Greg Kroah-Hartmankobject_namespace() should take a const *kobject as it does not modify the kobject passed to it. Change that, and the functions kobj_child_ns_ops() and kobj_ns_ops() needed to also be changed to const *.
--- include/linux/kobject.h | 2 +- include/linux/kobject_ns.h | 4 ++-- lib/kobject.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
include/linux/kobject.h +1 -1
@@ -112,7 +112,7 @@ extern struct kobject * __must_check kobject_get_unless_zero( struct kobject *kobj);extern void kobject_put (struct kobject *kobj); -extern const void *kobject_namespace (struct kobject *kobj); +extern const void *kobject_namespace (const struct kobject *kobj);extern void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid);extern char *kobject_get_path (const struct kobject *kobj,gfp_t flag);
include/linux/kobject_ns.h +2 -2
@@ -47,8 +47,8 @@ struct kobj_ns_type_operations {int kobj_ns_type_register (const struct kobj_ns_type_operations *ops);int kobj_ns_type_registered (enum kobj_ns_type type); -const struct kobj_ns_type_operations *kobj_child_ns_ops (struct kobject *parent); -const struct kobj_ns_type_operations *kobj_ns_ops (struct kobject *kobj); +const struct kobj_ns_type_operations *kobj_child_ns_ops (const struct kobject *parent); +const struct kobj_ns_type_operations *kobj_ns_ops (const struct kobject *kobj);bool kobj_ns_current_may_mount (enum kobj_ns_type type);void *kobj_ns_grab_current (enum kobj_ns_type type);
lib/kobject.c +3 -3
@@ -25,7 +25,7 @@* and thus @kobj should have a namespace tag associated with it. Returns * %NULL otherwise. */ -const void *kobject_namespace (struct kobject *kobj) +const void *kobject_namespace (const struct kobject *kobj) {const struct kobj_ns_type_operations *ns_ops =kobj_ns_ops (kobj);
@@ -1039,7 +1039,7 @@ int kobj_ns_type_registered(enum kobj_ns_type type)return registered; } -const struct kobj_ns_type_operations *kobj_child_ns_ops (struct kobject *parent) +const struct kobj_ns_type_operations *kobj_child_ns_ops (const struct kobject *parent) {const struct kobj_ns_type_operations *ops =NULL ;
@@ -1049,7 +1049,7 @@ const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent)return ops; } -const struct kobj_ns_type_operations *kobj_ns_ops (struct kobject *kobj) +const struct kobj_ns_type_operations *kobj_ns_ops (const struct kobject *kobj) {return kobj_child_ns_ops (kobj->parent); }
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 5/5 driver core: pass a const * into of_device_uevent()
In reply to Greg Kroah-Hartmanof_device_uevent() does not modify the struct device * passed into it, so make it a const * to enforce this. Also the documentation for the function was really wrong so fix that up at the same time.
--- drivers/of/device.c | 6 +++--- include/linux/of_device.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/of/device.c +3 -3
@@ -332,10 +332,10 @@ EXPORT_SYMBOL_GPL(of_device_modalias);/** * of_device_uevent - Display OF related uevent information -* @dev: Device to apply DMA configuration -* @env: Kernel object's userspace event reference +* @dev: Device to display the uevent information for +* @env: Kernel object's userspace event reference to fill up */ -void of_device_uevent (struct device *dev,struct kobj_uevent_env *env) +void of_device_uevent (const struct device *dev,struct kobj_uevent_env *env) {const char *compat, *type;struct alias_prop *app;
include/linux/of_device.h +2 -2
@@ -35,7 +35,7 @@ extern const void *of_device_get_match_data(const struct device *dev);extern ssize_t of_device_modalias (struct device *dev,char *str,ssize_t len);extern int of_device_request_module (struct device *dev); -extern void of_device_uevent (struct device *dev,struct kobj_uevent_env *env); +extern void of_device_uevent (const struct device *dev,struct kobj_uevent_env *env);extern int of_device_uevent_modalias (struct device *dev,struct kobj_uevent_env *env);static inline struct device_node *of_cpu_device_node_get (int cpu)
@@ -64,7 +64,7 @@ static inline int of_driver_match_device(struct device *dev,return 0 ; } -static inline void of_device_uevent (struct device *dev, +static inline void of_device_uevent (const struct device *dev,struct kobj_uevent_env *env) { }static inline const void *of_device_get_match_data (const struct device *dev)
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 4/5 kobject: kset_uevent_ops: make name() callback take a const *
In reply to Greg Kroah-HartmanThe name() callback in struct kset_uevent_ops does not modify the kobject passed into it, so make the pointer const to enforce this restriction. When doing so, fix up the single existing name() callback to have the correct signature to preserve the build.
--- drivers/base/core.c | 4 ++-- include/linux/kobject.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/base/core.c +2 -2
@@ -2376,9 +2376,9 @@ static int dev_uevent_filter(const struct kobject *kobj)return 0 ; } -static const char *dev_uevent_name (struct kobject *kobj) +static const char *dev_uevent_name (const struct kobject *kobj) { -struct device *dev =kobj_to_dev (kobj); +const struct device *dev =kobj_to_dev (kobj);if (dev->bus)return dev->bus->name;
include/linux/kobject.h +1 -1
@@ -136,7 +136,7 @@ struct kobj_uevent_env {struct kset_uevent_ops {int (*const filter)(const struct kobject *kobj); -const char *(*const name)(struct kobject *kobj); +const char *(*const name)(const struct kobject *kobj);int (*const uevent)(struct kobject *kobj,struct kobj_uevent_env *env); };
Signature · 1 line
2.38.1
Re: [Linaro-mm-sig] [PATCH 3/5] kobject: kset_uevent_ops: make filter() callback take a const *
In reply to Greg Kroah-HartmanAm 21.11.22 um 10:46 schrieb Greg Kroah-Hartman:
Quoted 5 lines
The
filter()callback in structkset_uevent_opsdoes not modify the kobject passed into it, so make the pointer const to enforce this restriction. When doing so, fix up all existingfilter()callbacks to have the correct signature to preserve the build.
Quoted 7 lines
Cc "Rafael J. Wysocki" <[email protected]>Cc Sumit Semwal <[email protected]>Cc "Christian König" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 79 lines
--- drivers/base/bus.c | 2 +- drivers/base/core.c | 4 ++-- drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- include/linux/kobject.h | 2 +- kernel/params.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)drivers/base/bus.c +1
-1@@ -163,7 +163,7 @@ static struct kobj_type bus_ktype = { .release = bus_release, }; -static int bus_uevent_filter (struct kobject *kobj) +static int bus_uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);drivers/base/core.c +2
-2@@ -2362,12 +2362,12 @@ static struct kobj_type device_ktype = { }; -static int dev_uevent_filter (struct kobject *kobj) +static int dev_uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);if (ktype == &device_ktype) { -struct device *dev =kobj_to_dev (kobj); +const struct device *dev =kobj_to_dev (kobj);if (dev->bus)return 1 ;if (dev->class)drivers/dma-buf/dma-buf-sysfs-stats.c +1
-1@@ -132,7 +132,7 @@ void dma_buf_stats_teardown(struct dma_buf *dmabuf)/* Statistics files do not need to send uevents. */ -static int dmabuf_sysfs_uevent_filter (struct kobject *kobj) +static int dmabuf_sysfs_uevent_filter (const struct kobject *kobj) {return 0 ; }include/linux/kobject.h +1
-1@@ -135,7 +135,7 @@ struct kobj_uevent_env { };struct kset_uevent_ops { -int (*const filter)(struct kobject *kobj); +int (*const filter)(const struct kobject *kobj);const char *(*const name)(struct kobject *kobj);int (*const uevent)(struct kobject *kobj,struct kobj_uevent_env *env); };kernel/params.c +1
-1@@ -926,7 +926,7 @@ static const struct sysfs_ops module_sysfs_ops = { .store = module_attr_store, }; -static int uevent_filter (struct kobject *kobj) +static int uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);
Quoted 23 lines · Greg Kroah-Hartman
The call,
kobject_get_ownership(), does not modify the kobject passed into it, so make it const. This propagates down into thekobj_typefunction callbacks so make the kobject passed into them also const, ensuring that nothing in the kobject is being changed here.This helps make it more obvious what calls and callbacks do, and do not, modify structures passed to them.
Cc "Rafael J. Wysocki" <[email protected]>Cc Trond Myklebust <[email protected]>Cc Anna Schumaker <[email protected]>Cc Roopa Prabhu <[email protected]>Cc Nikolay Aleksandrov <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc Chuck Lever <[email protected]>Cc Jeff Layton <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 11 lines
--- drivers/base/class.c | 2 +- drivers/base/core.c | 8 ++++---- fs/nfs/sysfs.c | 4 ++-- include/linux/kobject.h | 8 ++++---- lib/kobject.c | 4 ++-- net/bridge/br_if.c | 2 +- net/core/net-sysfs.c | 8 ++++---- net/sunrpc/sysfs.c | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-)
For the bridge:
Quoted 9 lines · Greg Kroah-Hartman
The call,
kobject_get_ownership(), does not modify the kobject passed into it, so make it const. This propagates down into thekobj_typefunction callbacks so make the kobject passed into them also const, ensuring that nothing in the kobject is being changed here.This helps make it more obvious what calls and callbacks do, and do not, modify structures passed to them.
Quoted 15 lines
Cc "Rafael J. Wysocki" <[email protected]>Cc Trond Myklebust <[email protected]>Cc Anna Schumaker <[email protected]>Cc Roopa Prabhu <[email protected]>Cc Nikolay Aleksandrov <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc Chuck Lever <[email protected]>Cc Jeff Layton <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 218 lines
--- drivers/base/class.c | 2 +- drivers/base/core.c | 8 ++++---- fs/nfs/sysfs.c | 4 ++-- include/linux/kobject.h | 8 ++++---- lib/kobject.c | 4 ++-- net/bridge/br_if.c | 2 +- net/core/net-sysfs.c | 8 ++++---- net/sunrpc/sysfs.c | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-)drivers/base/class.c +1
-1@@ -62,7 +62,7 @@ static void class_release(struct kobject *kobj)kfree (cp); } -static const struct kobj_ns_type_operations *class_child_ns_type (struct kobject *kobj) +static const struct kobj_ns_type_operations *class_child_ns_type (const struct kobject *kobj) {struct subsys_private *cp =to_subsys_private (kobj);struct class *class = cp->class;drivers/base/core.c +4
-4@@ -2335,7 +2335,7 @@ static void device_release(struct kobject *kobj)kfree (p); } -static const void *device_namespace (struct kobject *kobj) +static const void *device_namespace (const struct kobject *kobj) {const struct device *dev =kobj_to_dev (kobj);const void *ns =NULL ;@@ -2346,7 +2346,7 @@ static const void *device_namespace(struct kobject *kobj)return ns; } -static void device_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +static void device_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {const struct device *dev =kobj_to_dev (kobj);@@ -2986,9 +2986,9 @@ static void class_dir_release(struct kobject *kobj) }static const -struct kobj_ns_type_operations *class_dir_child_ns_type (struct kobject *kobj) +struct kobj_ns_type_operations *class_dir_child_ns_type (const struct kobject *kobj) { -struct class_dir *dir =to_class_dir (kobj); +const struct class_dir *dir =to_class_dir (kobj);return dir->class->ns_type; }fs/nfs/sysfs.c +2
-2@@ -26,7 +26,7 @@ static void nfs_netns_object_release(struct kobject *kobj) }static const struct kobj_ns_type_operations *nfs_netns_object_child_ns_type ( -struct kobject *kobj) +const struct kobject *kobj) {return &net_ns_type_operations; }@@ -130,7 +130,7 @@ static void nfs_netns_client_release(struct kobject *kobj)kfree (c); } -static const void *nfs_netns_client_namespace (struct kobject *kobj) +static const void *nfs_netns_client_namespace (const struct kobject *kobj) { return container_of(kobj, struct nfs_netns_client, kobject)->net; }include/linux/kobject.h +4
-4@@ -113,7 +113,7 @@ extern struct kobject * __must_check kobject_get_unless_zero(extern void kobject_put (struct kobject *kobj);extern const void *kobject_namespace (struct kobject *kobj); -extern void kobject_get_ownership (struct kobject *kobj, +extern void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid);extern char *kobject_get_path (const struct kobject *kobj,gfp_t flag);@@ -121,9 +121,9 @@ struct kobj_type {void (*release)(struct kobject *kobj);const struct sysfs_ops *sysfs_ops;const struct attribute_group **default_groups; -const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj); -const void *(*namespace)(struct kobject *kobj); -void (*get_ownership)(struct kobject *kobj,kuid_t *uid,kgid_t *gid); +const struct kobj_ns_type_operations *(*child_ns_type)(const struct kobject *kobj); +const void *(*namespace)(const struct kobject *kobj); +void (*get_ownership)(const struct kobject *kobj,kuid_t *uid,kgid_t *gid); };struct kobj_uevent_env {lib/kobject.c +2
-2@@ -45,7 +45,7 @@ const void *kobject_namespace(struct kobject *kobj)* representation of given kobject. Normally used to adjust ownership of * objects in a container. */ -void kobject_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) { *uid =GLOBAL_ROOT_UID ; *gid =GLOBAL_ROOT_GID ;@@ -907,7 +907,7 @@ static void kset_release(struct kobject *kobj)kfree (kset); } -static void kset_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +static void kset_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {if (kobj->parent)kobject_get_ownership (kobj->parent, uid, gid);net/bridge/br_if.c +1
-1@@ -262,7 +262,7 @@ static void release_nbp(struct kobject *kobj)kfree (p); } -static void brport_get_ownership (struct kobject *kobj,kuid_t *uid,kgid_t *gid) +static void brport_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {struct net_bridge_port *p =kobj_to_brport (kobj);net/core/net-sysfs.c +4
-4@@ -1020,7 +1020,7 @@ static void rx_queue_release(struct kobject *kobj)netdev_put (queue->dev, &queue->dev_tracker); } -static const void *rx_queue_namespace (struct kobject *kobj) +static const void *rx_queue_namespace (const struct kobject *kobj) {struct netdev_rx_queue *queue =to_rx_queue (kobj);struct device *dev = &queue->dev->dev;@@ -1032,7 +1032,7 @@ static const void *rx_queue_namespace(struct kobject *kobj)return ns; } -static void rx_queue_get_ownership (struct kobject *kobj, +static void rx_queue_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {const struct net *net =rx_queue_namespace (kobj);@@ -1623,7 +1623,7 @@ static void netdev_queue_release(struct kobject *kobj)netdev_put (queue->dev, &queue->dev_tracker); } -static const void *netdev_queue_namespace (struct kobject *kobj) +static const void *netdev_queue_namespace (const struct kobject *kobj) {struct netdev_queue *queue =to_netdev_queue (kobj);struct device *dev = &queue->dev->dev;@@ -1635,7 +1635,7 @@ static const void *netdev_queue_namespace(struct kobject *kobj)return ns; } -static void netdev_queue_get_ownership (struct kobject *kobj, +static void netdev_queue_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid) {const struct net *net =netdev_queue_namespace (kobj);net/sunrpc/sysfs.c +4
-5@@ -31,7 +31,7 @@ static void rpc_sysfs_object_release(struct kobject *kobj) }static const struct kobj_ns_type_operations * -rpc_sysfs_object_child_ns_type (struct kobject *kobj) +rpc_sysfs_object_child_ns_type (const struct kobject *kobj) {return &net_ns_type_operations; }@@ -381,17 +381,17 @@ static void rpc_sysfs_xprt_release(struct kobject *kobj)kfree (xprt); } -static const void *rpc_sysfs_client_namespace (struct kobject *kobj) +static const void *rpc_sysfs_client_namespace (const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_client, kobject)->net; } -static const void *rpc_sysfs_xprt_switch_namespace (struct kobject *kobj) +static const void *rpc_sysfs_xprt_switch_namespace (const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_xprt_switch, kobject)->net; } -static const void *rpc_sysfs_xprt_namespace (struct kobject *kobj) +static const void *rpc_sysfs_xprt_namespace (const struct kobject *kobj) { return container_of(kobj, struct rpc_sysfs_xprt, kobject)->xprt->xprt_net; --2.38.1
Re: [PATCH 3/5] kobject: kset_uevent_ops: make filter() callback take a const *
In reply to Greg Kroah-HartmanQuoted 6 lines · Greg Kroah-Hartman
The
filter()callback in structkset_uevent_opsdoes not modify the kobject passed into it, so make the pointer const to enforce this restriction. When doing so, fix up all existingfilter()callbacks to have the correct signature to preserve the build.
Quoted 7 lines
Cc "Rafael J. Wysocki" <[email protected]>Cc Sumit Semwal <[email protected]>Cc "Christian König" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 82 lines
--- drivers/base/bus.c | 2 +- drivers/base/core.c | 4 ++-- drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- include/linux/kobject.h | 2 +- kernel/params.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)drivers/base/bus.c +1
-1@@ -163,7 +163,7 @@ static struct kobj_type bus_ktype = { .release = bus_release, }; -static int bus_uevent_filter (struct kobject *kobj) +static int bus_uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);drivers/base/core.c +2
-2@@ -2362,12 +2362,12 @@ static struct kobj_type device_ktype = { }; -static int dev_uevent_filter (struct kobject *kobj) +static int dev_uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj);if (ktype == &device_ktype) { -struct device *dev =kobj_to_dev (kobj); +const struct device *dev =kobj_to_dev (kobj);if (dev->bus)return 1 ;if (dev->class)drivers/dma-buf/dma-buf-sysfs-stats.c +1
-1@@ -132,7 +132,7 @@ void dma_buf_stats_teardown(struct dma_buf *dmabuf)/* Statistics files do not need to send uevents. */ -static int dmabuf_sysfs_uevent_filter (struct kobject *kobj) +static int dmabuf_sysfs_uevent_filter (const struct kobject *kobj) {return 0 ; }include/linux/kobject.h +1
-1@@ -135,7 +135,7 @@ struct kobj_uevent_env { };struct kset_uevent_ops { -int (*const filter)(struct kobject *kobj); +int (*const filter)(const struct kobject *kobj);const char *(*const name)(struct kobject *kobj);int (*const uevent)(struct kobject *kobj,struct kobj_uevent_env *env); };kernel/params.c +1
-2@@ -926,7 +926,7 @@ static const struct sysfs_ops module_sysfs_ops = { .store = module_attr_store, }; -static int uevent_filter (struct kobject *kobj) +static int uevent_filter (const struct kobject *kobj) {const struct kobj_type *ktype =get_ktype (kobj); --2.38.1
Re: [PATCH 2/5] kobject: make kobject_namespace take a const *
In reply to Greg Kroah-HartmanQuoted 8 lines · Greg Kroah-Hartman
kobject_namespace()should take a const *kobject as it does not modify the kobject passed to it. Change that, and the functionskobj_child_ns_ops()andkobj_ns_ops()needed to also be changed to const *.Cc "Rafael J. Wysocki" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 68 lines
--- include/linux/kobject.h | 2 +- include/linux/kobject_ns.h | 4 ++-- lib/kobject.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)include/linux/kobject.h +1
-1@@ -112,7 +112,7 @@ extern struct kobject * __must_check kobject_get_unless_zero( struct kobject *kobj);extern void kobject_put (struct kobject *kobj); -extern const void *kobject_namespace (struct kobject *kobj); +extern const void *kobject_namespace (const struct kobject *kobj);extern void kobject_get_ownership (const struct kobject *kobj,kuid_t *uid,kgid_t *gid);extern char *kobject_get_path (const struct kobject *kobj,gfp_t flag);include/linux/kobject_ns.h +2
-2@@ -47,8 +47,8 @@ struct kobj_ns_type_operations {int kobj_ns_type_register (const struct kobj_ns_type_operations *ops);int kobj_ns_type_registered (enum kobj_ns_type type); -const struct kobj_ns_type_operations *kobj_child_ns_ops (struct kobject *parent); -const struct kobj_ns_type_operations *kobj_ns_ops (struct kobject *kobj); +const struct kobj_ns_type_operations *kobj_child_ns_ops (const struct kobject *parent); +const struct kobj_ns_type_operations *kobj_ns_ops (const struct kobject *kobj);bool kobj_ns_current_may_mount (enum kobj_ns_type type);void *kobj_ns_grab_current (enum kobj_ns_type type);lib/kobject.c +3
-4@@ -25,7 +25,7 @@* and thus @kobj should have a namespace tag associated with it. Returns * %NULL otherwise. */ -const void *kobject_namespace (struct kobject *kobj) +const void *kobject_namespace (const struct kobject *kobj) {const struct kobj_ns_type_operations *ns_ops =kobj_ns_ops (kobj);@@ -1039,7 +1039,7 @@ int kobj_ns_type_registered(enum kobj_ns_type type)return registered; } -const struct kobj_ns_type_operations *kobj_child_ns_ops (struct kobject *parent) +const struct kobj_ns_type_operations *kobj_child_ns_ops (const struct kobject *parent) {const struct kobj_ns_type_operations *ops =NULL ;@@ -1049,7 +1049,7 @@ const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent)return ops; } -const struct kobj_ns_type_operations *kobj_ns_ops (struct kobject *kobj) +const struct kobj_ns_type_operations *kobj_ns_ops (const struct kobject *kobj) {return kobj_child_ns_ops (kobj->parent); } --2.38.1
Re: [PATCH 4/5] kobject: kset_uevent_ops: make name() callback take a const *
In reply to Greg Kroah-HartmanQuoted 8 lines · Greg Kroah-Hartman
The
name()callback in structkset_uevent_opsdoes not modify the kobject passed into it, so make the pointer const to enforce this restriction. When doing so, fix up the single existingname()callback to have the correct signature to preserve the build.Cc "Rafael J. Wysocki" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 37 lines
--- drivers/base/core.c | 4 ++-- include/linux/kobject.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/base/core.c +2
-2@@ -2376,9 +2376,9 @@ static int dev_uevent_filter(const struct kobject *kobj)return 0 ; } -static const char *dev_uevent_name (struct kobject *kobj) +static const char *dev_uevent_name (const struct kobject *kobj) { -struct device *dev =kobj_to_dev (kobj); +const struct device *dev =kobj_to_dev (kobj);if (dev->bus)return dev->bus->name;include/linux/kobject.h +1
-2@@ -136,7 +136,7 @@ struct kobj_uevent_env {struct kset_uevent_ops {int (*const filter)(const struct kobject *kobj); -const char *(*const name)(struct kobject *kobj); +const char *(*const name)(const struct kobject *kobj);int (*const uevent)(struct kobject *kobj,struct kobj_uevent_env *env); }; --2.38.1
Quoted 7 lines · On Mon, 21 Nov 2022 10:46:45 +0100 Greg Kroah-Hartman wrote:
The call,
kobject_get_ownership(), does not modify the kobject passed into it, so make it const. This propagates down into thekobj_typefunction callbacks so make the kobject passed into them also const, ensuring that nothing in the kobject is being changed here.This helps make it more obvious what calls and callbacks do, and do not, modify structures passed to them.
Rob Herring
maintainerRe: [PATCH 5/5] driver core: pass a const * into of_device_uevent()
In reply to Greg Kroah-HartmanQuoted 4 lines · Greg Kroah-Hartman
of_device_uevent()does not modify the struct device * passed into it, so make it a const * to enforce this. Also the documentation for the function was really wrong so fix that up at the same time.
Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Frank Rowand <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/of/device.c | 6 +++--- include/linux/of_device.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
Looks like I can take this one?
The same could be done for several other functions in of/device.c.
Greg Kroah-Hartman
maintainerRe: [PATCH 5/5] driver core: pass a const * into of_device_uevent()
Quoted 14 lines · Rob Herring
Quoted 4 lines · Greg Kroah-Hartman
of_device_uevent()does not modify the struct device * passed into it, so make it a const * to enforce this. Also the documentation for the function was really wrong so fix that up at the same time.Quoted 8 lines
Cc Rob Herring <[email protected]>Cc Frank Rowand <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/of/device.c | 6 +++--- include/linux/of_device.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
Quoted 1 line
Looks like I can take this one?
I need it for later patches I have coming that clean this up more.
But you can take it in your tree as well if you want to build on top of it.
Quoted 1 line
The same could be done for several other functions in
of/device.c.
That would be good!
thanks,
greg k-h