History

bpf: Fix swapped arguments in calls to check_buffer_access

There are a couple of arguments of the boolean flag zero_size_allowed and the char pointer buf_info when calling to function check_buffer_access that are swapped by mistake. Fix these by swapping them to correct the argument ordering.

Colin Ian King committed 6 years ago

Commit f6dfbe31 parent 363885d1 file · +4 −4Browse files

Showing the changes to kernel (1 of 1 file). Show all

Unified · Split

kernel/bpf/verifier.c+4−4
@@ -3477,14 +3477,14 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn · 3476 unmodified lines
3477 regno, reg_type_str[reg->type]);3477 regno, reg_type_str[reg->type]);
3478 return -EACCES;3478 return -EACCES;
3479 }3479 }
3480 err = check_buffer_access(env, reg, regno, off, size, "rdonly",3480 err = check_buffer_access(env, reg, regno, off, size, false,
3481 false,3481 "rdonly",
3482 &env->prog->aux->max_rdonly_access);3482 &env->prog->aux->max_rdonly_access);
3483 if (!err && value_regno >= 0)3483 if (!err && value_regno >= 0)
3484 mark_reg_unknown(env, regs, value_regno);3484 mark_reg_unknown(env, regs, value_regno);
3485 } else if (reg->type == PTR_TO_RDWR_BUF) {3485 } else if (reg->type == PTR_TO_RDWR_BUF) {
3486 err = check_buffer_access(env, reg, regno, off, size, "rdwr",3486 err = check_buffer_access(env, reg, regno, off, size, false,
3487 false,3487 "rdwr",
3488 &env->prog->aux->max_rdwr_access);3488 &env->prog->aux->max_rdwr_access);
3489 if (!err && t == BPF_READ && value_regno >= 0)3489 if (!err && t == BPF_READ && value_regno >= 0)
3490 mark_reg_unknown(env, regs, value_regno);3490 mark_reg_unknown(env, regs, value_regno);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t