korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-04 04:44:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

kobject: modify kobject_get_path() to take a const *

Browse Source 
[ Upstream commit 33a0a1e3b3 ]

kobject_get_path() does not modify the kobject passed to it, so make the
pointer constant.

Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Link: https://lore.kernel.org/r/20221001165315.2690141-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 3bb2a01caa ("kobject: Fix slab-out-of-bounds in fill_kobj_path()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Greg Kroah-Hartman 2022-10-01 18:53:15 +02:00
parent 2c59650d07
commit e8bfba508c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/kobject.h
View File

@ -116,7 +116,7 @@ extern void kobject_put(struct kobject *kobj);
extern const void *kobject_namespace(struct kobject *kobj);
extern void kobject_get_ownership(struct kobject *kobj,
kuid_t *uid, kgid_t *gid);
extern char *kobject_get_path(struct kobject *kobj, gfp_t flag);
extern char *kobject_get_path(const struct kobject *kobj, gfp_t flag);
/**
* kobject_has_children - Returns whether a kobject has children.

10
lib/kobject.c
View File

@ -126,10 +126,10 @@ static int create_dir(struct kobject *kobj)
return 0;
}
static int get_kobj_path_length(struct kobject *kobj)
static int get_kobj_path_length(const struct kobject *kobj)
{
int length = 1;
struct kobject *parent = kobj;
const struct kobject *parent = kobj;
/* walk up the ancestors until we hit the one pointing to the
* root.
@ -144,9 +144,9 @@ static int get_kobj_path_length(struct kobject *kobj)
return length;
}
static void fill_kobj_path(struct kobject *kobj, char *path, int length)
static void fill_kobj_path(const struct kobject *kobj, char *path, int length)
{
struct kobject *parent;
const struct kobject *parent;
--length;
for (parent = kobj; parent; parent = parent->parent) {
@ -168,7 +168,7 @@ static void fill_kobj_path(struct kobject *kobj, char *path, int length)
*
* Return: The newly allocated memory, caller must free with kfree().
*/
char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
char *kobject_get_path(const struct kobject *kobj, gfp_t gfp_mask)
{
char *path;
int len;