Skip to content

fsi: master-ast-cf: fix relative address arithmetic #3

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
staticpayload wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fsi: master-ast-cf: fix relative address arithmetic #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
361d10e
fsi: cfam: clamp chunk length to remaining count
staticpayload Jan 16, 2026
68edccd
fsi: master-ast-cf: fix relative address arithmetic
staticpayload Jan 24, 2026
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
6 changes: 2 additions & 4 deletions drivers/fsi/fsi-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,7 @@ static ssize_t cfam_read(struct file *filep, char __user *buf, size_t count,
for (total_len = 0; total_len < count; total_len += read_len) {
__be32 data;

read_len = min_t(size_t, count, 4);
read_len -= off & 0x3;
read_len = min_t(size_t, 4 - (off & 0x3), count - total_len);

rc = fsi_slave_read(slave, off, &data, read_len);
if (rc)
Expand Down Expand Up @@ -711,8 +710,7 @@ static ssize_t cfam_write(struct file *filep, const char __user *buf,
for (total_len = 0; total_len < count; total_len += write_len) {
__be32 data;

write_len = min_t(size_t, count, 4);
write_len -= off & 0x3;
write_len = min_t(size_t, 4 - (off & 0x3), count - total_len);

rc = copy_from_user(&data, buf + total_len, write_len);
if (rc) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/fsi/fsi-master-ast-cf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static bool check_relative_address(struct fsi_master_acf *master, int id,

/* We know that the addresses are limited to 21 bits, so this won't
* overflow the signed rel_addr */
rel_addr = addr - last_addr;
rel_addr = (int32_t)addr - (int32_t)last_addr;
if (rel_addr > 255 || rel_addr < -256)
return false;

Expand Down