fixup! add XDPLua

VictorNogueiraRio · VictorNogueiraRio · commit 809562b0f318 · 2020-08-27T13:22:45.000-03:00
diff --git a/net/core/filter.c b/net/core/filter.c
@@ -4854,15 +4854,16 @@ BPF_CALL_4(bpf_lua_pcall, struct xdp_buff *, ctx, char *, funcname,
 		goto clean_state;
 	}
 
-	lua_insert(ctx->L, 1);
+	lua_insert(ctx->L, base + 1);
 	if (lua_pcall(ctx->L, num_args, num_rets, 0)) {
 		pr_err("%s\n", lua_tostring(ctx->L, -1));
 		num_rets = 0;
 		goto clean_state;
 	}
 
-clean_state:
 	base += num_rets;
+
+clean_state:
 	lua_settop(ctx->L, base);
 	return num_rets;
 }

Original file line number	Diff line number	Diff line change
`@@ -4854,15 +4854,16 @@ BPF_CALL_4(bpf_lua_pcall, struct xdp_buff , ctx, char , funcname,`
`4854`	`4854`	`goto clean_state;`
`4855`	`4855`	`}`
`4856`	`4856`
`4857`		`- lua_insert(ctx->L, 1);`
	`4857`	`+ lua_insert(ctx->L, base + 1);`
`4858`	`4858`	`if (lua_pcall(ctx->L, num_args, num_rets, 0)) {`
`4859`	`4859`	`pr_err("%s\n", lua_tostring(ctx->L, -1));`
`4860`	`4860`	`num_rets = 0;`
`4861`	`4861`	`goto clean_state;`
`4862`	`4862`	`}`
`4863`	`4863`
`4864`		`-clean_state:`
`4865`	`4864`	`base += num_rets;`
	`4865`	`+`
	`4866`	`+clean_state:`
`4866`	`4867`	`lua_settop(ctx->L, base);`
`4867`	`4868`	`return num_rets;`
`4868`	`4869`	`}`