soundwire: sysfs_emit() expects a buffer of size PAGE_SIZE
PATCH 1/1 soundwire: sysfs_emit() expects a buffer of size PAGE_SIZE
In read_buffer_show(), allocate sufficient memory to pass on to sysfs_emit(), which expects a buffer of size PAGE_SIZE.
--- drivers/soundwire/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/soundwire/debugfs.c +3 -3
@@ -306,12 +306,12 @@ static int cmd_go(void *data, u64 value)DEFINE_DEBUGFS_ATTRIBUTE (cmd_go_fops,NULL , cmd_go,"%llu\n" ); -#define MAX_LINE_LEN 128 -static int read_buffer_show (struct seq_file *s_file,void *data) { -char buf[MAX_LINE_LEN ];int i; + char *buf __free(kfree) = kzalloc(PAGE_SIZE, GFP_KERNEL); +if (!buf) +return -ENOMEM ;if (num_bytes ==0 || num_bytes >MAX_CMD_BYTES )return -EINVAL ;
Signature · 1 line
2.43.0
Quoted 18 lines · Sergio Perez Gonzalez
In
read_buffer_show(), allocate sufficient memory to pass on tosysfs_emit(), which expects a buffer of sizePAGE_SIZE.Fixes 35323d8ab811 ("soundwire: replace scnprintf() with sysfs_emit() for sysfs consistency")Signed-off-by Sergio Perez Gonzalez <[email protected]>--- drivers/soundwire/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/soundwire/debugfs.c +0
-0@@ -306,12 +306,12 @@ static int cmd_go(void *data, u64 value)DEFINE_DEBUGFS_ATTRIBUTE (cmd_go_fops,NULL , cmd_go,"%llu\n" );
drivers/soundwire/debugfs.c static int cmd_go(void *data, u64 value) · line 314
Quoted 10 lines
drivers/soundwire/debugfs.c +3
-3-#define MAX_LINE_LEN 128 -static int read_buffer_show (struct seq_file *s_file,void *data) { -char buf[MAX_LINE_LEN ];int i; + char *buf __free(kfree) = kzalloc(PAGE_SIZE, GFP_KERNEL); +if (!buf) +return -ENOMEM ;
IMO, it's better to scratch the whole previous change. It makes little sense to allocate a large buffer here just for the temporary formatting.
Moreover, *_show() functions there take seq_file pointer, and you can just use seq_printf() directly. The sysfs/kobject show callback is with the a fixed PAGE_SIZE buffer, hence sysfs_emit() is useful, but in this case, it's a completely different story.
thanks,
Takashi
Vinod Koul
maintainerQuoted 35 lines · Takashi Iwai
Quoted 18 lines · Sergio Perez Gonzalez
In
read_buffer_show(), allocate sufficient memory to pass on tosysfs_emit(), which expects a buffer of sizePAGE_SIZE.Fixes 35323d8ab811 ("soundwire: replace scnprintf() with sysfs_emit() for sysfs consistency")Signed-off-by Sergio Perez Gonzalez <[email protected]>--- drivers/soundwire/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/soundwire/debugfs.c +0
-0@@ -306,12 +306,12 @@ static int cmd_go(void *data, u64 value)DEFINE_DEBUGFS_ATTRIBUTE (cmd_go_fops,NULL , cmd_go,"%llu\n" );drivers/soundwire/debugfs.c static int cmd_go(void *data, u64 value) · line 314
Quoted 10 lines
drivers/soundwire/debugfs.c +3
-3-#define MAX_LINE_LEN 128 -static int read_buffer_show (struct seq_file *s_file,void *data) { -char buf[MAX_LINE_LEN ];int i; + char *buf __free(kfree) = kzalloc(PAGE_SIZE, GFP_KERNEL); +if (!buf) +return -ENOMEM ;IMO, it's better to scratch the whole previous change. It makes little sense to allocate a large buffer here just for the temporary formatting.
Quoted 4 lines
Moreover,
*_show()functions there takeseq_filepointer, and you can just useseq_printf()directly. The sysfs/kobject show callback is with the a fixedPAGE_SIZEbuffer, hencesysfs_emit()is useful, but in this case, it's a completely different story.
Agree, dropped now!
Signature · 1 line
~Vinod
All right, then, this will be handled with a different approach.
Thanks,
Sergio
Quoted 46 lines · Vinod Koul
Quoted 35 lines · Takashi Iwai
Quoted 18 lines · Sergio Perez Gonzalez
In
read_buffer_show(), allocate sufficient memory to pass on tosysfs_emit(), which expects a buffer of sizePAGE_SIZE.Fixes 35323d8ab811 ("soundwire: replace scnprintf() with sysfs_emit() for sysfs consistency")Signed-off-by Sergio Perez Gonzalez <[email protected]>--- drivers/soundwire/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/soundwire/debugfs.c +0
-0@@ -306,12 +306,12 @@ static int cmd_go(void *data, u64 value)DEFINE_DEBUGFS_ATTRIBUTE (cmd_go_fops,NULL , cmd_go,"%llu\n" );drivers/soundwire/debugfs.c static int cmd_go(void *data, u64 value) · line 314
Quoted 10 lines
drivers/soundwire/debugfs.c +3
-3-#define MAX_LINE_LEN 128 -static int read_buffer_show (struct seq_file *s_file,void *data) { -char buf[MAX_LINE_LEN ];int i; + char *buf __free(kfree) = kzalloc(PAGE_SIZE, GFP_KERNEL); +if (!buf) +return -ENOMEM ;IMO, it's better to scratch the whole previous change. It makes little sense to allocate a large buffer here just for the temporary formatting.
Quoted 4 lines
Moreover,
*_show()functions there takeseq_filepointer, and you can just useseq_printf()directly. The sysfs/kobject show callback is with the a fixedPAGE_SIZEbuffer, hencesysfs_emit()is useful, but in this case, it's a completely different story.Agree, dropped now!
--
~Vinod