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;