From: Stanislav Fomichev Subject: [PATCH bpf-next v2 4/5] net/flow_dissector: correctly cap nhoff and thoff in case of BPF Date: Mon, 3 Dec 2018 20:00:59 -0800 Message-ID: <20181204040100.243614-5-sdf@google.com> References: <20181204040100.243614-1-sdf@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, simon.horman@netronome.com, liu.song.a23@gmail.com, Stanislav Fomichev To: netdev@vger.kernel.org Return-path: Received: from mail-pf1-f202.google.com ([209.85.210.202]:38502 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725971AbeLDEBO (ORCPT ); Mon, 3 Dec 2018 23:01:14 -0500 Received: by mail-pf1-f202.google.com with SMTP id f69so13016231pff.5 for ; Mon, 03 Dec 2018 20:01:13 -0800 (PST) In-Reply-To: <20181204040100.243614-1-sdf@google.com> Sender: netdev-owner@vger.kernel.org List-ID: We want to make sure that the following condition holds: 0 <= nhoff <= thoff <= skb->len BPF program can set out-of-bounds nhoff and thoff, which is dangerous, see recent commit d0c081b49137 ("flow_dissector: properly cap thoff field")'. Signed-off-by: Stanislav Fomichev --- net/core/flow_dissector.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index ac19da6f390b..bb1a54747d64 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -716,6 +716,10 @@ bool __skb_flow_bpf_dissect(struct bpf_prog *prog, /* Restore state */ memcpy(cb, &cb_saved, sizeof(cb_saved)); + flow_keys->nhoff = clamp_t(u16, flow_keys->nhoff, 0, skb->len); + flow_keys->thoff = clamp_t(u16, flow_keys->thoff, + flow_keys->nhoff, skb->len); + return result == BPF_OK; } @@ -808,8 +812,6 @@ bool __skb_flow_dissect(const struct sk_buff *skb, &flow_keys); __skb_flow_bpf_to_target(&flow_keys, flow_dissector, target_container); - key_control->thoff = min_t(u16, key_control->thoff, - skb->len); rcu_read_unlock(); return ret; } -- 2.20.0.rc1.387.gf8505762e3-goog