Skip to content

block: partitions: bound sysv68 slice table count #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
+7 −4
Open

block: partitions: bound sysv68 slice table count #951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions block/partitions/sysv68.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ struct slice {

int sysv68_partition(struct parsed_partitions *state)
{
int i, slices;
sector_t slice_sector;
unsigned int i, slices;
int slot = 1;
Sector sect;
unsigned char *data;
Expand All @@ -65,14 +66,16 @@ int sysv68_partition(struct parsed_partitions *state)
return 0;
}
slices = be16_to_cpu(b->dk_ios.ios_slccnt);
i = be32_to_cpu(b->dk_ios.ios_slcblk);
slice_sector = be32_to_cpu(b->dk_ios.ios_slcblk);
put_dev_sector(sect);

data = read_part_sector(state, i, &sect);
data = read_part_sector(state, slice_sector, &sect);
if (!data)
return -1;

slices -= 1; /* last slice is the whole disk */
slices = min_t(unsigned int, slices, SECTOR_SIZE / sizeof(*slice));
if (slices)
slices -= 1; /* last slice is the whole disk */
seq_buf_printf(&state->pp_buf, "sysV68: %s(s%u)", state->name, slices);
slice = (struct slice *)data;
for (i = 0; i < slices; i++, slice++) {
Expand Down
Loading