From patchwork Wed Apr 18 21:35:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 900399 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="aWV5M1ru"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40RFmW68T3z9s27 for ; Thu, 19 Apr 2018 07:36:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786AbeDRVgI (ORCPT ); Wed, 18 Apr 2018 17:36:08 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:54005 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbeDRVgG (ORCPT ); Wed, 18 Apr 2018 17:36:06 -0400 Received: by mail-it0-f65.google.com with SMTP id m134-v6so4512490itb.3 for ; Wed, 18 Apr 2018 14:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WljdbKdCRUNZHQ+wo3kqdLe/R5jsC6uL14jiUIzhH1Q=; b=aWV5M1ruNZ8wvFO2qKG6fx2zqhgbMCJc9jgJuGCD0ttfJX+RmDhMSVm3b9/q2sPu+g E7QLiOtxeFwU390DCY6wkSbDvI8VgmwGbe4HY2y7rYPyD3HMgVpYl6bo2TViqID1iVma UP2UYTyQrjPWf4Ueb9Kn1fkW75NfMlB2Wuz2jeNXvgv3MlbLRclhEWRSv1+3H35Es77K vkqqZwAQYsNNf61IHyz/Jyq7okdbwIwi4nO9aChckDNyBk1zLveDbCjPxKxnuSCrEt6Z 9C45MYGhYU9QaUHYFs3e87cAWCQE4fVJsxvV245mF0I++VWf/QGquElMhzdmgKVJ6S74 Oxlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WljdbKdCRUNZHQ+wo3kqdLe/R5jsC6uL14jiUIzhH1Q=; b=AcxzeKGCVYBF2seykUOhrLc5SL9PMZ8KI6Wt7xkraPW7k7W8W52dQJk07YOocU86LJ PJ/ftyo4+UVORTYP7gbM2PYzly2KaYfoxh6UkWZC7DxZL4VXtIJ1i/MZ3SmLhpNrr/Pf +uDGN/cFGzBBe/grY718yo9Bbxk+wAIzpIkhMX5fZSwricq5XNDG/oDv8lzRF9EEMtHR yngezlb2/ulm6ycjj1WiGZW5Ql1viQB/MfRHzXqBrRP+Le5z5mXz+29l+VZWj87R9Wtc 1xew6UlB7R5uXKyJHLXkn20Sh/fmqTwenV9Zv8MiaBvjfZhRJyItIuQAHo0zGLkAD1R3 DKYQ== X-Gm-Message-State: ALQs6tCu5OD6gvP8KJYfbvUNI80XqbFOJkgmyT2MsBDWsdi+yZFBaitu ybfwARIo0A79H9XkUYwd4ozXkg== X-Google-Smtp-Source: AIpwx4+rQGZwSuiF/K0aPTPTt28YIacvM13m12Q8OjNVbb6jv9hxfeEgH1imfbcPV3KeN/yFrxDY8Q== X-Received: by 2002:a24:3d01:: with SMTP id n1-v6mr4093611itn.134.1524087366014; Wed, 18 Apr 2018 14:36:06 -0700 (PDT) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id m71-v6sm1350521itc.5.2018.04.18.14.36.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 14:36:05 -0700 (PDT) From: Alexander Aring To: yotam.gi@gmail.com Cc: jhs@mojatatu.com, davem@davemloft.net, xiyou.wangcong@gmail.com, jiri@resnulli.us, yuvalm@mellanox.com, netdev@vger.kernel.org, kernel@mojatatu.com, Alexander Aring Subject: [PATCH net 1/3] net: sched: ife: signal not finding metaid Date: Wed, 18 Apr 2018 17:35:32 -0400 Message-Id: <20180418213534.6215-2-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180418213534.6215-1-aring@mojatatu.com> References: <20180418213534.6215-1-aring@mojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to record stats for received metadata that we dont know how to process. Have find_decode_metaid() return -ENOENT to capture this. Signed-off-by: Alexander Aring Reviewed-by: Yotam Gigi Acked-by: Jamal Hadi Salim --- net/sched/act_ife.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index a5994cf0512b..49b8ab551fbe 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -652,7 +652,7 @@ static int find_decode_metaid(struct sk_buff *skb, struct tcf_ife_info *ife, } } - return 0; + return -ENOENT; } static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a, From patchwork Wed Apr 18 21:35:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 900401 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="Y0FiT4os"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40RFmh3rkhz9s1X for ; Thu, 19 Apr 2018 07:36:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752739AbeDRVgT (ORCPT ); Wed, 18 Apr 2018 17:36:19 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:34185 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750981AbeDRVgH (ORCPT ); Wed, 18 Apr 2018 17:36:07 -0400 Received: by mail-it0-f67.google.com with SMTP id t192-v6so18778924itc.1 for ; Wed, 18 Apr 2018 14:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4IPbmjdPZwuXYP/UsIGbzZn8kBaJIa+0M+3VLpAkiVI=; b=Y0FiT4oskgvm9BhZnM/ZlMnb4t6L7f2kegA0ki00IaA/52KRuX7uF2NSerrwmMvH1w UgwSqgxAMKaJ3lmSwsX7DsLz7LOYnI4MxMSufQcNolxUQSfdBuIniqOZXk4hsY7Oe/HQ y9er/UKkrWJSmNhY21ZXISzkUTYv0yM2j81yhCe+rSjaZf20dawW3ZWU46obrZ71G8DA IsB0LiLmEOiUE7NGbQ73cncqLryvlnWP5qIptqNDUW3XxvD9nNZKBwXdeXb3BowaKmFJ B0ijLvmvaYiuupyjf61qFAk2a6CYmV6DK/MIXEu6nxa1HfVl6nu/RfwWHTg9lDS0ytPx tnTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4IPbmjdPZwuXYP/UsIGbzZn8kBaJIa+0M+3VLpAkiVI=; b=ijCCuFF2xANuTBy5cp9IOCpa1C9vD1JUtm3TmQNW1pguwE3I1nvnidVzEl/51hLgrp 5hZmrH2Ig3CSNkOECOOeWPl95MvBmut7ZqBb7ZtmDnC6tnf2UiTS1Rh40KdZjG9JqImT lk7e8YSNY+XJUf0QBouvYK2A5OmyFPW5tjl1ZMoJI62hlwu8+YRCfVFqvhqy3XhoCn+2 uaKTZ1d256551hPpyVRKDuZCxzHL9q9FCYMFd+bF82N3Dd7XZg1ITACCOXR+iglUeCXC syk1A0bwwmMdaOTAVSdTZRF4TJI6d5jyvcNU9TqLeh4kH10bOzx1eUUq9JKAjc5Og4US bZTg== X-Gm-Message-State: ALQs6tDBVZ95M0mM/F457V4zwfuIlivmJpUdXZd4F0SILFMZCUc6HCCp jfFWuXQEkDr3cI5XCkRhlt2CUw== X-Google-Smtp-Source: AB8JxZoxx1k71pzdBhl+E/o3QbwyHAEcwGN932XIpXIrhMhWho271Xl/27/Cpuv+r50kJsk9V3cNbQ== X-Received: by 2002:a24:5903:: with SMTP id p3-v6mr3808318itb.97.1524087367217; Wed, 18 Apr 2018 14:36:07 -0700 (PDT) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id m71-v6sm1350521itc.5.2018.04.18.14.36.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 14:36:06 -0700 (PDT) From: Alexander Aring To: yotam.gi@gmail.com Cc: jhs@mojatatu.com, davem@davemloft.net, xiyou.wangcong@gmail.com, jiri@resnulli.us, yuvalm@mellanox.com, netdev@vger.kernel.org, kernel@mojatatu.com, Alexander Aring Subject: [PATCH net 2/3] net: sched: ife: handle malformed tlv length Date: Wed, 18 Apr 2018 17:35:33 -0400 Message-Id: <20180418213534.6215-3-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180418213534.6215-1-aring@mojatatu.com> References: <20180418213534.6215-1-aring@mojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is currently no handling to check on a invalid tlv length. This patch adds such handling to avoid killing the kernel with a malformed ife packet. Signed-off-by: Alexander Aring Reviewed-by: Yotam Gigi Acked-by: Jamal Hadi Salim --- include/net/ife.h | 3 ++- net/ife/ife.c | 35 +++++++++++++++++++++++++++++++++-- net/sched/act_ife.c | 7 ++++++- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/include/net/ife.h b/include/net/ife.h index 44b9c00f7223..e117617e3c34 100644 --- a/include/net/ife.h +++ b/include/net/ife.h @@ -12,7 +12,8 @@ void *ife_encode(struct sk_buff *skb, u16 metalen); void *ife_decode(struct sk_buff *skb, u16 *metalen); -void *ife_tlv_meta_decode(void *skbdata, u16 *attrtype, u16 *dlen, u16 *totlen); +void *ife_tlv_meta_decode(void *skbdata, const void *ifehdr_end, u16 *attrtype, + u16 *dlen, u16 *totlen); int ife_tlv_meta_encode(void *skbdata, u16 attrtype, u16 dlen, const void *dval); diff --git a/net/ife/ife.c b/net/ife/ife.c index 7d1ec76e7f43..8632d2685efb 100644 --- a/net/ife/ife.c +++ b/net/ife/ife.c @@ -92,12 +92,43 @@ struct meta_tlvhdr { __be16 len; }; +static inline bool __ife_tlv_meta_valid(const unsigned char *skbdata, + const unsigned char *ifehdr_end) +{ + const struct meta_tlvhdr *tlv; + u16 tlvlen; + + if (unlikely(skbdata + sizeof(*tlv) > ifehdr_end)) + return false; + + tlv = (struct meta_tlvhdr *)skbdata; + tlvlen = ntohs(tlv->len); + + /* tlv length field is inc header, check on minimum */ + if (tlvlen < NLA_HDRLEN) + return false; + + /* overflow by NLA_ALIGN check */ + if (NLA_ALIGN(tlvlen) < tlvlen) + return false; + + if (unlikely(skbdata + NLA_ALIGN(tlvlen) > ifehdr_end)) + return false; + + return true; +} + /* Caller takes care of presenting data in network order */ -void *ife_tlv_meta_decode(void *skbdata, u16 *attrtype, u16 *dlen, u16 *totlen) +void *ife_tlv_meta_decode(void *skbdata, const void *ifehdr_end, u16 *attrtype, + u16 *dlen, u16 *totlen) { - struct meta_tlvhdr *tlv = (struct meta_tlvhdr *) skbdata; + struct meta_tlvhdr *tlv; + + if (!__ife_tlv_meta_valid(skbdata, ifehdr_end)) + return NULL; + tlv = (struct meta_tlvhdr *)skbdata; *dlen = ntohs(tlv->len) - NLA_HDRLEN; *attrtype = ntohs(tlv->type); diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index 49b8ab551fbe..8527cfdc446d 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -682,7 +682,12 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a, u16 mtype; u16 dlen; - curr_data = ife_tlv_meta_decode(tlv_data, &mtype, &dlen, NULL); + curr_data = ife_tlv_meta_decode(tlv_data, ifehdr_end, &mtype, + &dlen, NULL); + if (!curr_data) { + qstats_drop_inc(this_cpu_ptr(ife->common.cpu_qstats)); + return TC_ACT_SHOT; + } if (find_decode_metaid(skb, ife, mtype, dlen, curr_data)) { /* abuse overlimits to count when we receive metadata From patchwork Wed Apr 18 21:35:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 900400 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="t9zCcIOw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40RFmZ3hXnz9s1X for ; Thu, 19 Apr 2018 07:36:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752804AbeDRVgL (ORCPT ); Wed, 18 Apr 2018 17:36:11 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:54377 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbeDRVgI (ORCPT ); Wed, 18 Apr 2018 17:36:08 -0400 Received: by mail-it0-f66.google.com with SMTP id h143-v6so4499028ita.4 for ; Wed, 18 Apr 2018 14:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FvInaR7yVG4B3vd7q3+fc5ZF2wZ2pv5ih7hqhAOh3OQ=; b=t9zCcIOwiQBuqZYpKaV1kN3ZfQU2dz8BFtha/YEXWJSv2hVXnccQ90hbSvhhlFcl7Y 9nZ3wDYHkYlTdPDfptqsDx2UHP6mgASWAkAmq7jORwtd/GleT9SYh92r55uYZUYuD9pj CXGIoO/EL/eXnyk41LwvScXoB3lLJab2KJp7bpnJUSdoIVQSOFWNu9i46anYrS/Uk1eR m/AhWR6QMXxN2XsBwteOwjkFQ0k9GlFTAhKydx9cfQmHIW78Y6Q5T6GpdLhPrDdvvrkt fa8F1gJJG5o5x3XauSOhsuRYJLE2Ij7UYEwoDAZ744h8gzF0d+hPx3/jQUk/iz9X+snD G1og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FvInaR7yVG4B3vd7q3+fc5ZF2wZ2pv5ih7hqhAOh3OQ=; b=kCiYW2m05hnTd3RktHhfTso9zZfVycwLJL236QBy51KT+psLBbrnSOAbY2/ZNSRbXu UcAFr0jAEX8et6jQHatS2pZHJFaM/pjGJrxXz37hFjjvOw8e2vEPWejWp61Y6xmRkd4o c4BWV+vC2Xf45h9IAhha9uwdZ3ZfQDQaKKvM3XDPYsThpbEZ/nl22HwfzwwI+kOrkOIi w2d+eorR/0PiLESswU6uD1D56ms1XGvNM93XBpzvCu978blg/FVNq8u5f09t2bI84tZK GXXj0sDipC4XJ9fea8oG1b1b6lasHvVJsH0MZOmBpWzm0eCHIE3/DBTsNqB1sfPh/FZC NhVg== X-Gm-Message-State: ALQs6tAjF0RUWNaqaR9kOTG+nRvM7FBomuW81/zPSlnbontYfC1V7BzZ 0YR00kzQv+KE/yC8n2xKnevZtQ== X-Google-Smtp-Source: AIpwx49TVMjrTJ8liXBlpzOnJYXrcMvYc1L76VU2Vvk7b7ClMyGopqjCl4G8fxd3tdOXd50eQeZTiA== X-Received: by 2002:a24:a0cc:: with SMTP id o195-v6mr3983326ite.115.1524087368373; Wed, 18 Apr 2018 14:36:08 -0700 (PDT) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id m71-v6sm1350521itc.5.2018.04.18.14.36.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 14:36:07 -0700 (PDT) From: Alexander Aring To: yotam.gi@gmail.com Cc: jhs@mojatatu.com, davem@davemloft.net, xiyou.wangcong@gmail.com, jiri@resnulli.us, yuvalm@mellanox.com, netdev@vger.kernel.org, kernel@mojatatu.com, Alexander Aring Subject: [PATCH net 3/3] net: sched: ife: check on metadata length Date: Wed, 18 Apr 2018 17:35:34 -0400 Message-Id: <20180418213534.6215-4-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180418213534.6215-1-aring@mojatatu.com> References: <20180418213534.6215-1-aring@mojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch checks if sk buffer is available to dererence ife header. If not then NULL will returned to signal an malformed ife packet. This avoids to crashing the kernel from outside. Signed-off-by: Alexander Aring Reviewed-by: Yotam Gigi Acked-by: Jamal Hadi Salim --- net/ife/ife.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ife/ife.c b/net/ife/ife.c index 8632d2685efb..7c100034fbee 100644 --- a/net/ife/ife.c +++ b/net/ife/ife.c @@ -70,6 +70,9 @@ void *ife_decode(struct sk_buff *skb, u16 *metalen) u16 ifehdrln; ifehdr = (struct ifeheadr *) (skb->data + skb->dev->hard_header_len); + if (skb->len < skb->dev->hard_header_len + IFE_METAHDRLEN) + return NULL; + ifehdrln = ntohs(ifehdr->metalen); total_pull = skb->dev->hard_header_len + ifehdrln;