| Message ID | 20210623013802.1904951-2-nathan@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/2] ACPI: bgrt: Fix CFI violation | expand |
On Tue, Jun 22, 2021 at 06:38:02PM -0700, Nathan Chancellor wrote: > sysfs_emit is preferred to snprintf for emitting values after > commit 2efc459d06f1 ("sysfs: Add sysfs_emit and sysfs_emit_at to format > sysfs output"). > > Signed-off-by: Nathan Chancellor <nathan@kernel.org> Perhaps just squash this into patch 1? Looks good otherwise!
On 6/22/2021 10:51 PM, Kees Cook wrote: > On Tue, Jun 22, 2021 at 06:38:02PM -0700, Nathan Chancellor wrote: >> sysfs_emit is preferred to snprintf for emitting values after >> commit 2efc459d06f1 ("sysfs: Add sysfs_emit and sysfs_emit_at to format >> sysfs output"). >> >> Signed-off-by: Nathan Chancellor <nathan@kernel.org> > > Perhaps just squash this into patch 1? Looks good otherwise! > I thought about it but sysfs_emit is a relatively new API and the previous change may want to be backported but I do not have a strong opinion so I can squash it if Rafael or Len feel strongly :) Thanks for taking a look, cheers! Nathan
On Wed, Jun 23, 2021 at 09:28:55AM -0700, Nathan Chancellor wrote: > On 6/22/2021 10:51 PM, Kees Cook wrote: > > On Tue, Jun 22, 2021 at 06:38:02PM -0700, Nathan Chancellor wrote: > > > sysfs_emit is preferred to snprintf for emitting values after > > > commit 2efc459d06f1 ("sysfs: Add sysfs_emit and sysfs_emit_at to format > > > sysfs output"). > > > > > > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > > > > Perhaps just squash this into patch 1? Looks good otherwise! > > > > I thought about it but sysfs_emit is a relatively new API and the previous > change may want to be backported but I do not have a strong opinion so I can > squash it if Rafael or Len feel strongly :) Fair enough. :) I figured since CFI is even newer than sysfs_emit(), it didn't make sense to backport. Regardless: Reviewed-by: Kees Cook <keescook@chromium.org>
On Wed, Jun 23, 2021 at 6:32 PM Kees Cook <keescook@chromium.org> wrote: > > On Wed, Jun 23, 2021 at 09:28:55AM -0700, Nathan Chancellor wrote: > > On 6/22/2021 10:51 PM, Kees Cook wrote: > > > On Tue, Jun 22, 2021 at 06:38:02PM -0700, Nathan Chancellor wrote: > > > > sysfs_emit is preferred to snprintf for emitting values after > > > > commit 2efc459d06f1 ("sysfs: Add sysfs_emit and sysfs_emit_at to format > > > > sysfs output"). > > > > > > > > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > > > > > > Perhaps just squash this into patch 1? Looks good otherwise! > > > > > > > I thought about it but sysfs_emit is a relatively new API and the previous > > change may want to be backported but I do not have a strong opinion so I can > > squash it if Rafael or Len feel strongly :) > > Fair enough. :) I figured since CFI is even newer than sysfs_emit(), it > didn't make sense to backport. Regardless: > > Reviewed-by: Kees Cook <keescook@chromium.org> Applied along with the [1/2] as 5.14 material, thanks!
diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c index e0d14017706e..02d208732f9a 100644 --- a/drivers/acpi/bgrt.c +++ b/drivers/acpi/bgrt.c @@ -19,7 +19,7 @@ static struct kobject *bgrt_kobj; static ssize_t _name##_show(struct kobject *kobj, \ struct kobj_attribute *attr, char *buf) \ { \ - return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab._member); \ + return sysfs_emit(buf, "%d\n", bgrt_tab._member); \ } \ struct kobj_attribute bgrt_attr_##_name = __ATTR_RO(_name)
sysfs_emit is preferred to snprintf for emitting values after commit 2efc459d06f1 ("sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output"). Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- drivers/acpi/bgrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)