From patchwork Thu Jan 17 22:52:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1027025 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=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="BY4uT27j"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43gfVz69VFz9sBZ for ; Fri, 18 Jan 2019 09:53:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726761AbfAQWxP (ORCPT ); Thu, 17 Jan 2019 17:53:15 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37017 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726007AbfAQWxM (ORCPT ); Thu, 17 Jan 2019 17:53:12 -0500 Received: by mail-pf1-f195.google.com with SMTP id y126so5548970pfb.4 for ; Thu, 17 Jan 2019 14:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RNtO4jzUtVsH4aPn3Rmjn5/DA73iGKJpGhe1zllUuCc=; b=BY4uT27jjagX/tAJsxQBI/g1RRNosbVKS1HFRw4ov42P6qZk5jLHarDizC1NjGZdlg 8Jn8Dr6cXMmqykuQ3xaMRYqOT+szDTzBHo+oDC9N6R4TsjgV+AiSxmtyWjkGYAmFDFke UNkZTjJ9pGgPf58TgTS7DCeVjx28+QOGYbeClERIJMFqdjj5foQN6qBpruiIFlv2PpJf OQyFRYh+WlyyLJcAwujdf9FX75nlxaHW1EXS9ewtMJIQx/yPcAiToiehB1iRHPE/1K9K qdJP2kpJxYCpA/9f8kTtlOQkOouvXo0xzMplEPZppBzgscw5pdXCYMHK/jbK5p04soWY LZxg== 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:mime-version:content-transfer-encoding; bh=RNtO4jzUtVsH4aPn3Rmjn5/DA73iGKJpGhe1zllUuCc=; b=aIJSxOu4aCvy2PN5exwvi75JrY9qfw/gPVv6kt6i4xywvSZJeOyaDIEwvhs7ah02IL tNuk8GSVuLvcB+yy5cNOvr7z1I7Ydofkm1txvSmITak426E/fbR81wTRx5HgalVfXnJP SQ90fb1NsCyZsC/CDmM1ues3eYRYNgz/8idhB8W+lpcNLaMPfhscJa0x66SZTV6VttQi F2xYrDcoxJfHRQVi77TsObVHZA+89s0td8WXq50gaYDkUAjk3r5OGqLJNXbrd2YMDdRK fb31qW554ksQ+Nt0jAQgtrMgKPbvu2JuIpxA73xr12aOyXfQM6DvbBeiiEWmuAZkTJAl RF9w== X-Gm-Message-State: AJcUukdzebpPHo9ZHlSp3XqzRS9x/7sbmuc2zwYqe/DnCvPEV36O6JSx SqGr5Fi9GV795J+tijwE49oZsA== X-Google-Smtp-Source: ALg8bN4I+zeBj0ODpldEnOf0g8uhZOpz7UWZTMz9zx9/ER6GBVV3ItszJKAsuC/4ptaJdpX7oVBjEg== X-Received: by 2002:a63:981:: with SMTP id 123mr15336030pgj.444.1547765590755; Thu, 17 Jan 2019 14:53:10 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id j9sm3436324pfi.86.2019.01.17.14.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 14:53:10 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, dsahern@gmail.com Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 03/13] rtnetlink: stats: reject requests for unknown stats Date: Thu, 17 Jan 2019 14:52:50 -0800 Message-Id: <20190117225300.8006-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190117225300.8006-1-jakub.kicinski@netronome.com> References: <20190117225300.8006-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the spirit of strict checks reject requests of stats the kernel does not support when NETLINK_F_STRICT_CHK is set. Signed-off-by: Jakub Kicinski --- net/core/rtnetlink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 08f142b59403..3c134b928071 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -4927,6 +4927,10 @@ static int rtnl_valid_stats_req(const struct nlmsghdr *nlh, bool strict_check, NL_SET_ERR_MSG(extack, "Invalid attributes after stats header"); return -EINVAL; } + if (ifsm->filter_mask >= IFLA_STATS_FILTER_BIT(IFLA_STATS_MAX + 1)) { + NL_SET_ERR_MSG(extack, "Invalid stats requested through filter mask"); + return -EINVAL; + } return 0; }