Skip to content

ym2651y: Fix potential buffer overflow for mfr_model/mfr_serial/mfr_model_opt #167

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
roger530-ho wants to merge 1 commit into
base: support_new_platform_and_sync
Choose a base branch
from
Open

ym2651y: Fix potential buffer overflow for mfr_model/mfr_serial/mfr_model_opt #167

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: 5 additions & 6 deletions packages/base/any/kernels/modules/ym2651y.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
goto exit;
}

buf = min_t(u8, buf, ARRAY_SIZE(data->mfr_model)-2);
status = ym2651y_read_block(client, command, data->mfr_model, buf+1);
data->mfr_model[buf+1] = '\0';

Expand All @@ -838,6 +839,7 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
goto exit;
}

buf = min_t(u8, buf, ARRAY_SIZE(data->mfr_model_opt)-2);
status = ym2651y_read_block(client, command, data->mfr_model_opt, buf+1);
data->mfr_model_opt[buf+1] = '\0';

Expand Down Expand Up @@ -873,13 +875,10 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
goto exit;
}

buf = min_t(u8, buf, ARRAY_SIZE(data->mfr_serial)-2);
status = ym2651y_read_block(client, command, data->mfr_serial, buf+1);
if (data->mfr_serial[0] < ARRAY_SIZE(data->mfr_serial)-2) {
data->mfr_serial[data->mfr_serial[0] + 1] = '\0';
}
else {
data->mfr_serial[ARRAY_SIZE(data->mfr_serial)-1] = '\0';
}

data->mfr_serial[buf+1] = '\0';

if (status < 0) {
dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
Expand Down