block: partitions: Use seq_buf_putc() in cmdline_partition()
Subsystems (7)
PATCH 1/1 block: partitions: Use seq_buf_putc() in cmdline_partition()
From: Markus Elfring <[email protected]>
Date: Thu, 25 Jun 2026 09:50:33 +0200
A single line break should be put into a sequence buffer. Thus use the corresponding function “seq_buf_putc”.
The source code was transformed by using the Coccinelle software.
---
All affected source code places could be adjusted at once if the change acceptance would evolve accordingly.
18 source files are left over for similar development considerations.
block/partitions/cmdline.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
block/partitions/cmdline.c +1 -3
@@ -376,8 +376,6 @@ int cmdline_partition(struct parsed_partitions *state)cmdline_parts_set (parts, disk_size, state);cmdline_parts_verifier (1 , state); - -seq_buf_puts (&state->pp_buf,"\n" ); - +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
Signature · 1 line
2.54.0
Quoted 3 lines · Markus Elfring
A single line break should be put into a sequence buffer. Thus use the corresponding function “seq_buf_putc”.
“seq_buf_putc()”.
Quoted 1 line
The source code was transformed by using the Coccinelle software.
...
block/partitions/cmdline.c int cmdline_partition(struct parsed_partitions *state) · line 379
Quoted 7 lines
block/partitions/cmdline.c +1
-3cmdline_parts_set (parts, disk_size, state);cmdline_parts_verifier (1 , state); - -seq_buf_puts (&state->pp_buf,"\n" ); - +seq_buf_putc (&state->pp_buf,'\n' );
Why did you remove blank lines?
Quoted 1 line
return 1;
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 4 lines
Quoted 3 lines
block/partitions/cmdline.c +0
-0cmdline_parts_set (parts, disk_size, state);cmdline_parts_verifier (1 , state);
Quoted 8 lines
block/partitions/cmdline.c int cmdline_partition(struct parsed_partitions *state) · line 379
Quoted 4 lines
block/partitions/cmdline.c +1
-3- -seq_buf_puts (&state->pp_buf,"\n" ); - +seq_buf_putc (&state->pp_buf,'\n' );Why did you remove blank lines?
Quoted 1 line
return 1;
I imagine that this source code place can become a bit more succinct.
See also:efi_partition()
https://elixir.bootlin.com/linux/v7.1.1/source/block/partitions/efi.c#L694-L756
Do you insist to preserve two blank lines here?
Regards,
Markus
On Thu, Jun 25, 2026 at 02:18:49PM +0200, Markus Elfring wrote:
...
Quoted 10 lines
Quoted 10 lines
block/partitions/cmdline.c int cmdline_partition(struct parsed_partitions *state) · line 379
Quoted 7 lines
block/partitions/cmdline.c +1
-3cmdline_parts_set (parts, disk_size, state);cmdline_parts_verifier (1 , state); - -seq_buf_puts (&state->pp_buf,"\n" ); - +seq_buf_putc (&state->pp_buf,'\n' );Why did you remove blank lines?
Quoted 8 lines
Quoted 1 line
Quoted 1 line
return 1;
I imagine that this source code place can become a bit more succinct.
See also:
efi_partition()
https://elixir.bootlin.com/linux/v7.1.1/source/block/partitions/efi.c#L694-L756Do you insist to preserve two blank lines here?
Yes.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 7 lines
All affected source code places could be adjusted at once if the change acceptance would evolve accordingly.
18 source files are left over for similar development considerations.
block/partitions/cmdline.c | 4 +---
Will development interests grow for remaining update candidates?
See also:
Clarification approach “Using seq_buf_putc() calls more often?”
https://lore.kernel.org/cocci/[email protected]/
https://sympa.inria.fr/sympa/arc/cocci/2026-06/msg00030.html
Regards,
Markus
Le 26/06/2026 à 18:48, Markus Elfring a écrit :
Quoted 9 lines
Quoted 7 lines
All affected source code places could be adjusted at once if the change acceptance would evolve accordingly.
18 source files are left over for similar development considerations.
block/partitions/cmdline.c | 4 +---Will development interests grow for remaining update candidates?
These changes are pointless and already performed by the compiler. See [1]. So from my PoV, they only trash git blame output and make future backport harder.
Just my 2c.
CJ
[1]: https://elixir.bootlin.com/linux/v7.1-rc6/source/include/linux/seq_file.h#L127
Quoted 10 lines
See also:
Clarification approach “Usingseq_buf_putc()calls more often?”
https://lore.kernel.org/cocci/[email protected]/
https://sympa.inria.fr/sympa/arc/cocci/2026-06/msg00030.htmlRegards,
Markus
…
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
block/partitions/cmdline.c| 4 +---Will development interests grow for remaining update candidates?
These changes are pointless and already performed by the compiler.
I got other impressions.
Quoted 4 lines
See [1].So from my PoV, they only trash git blame output and make future backport harder.
Just my 2c.
…
Why do you refer to the sequence file programming interface when I propose refinements for the application of sequence buffers?
https://elixir.bootlin.com/linux/v7.1.1/source/include/linux/seq_buf.h#L176-L177
Regards,
Markus
PATCH v2 1/1 block: partitions: Use seq_buf_putc() at 24 places
In reply to Andy ShevchenkoFrom: Markus Elfring <[email protected]>
Date: Mon, 29 Jun 2026 08:10:24 +0200
Single line breaks should occasionally be put into a sequence buffer. Thus use the seq_buf_putc() function in these implementations.
The source code was transformed by using the Coccinelle software.
---
v2:
* Andy Shevchenko requested to preserve two blank lines.
* The source code transformation was extended to all affected places for this software area.
block/partitions/acorn.c | 8 ++++---- block/partitions/amiga.c | 2 +- block/partitions/atari.c | 2 +- block/partitions/cmdline.c | 2 +- block/partitions/efi.c | 2 +- block/partitions/ibm.c | 10 +++++----- block/partitions/karma.c | 2 +- block/partitions/ldm.c | 2 +- block/partitions/mac.c | 2 +- block/partitions/msdos.c | 4 ++-- block/partitions/of.c | 2 +- block/partitions/osf.c | 2 +- block/partitions/sgi.c | 2 +- block/partitions/sun.c | 2 +- block/partitions/sysv68.c | 2 +- block/partitions/ultrix.c | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-)
block/partitions/acorn.c +4 -4
@@ -290,7 +290,7 @@ int adfspart_check_ADFS(struct parsed_partitions *state) break; } } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }#endif
@@ -397,7 +397,7 @@ int adfspart_check_ICS(struct parsed_partitions *state) }put_dev_sector (sect); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }#endif
@@ -468,7 +468,7 @@ int adfspart_check_POWERTEC(struct parsed_partitions *state) }put_dev_sector (sect); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }#endif
@@ -539,7 +539,7 @@ int adfspart_check_EESOX(struct parsed_partitions *state) size =get_capacity (state->disk);put_partition (state, slot++, start, size - start); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' ); }return i ?1 :0 ;
block/partitions/amiga.c +1 -1
@@ -194,7 +194,7 @@ int amiga_partition(struct parsed_partitions *state) } res =1 ; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' ); rdb_done:return res;
block/partitions/atari.c +1 -1
@@ -150,7 +150,7 @@ int atari_partition(struct parsed_partitions *state)#endif put_dev_sector (sect); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
block/partitions/cmdline.c +1 -1
@@ -377,7 +377,7 @@ int cmdline_partition(struct parsed_partitions *state)cmdline_parts_set (parts, disk_size, state);cmdline_parts_verifier (1 , state); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
block/partitions/efi.c +1 -1
@@ -751,6 +751,6 @@ int efi_partition(struct parsed_partitions *state) }kfree (ptes);kfree (gpt); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
block/partitions/ibm.c +5 -5
@@ -217,7 +217,7 @@ static int find_vol1_partitions(struct parsed_partitions *state, blk++; data =read_part_sector (state, blk * secperblk, §); } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );if (!data)return -1 ;
@@ -254,7 +254,7 @@ static int find_lnx1_partitions(struct parsed_partitions *state, size = nr_sectors;if (size != geo_size) {if (!info) { -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }if (!strcmp (info->type,"ECKD" ))
@@ -266,7 +266,7 @@ static int find_lnx1_partitions(struct parsed_partitions *state,/* first and only partition starts in the first block after the label */ offset = labelsect + secperblk;put_partition (state,1 , offset, size - offset); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
@@ -307,7 +307,7 @@ static int find_cms1_partitions(struct parsed_partitions *state, }put_partition (state,1 , offset, size-offset); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
@@ -388,7 +388,7 @@ int ibm_partition(struct parsed_partitions *state) size = nr_sectors; offset = (info->label_block +1 ) * (blocksize >>9 );put_partition (state,1 , offset, size-offset); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' ); } }else res =0 ;
block/partitions/karma.c +1 -1
@@ -53,7 +53,7 @@ int karma_partition(struct parsed_partitions *state) } slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );put_dev_sector (sect);return 1 ; }
block/partitions/ldm.c +1 -1
@@ -597,7 +597,7 @@ static bool ldm_create_data_partitions (struct parsed_partitions *pp, part_num++; } -seq_buf_puts (&pp->pp_buf,"\n" ); +seq_buf_putc (&pp->pp_buf,'\n' );return true; }
block/partitions/mac.c +1 -1
@@ -152,6 +152,6 @@ int mac_partition(struct parsed_partitions *state)#endif put_dev_sector (sect); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }
block/partitions/msdos.c +2 -2
@@ -608,7 +608,7 @@ int msdos_partition(struct parsed_partitions *state) fb = (struct fat_boot_sector *) data;if (slot ==1 && fb->reserved && fb->fats &&fat_valid_media (fb->media)) { -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );put_dev_sector (sect);return 1 ; }else {
@@ -672,7 +672,7 @@ int msdos_partition(struct parsed_partitions *state)seq_buf_puts (&state->pp_buf,"[EZD]" ); } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );/* second pass - output for each on a separate line */ p = (struct msdos_partition *) (0x1be + data);
block/partitions/of.c +1 -1
@@ -104,7 +104,7 @@ int of_partition(struct parsed_partitions *state) slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );of_node_put (partitions_np);return 1 ;
block/partitions/osf.c +1 -1
@@ -81,7 +81,7 @@ int osf_partition(struct parsed_partitions *state) le32_to_cpu(partition->p_size)); slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );put_dev_sector (sect);return 1 ; }
block/partitions/sgi.c +1 -1
@@ -79,7 +79,7 @@ int sgi_partition(struct parsed_partitions *state) } slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );put_dev_sector (sect);return 1 ; }
block/partitions/sun.c +1 -1
@@ -121,7 +121,7 @@ int sun_partition(struct parsed_partitions *state) } slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );put_dev_sector (sect);return 1 ; }
block/partitions/sysv68.c +1 -1
@@ -86,7 +86,7 @@ int sysv68_partition(struct parsed_partitions *state) } slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );put_dev_sector (sect);return 1 ; }
block/partitions/ultrix.c +1 -1
@@ -39,7 +39,7 @@ int ultrix_partition(struct parsed_partitions *state) label->pt_part[i].pi_blkoff, label->pt_part[i].pi_nblocks);put_dev_sector (sect); -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );return 1 ; }else {put_dev_sector (sect);
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH v2] block: partitions: Use seq_buf_putc() at 24 places
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Out-of-bounds read in sysv68 partition parser leading to a kernel memory leak.
- [Medium] Uninitialized variable 'len' may lead to a NULL pointer dereference or undefined behavior. --
commit 350b3ea7021ee2238b49cf91963fe54906868307
Author: Markus Elfring <[email protected]>
block: partitions: Use seq_buf_putc() at 24 places
Single line breaks should occasionally be put into a sequence buffer. Thus use the seq_buf_putc() function in these implementations.
The source code was transformed by using the Coccinelle software.
[ ... ]
block/partitions/of.c int of_partition(struct parsed_partitions *state) · line 107
Quoted 10 lines
block/partitions/of.c +1
-1@@ -104,7 +104,7 @@ int of_partition(struct parsed_partitions *state) slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );
[Severity: Medium]
This is a pre-existing issue, but I noticed a potential uninitialized variable bug when looking at the partition validation called just before this in of_partition().
If a device tree partition node is missing the 'reg' property:
block/partitions/of.c:validate_of_partition() {
...
int len;
const __be32 *reg = of_get_property(np, "reg", &len);
int a_cells = of_n_addr_cells(np);
int s_cells = of_n_size_cells(np);
/* Make sure reg len match the expected addr and size cells */
if (len / sizeof(*reg) != a_cells + s_cells)
...
}of_get_property() returns NULL and leaves len uninitialized. The code then divides this uninitialized len by 4 and compares it to expected cell counts.
If the uninitialized stack garbage happens to match, could this proceed to add_of_partition() where it directly passes the NULL reg pointer to of_read_number(), unconditionally dereferencing it?
block/partitions/of.c:add_of_partition() {
...
int len;
const __be32 *reg = of_get_property(np, "reg", &len);
int a_cells = of_n_addr_cells(np);
int s_cells = of_n_size_cells(np);
/* Convert bytes to sector size */
u64 offset = of_read_number(reg, a_cells) / SECTOR_SIZE;
...
}[ ... ]
block/partitions/sysv68.c int sysv68_partition(struct parsed_partitions *state) · line 89
Quoted 10 lines
block/partitions/sysv68.c +1
-1@@ -86,7 +86,7 @@ int sysv68_partition(struct parsed_partitions *state) } slot++; } -seq_buf_puts (&state->pp_buf,"\n" ); +seq_buf_putc (&state->pp_buf,'\n' );
[Severity: High]
This isn't a bug introduced by this patch, but does the loop immediately preceding this code have an out-of-bounds read issue?
sysv68_partition() reads the number of slices from the untrusted disk label without validating it against the 512-byte sector buffer bounds:
block/partitions/sysv68.c:sysv68_partition() {
...
slice = (struct slice *)data;
for (i = 0; i < slices; i++, slice++) {
if (slot == state->limit)
break;
if (be32_to_cpu(slice->nblocks)) {
put_partition(state, slot,
be32_to_cpu(slice->blkoff),
be32_to_cpu(slice->nblocks));
...
}It then iterates up to state->limit (typically 256) times, advancing the slice pointer. Reading 256 struct slice entries takes 2048 bytes out of a guaranteed 512-byte sector buffer.
If the 512-byte sector is located near the end of a mapped page, could reading beyond 512 bytes cross into adjacent physical kernel memory and leak it via the partition table?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Re: [PATCH v2] block: partitions: Use seq_buf_putc() at 24 places
In reply to Markus ElfringQuoted 6 lines · Markus Elfring
From: Markus Elfring <[email protected]>
Date: Mon, 29 Jun 2026 08:10:24 +0200Single line breaks should occasionally be put into a sequence buffer. Thus use the
seq_buf_putc()function in these implementations.
Quoted 7 lines
The source code was transformed by using the Coccinelle software.
Signed-off-by Markus Elfring <[email protected]>---
v2:
* Andy Shevchenko requested to preserve two blank lines.
This comment in the context of the given commit message may be odd. The blank lines mentioned were in the code that previous coccinelle script removed, id est the code
...blank line... seq_buf_puts() ...blank line...
the script transformed to a single line
seq_buf_putc()
So my request is to keep the original blank line(s) as is.
Quoted 2 lines
* The source code transformation was extended to all affected places for this software area.
Signature · 2 lines
With Best Regards, Andy Shevchenko