From patchwork Thu Apr 19 22:14:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 901542 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="ogz70xat"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40RtbF6bpwz9s1t for ; Fri, 20 Apr 2018 08:15:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753783AbeDSWPU (ORCPT ); Thu, 19 Apr 2018 18:15:20 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:42989 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753527AbeDSWPP (ORCPT ); Thu, 19 Apr 2018 18:15:15 -0400 Received: by mail-io0-f196.google.com with SMTP id l2-v6so6946515iog.9 for ; Thu, 19 Apr 2018 15:15:14 -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=LyOj+km60RHiTzfLcIMQsBpbhuacM3tgN3gT9JduhY0=; b=ogz70xatdQZobwqsw2/eyHoFWEx6qKt5uK1hxveoaKOoAHnPG6aU0KuQr8OL8V+g9B K0ZSxvOUEtLSEeuzt6u3wECY0ZQ4XpNknoPRv5kejjPDb+1Ad+5Pt0FUsOslKDhEaUBM VyMuCVKRgXg0JraQgadUZ/pCM22QvaLIFQsQ++5iGqpE+prrTos4MMu/5yvaCAzqAaUw aG2fxU2e+vcWPOz8K3tYuheppG59VUwZ70PJLQQDLlfpK84y4C6LupDh1XtwWJzrg8ad gHCzkFvJb4RphxWhcIhPPpWgWUZrss/LSm8e5Kcn22mPlZ2Mu4NWJM5iJ8P/DiV5ybC6 wcxg== 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=LyOj+km60RHiTzfLcIMQsBpbhuacM3tgN3gT9JduhY0=; b=WBcACEHkI8qglLZ8S3D7TeBZ+4mRSrL9ZCAJP3dgfEgm2lBU8WAK1jFGQieE/0B7C+ 395zmTCs/oTT46i2eVIMrs3qfRwBLlDaF7ytBWJxItp2P6/pznWtMiKaCtIvqEQdHLgs 30uDhs5fWYD7YwKigtkvtbHZMSt6rx7XlSTH802CefSCuC/IbdtW6Dhwa/2y/nFIwsAr Q3OVfDnQzWB3dz3v/Q5FW2IxPCfnqJNk3DB0Fg4DN2h2F4K/bbROM9xfln24KBfGtTzc EuYkGEjNBEJtCFylxnW4cWwe/+0RQU6vONYJIMOFd0rlDSbZV/rJy52HqBXynz1CKdD/ WAtA== X-Gm-Message-State: ALQs6tBPwSkGMK8OmVnUx7RQveIr7fz0wRcAXeJBNX6A3vuCbgY/+EWS PhoFpE6HvVGNtjIFVUBE4Xe+DQ== X-Google-Smtp-Source: AB8JxZrs2/PwfAX7NldocU7ktD+dbUzQw6oJlCIFh+4xSq6/C6N4ePMYNZHqjTILbefuStIHaVEpXQ== X-Received: by 2002:a6b:e80f:: with SMTP id f15-v6mr5790963ioh.146.1524176114170; Thu, 19 Apr 2018 15:15:14 -0700 (PDT) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id z5-v6sm2287198ioe.58.2018.04.19.15.15.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 15:15:13 -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: [PATCHv3 net 3/3] net: sched: ife: check on metadata length Date: Thu, 19 Apr 2018 18:14:45 -0400 Message-Id: <20180419221445.26205-4-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180419221445.26205-1-aring@mojatatu.com> References: <20180419221445.26205-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 7fbe70a0af4b..570a18d4ca32 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 (!pskb_may_pull(skb, skb->dev->hard_header_len + IFE_METAHDRLEN)) + return NULL; + ifehdrln = ntohs(ifehdr->metalen); total_pull = skb->dev->hard_header_len + ifehdrln;