lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 13 Dec 2016 01:12:40 +0100 (CET) From: Michał Mirosław <mirq-linux@...e.qmqm.pl> To: netdev@...r.kernel.org Cc: "David S. Miller" <davem@...emloft.net> (maintainer:NETWORKING [GENERAL],commit_signer:74/77=96%), Alexei Starovoitov <ast@...com> (commit_signer:67/77=87%), Daniel Borkmann <daniel@...earbox.net> (commit_signer:65/77=84% ,authored:57/77=74%,added_lines:1224/1906=64%,removed_lines:409/493=83%), Thomas Graf <tgraf@...g.ch> (added_lines:173/1906=9%), Martin KaFai Lau <kafai@...com> (added_lines:124/1906=7%), Craig Gallek <kraig@...gle.com> (added_lines:100/1906=5%), netdev@...r.kernel.org (open list:NETWORKING [GENERAL]), linux-kernel@...r.kernel.org (open list) Subject: [PATCH net-next 23/27] net/bpf: split VLAN_PRESENT bit handling from VLAN_TCI Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl> --- net/core/filter.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index b146170..c3321f1 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -188,22 +188,20 @@ static u32 convert_skb_access(int skb_field, int dst_reg, int src_reg, break; case SKF_AD_VLAN_TAG: - case SKF_AD_VLAN_TAG_PRESENT: BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2); - BUILD_BUG_ON(VLAN_TAG_PRESENT != 0x1000); /* dst_reg = *(u16 *) (src_reg + offsetof(vlan_tci)) */ *insn++ = BPF_LDX_MEM(BPF_H, dst_reg, src_reg, offsetof(struct sk_buff, vlan_tci)); - if (skb_field == SKF_AD_VLAN_TAG) { - *insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, - ~VLAN_TAG_PRESENT); - } else { - /* dst_reg >>= 12 */ - *insn++ = BPF_ALU32_IMM(BPF_RSH, dst_reg, 12); - /* dst_reg &= 1 */ - *insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, 1); - } +#ifdef VLAN_TAG_PRESENT + *insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, ~VLAN_TAG_PRESENT); +#endif + break; + case SKF_AD_VLAN_TAG_PRESENT: + *insn++ = BPF_LDX_MEM(BPF_B, dst_reg, src_reg, PKT_VLAN_PRESENT_OFFSET()); + if (PKT_VLAN_PRESENT_BIT) + *insn++ = BPF_ALU32_IMM(BPF_RSH, dst_reg, PKT_VLAN_PRESENT_BIT); + *insn++ = BPF_ALU32_IMM(BPF_AND, dst_reg, 1); break; } -- 2.10.2
Powered by blists - more mailing lists