History

Merge remote-tracking branch 'djwong/ocfs2-vfs-reflink-6' into for-linus

Al Viro committed 9 years ago

Commit 3c55d6b2 parents 4da00fd 29ac8e8208 files · +2175 −903Browse files

Showing the changes to kernel (2 of 208 files). Show all

Unified · Split

2 files
  1. kernel/bpf/verifier.c +8 −2
  2. kernel/module.c +3 −2
kernel/bpf/verifier.c+8−2
@@ -2454,6 +2454,7 @@ static bool states_equal(struct bpf_verifier_env *env, · 2453 unmodified lines
24542454 struct bpf_verifier_state *old,
24552455 struct bpf_verifier_state *cur)
24562456 {
2457+ bool varlen_map_access = env->varlen_map_value_access;
24572458 struct bpf_reg_state *rold, *rcur;
24582459 int i;
24592460
@@ -2467,12 +2468,17 @@ static bool states_equal(struct bpf_verifier_env *env, · 7 unmodified lines
24672468 /* If the ranges were not the same, but everything else was and
24682469 * we didn't do a variable access into a map then we are a-ok.
24692470 */
2470− if (!env->varlen_map_value_access &&
2471+ if (!varlen_map_access &&
24712472 rold->type == rcur->type && rold->imm == rcur->imm)
24722473 continue;
24732474
2475+ /* If we didn't map access then again we don't care about the
2476+ * mismatched range values and it's ok if our old type was
2477+ * UNKNOWN and we didn't go to a NOT_INIT'ed reg.
2478+ */
24742479 if (rold->type == NOT_INIT ||
2475− (rold->type == UNKNOWN_VALUE && rcur->type != NOT_INIT))
2480+ (!varlen_map_access && rold->type == UNKNOWN_VALUE &&
2481+ rcur->type != NOT_INIT))
24762482 continue;
24772483
24782484 if (rold->type == PTR_TO_PACKET && rcur->type == PTR_TO_PACKET &&
kernel/module.c+3−2
@@ -1301,8 +1301,9 @@ static int check_version(Elf_Shdr *sechdrs, · 1300 unmodified lines
13011301 goto bad_version;
13021302 }
13031303
1304− pr_warn("%s: no symbol version for %s\n", mod->name, symname);
1305− return 0;
1304+ /* Broken toolchain. Warn once, then let it go.. */
1305+ pr_warn_once("%s: no symbol version for %s\n", mod->name, symname);
1306+ return 1;
13061307
13071308 bad_version:
13081309 pr_warn("%s: disagrees about version of symbol %s\n",

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