| Message ID | 20221121094649.1556002-3-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
Am 21.11.22 um 10:46 schrieb Greg Kroah-Hartman: > 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. > > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: linux-media@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Christian König <christian.koenig@amd.com> for the changes to the DMA-buf subsystem. > --- > 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(-) > > diff --git a/drivers/base/bus.c b/drivers/base/bus.c > index 7ca47e5b3c1f..4ec6dbab73be 100644 > --- a/drivers/base/bus.c > +++ b/drivers/base/bus.c > @@ -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); > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index a79b99ecf4d8..005a2b092f3e 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -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) > diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-buf-sysfs-stats.c > index 2bba0babcb62..f69d68122b9b 100644 > --- a/drivers/dma-buf/dma-buf-sysfs-stats.c > +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c > @@ -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; > } > diff --git a/include/linux/kobject.h b/include/linux/kobject.h > index 5a2d58e10bf5..640f59d4b3de 100644 > --- a/include/linux/kobject.h > +++ b/include/linux/kobject.h > @@ -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); > }; > diff --git a/kernel/params.c b/kernel/params.c > index 5b92310425c5..d2237209ceda 100644 > --- a/kernel/params.c > +++ b/kernel/params.c > @@ -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); >
On Mon, Nov 21, 2022 at 10:47 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > 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. > > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: linux-media@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Rafael J. Wysocki <rafael@kernel.org> > --- > 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(-) > > diff --git a/drivers/base/bus.c b/drivers/base/bus.c > index 7ca47e5b3c1f..4ec6dbab73be 100644 > --- a/drivers/base/bus.c > +++ b/drivers/base/bus.c > @@ -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); > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index a79b99ecf4d8..005a2b092f3e 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -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) > diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-buf-sysfs-stats.c > index 2bba0babcb62..f69d68122b9b 100644 > --- a/drivers/dma-buf/dma-buf-sysfs-stats.c > +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c > @@ -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; > } > diff --git a/include/linux/kobject.h b/include/linux/kobject.h > index 5a2d58e10bf5..640f59d4b3de 100644 > --- a/include/linux/kobject.h > +++ b/include/linux/kobject.h > @@ -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); > }; > diff --git a/kernel/params.c b/kernel/params.c > index 5b92310425c5..d2237209ceda 100644 > --- a/kernel/params.c > +++ b/kernel/params.c > @@ -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 >
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 7ca47e5b3c1f..4ec6dbab73be 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -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); diff --git a/drivers/base/core.c b/drivers/base/core.c index a79b99ecf4d8..005a2b092f3e 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -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) diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-buf-sysfs-stats.c index 2bba0babcb62..f69d68122b9b 100644 --- a/drivers/dma-buf/dma-buf-sysfs-stats.c +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c @@ -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; } diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 5a2d58e10bf5..640f59d4b3de 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -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); }; diff --git a/kernel/params.c b/kernel/params.c index 5b92310425c5..d2237209ceda 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -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);
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. Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: "Christian König" <christian.koenig@amd.com> Cc: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- 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(-)