From patchwork Fri Jan 18 18:46:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1027688 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="HWwuC/io"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h9045nXDz9sCh for ; Sat, 19 Jan 2019 05:46:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729035AbfARSqn (ORCPT ); Fri, 18 Jan 2019 13:46:43 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:46031 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728728AbfARSqj (ORCPT ); Fri, 18 Jan 2019 13:46:39 -0500 Received: by mail-qk1-f196.google.com with SMTP id y78so8594381qka.12 for ; Fri, 18 Jan 2019 10:46:39 -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=HWwuC/io88DFIN71DkGXbne+9MK0jXgdJH15RAVuPELPeNo7oAUjByzdkStjPFzLAu ZTEi5k2llYV8daduQxFA7tkJqdkPRnLTOrxK1se3aE0O3kfpgVMpVRHU7PndfP0jIj9N NEUkxakdJbVjMatcSH+6RwdCcFqVuoN977HcfduXuG9ZQHGUvdXX8UuVdy+Jibdx+vpu pLWt+LYrTJhbq4cMq9Kq9R8v4uO/sH0tRACg7c7agmMiMJA3iY/j3Wkxecmj+s4YuYzm WhRLnU/CdWrjsGfkwQummnMvB5DLVsHkdiZuu/0Pp4nbM2+u6Aq855IqOC+rsvMsGJBH 2jhQ== 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=fdLI+gIAiOrzDdQ7h7itV5fEhSvlrP8D2nRwwGsecawGpvrVc1EKtKvmsAvyWMZAHk XrH+p0D042YSu3LWsgPL2lH7ev/v3B94+ykFJvOJo3NlpfeQg5Hr1/FzWFynT3dUb6gQ 4e8DtHlfLCxQUUMDSOJPOLnwXZo7TwZIEJykcmE8T0kRYSM4AJM4iDkXNov8fUY9DLwm OKl7p42vXaVT9aIhZkegSBJxdi0tsWajr+GaPfRMbpxaOM5PcEB+lUNwfRv1rjZGYmsy svQf5Q/rNBDXMVc9brkfBy4Z78Li5tYbEbdIcgPnS7oRffblumCs5/IMVd8Uj7VlOOo9 dUHQ== X-Gm-Message-State: AJcUukfZYf8LKW4/8mEirQZMWBqJ34robUxnKRcXdHm2wvDtJ2+1BCKf QgStlpIV7fWvGUAHLeBsDhJ88w== X-Google-Smtp-Source: ALg8bN4rEtheJdbhX1C1z6HQk9OPIjomMeumxTdrnmEtO4rfD41UeNwugo0PV2mpAyBdpp6L0QfVxQ== X-Received: by 2002:a37:7cc5:: with SMTP id x188mr15344806qkc.307.1547837199086; Fri, 18 Jan 2019 10:46:39 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id l4sm12467794qtf.22.2019.01.18.10.46.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 10:46:38 -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 v2 03/14] rtnetlink: stats: reject requests for unknown stats Date: Fri, 18 Jan 2019 10:46:15 -0800 Message-Id: <20190118184626.24021-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190118184626.24021-1-jakub.kicinski@netronome.com> References: <20190118184626.24021-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; }