From patchwork Mon Mar 16 23:02:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Mannem X-Patchwork-Id: 450797 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7645614008F for ; Tue, 17 Mar 2015 10:03:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=NSuvw7r/; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964836AbbCPXDc (ORCPT ); Mon, 16 Mar 2015 19:03:32 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34907 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964797AbbCPXD3 (ORCPT ); Mon, 16 Mar 2015 19:03:29 -0400 Received: by pabyw6 with SMTP id yw6so78244361pab.2 for ; Mon, 16 Mar 2015 16:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=eacdYk/istsaXejUKsy+E6S31Tcn4oiBZR98IsUSmSA=; b=NSuvw7r/xX3V8hsxejlHNiEt2EpZgBFRI/dmxoaDWHl9/vGtS5D+SReKLHz1RoYRHx MmLbQCevYqNy9OvOqvescbDIgoZP4w5XD3SID/9B/UDMKmkP0NpwXfJ4bem5XpL0ADNT WZLCQuIJmmsTZeKxa0cuGyvsyfWRSEDSTIWbP8pEOrfhs/5Q5ect3SKknDRfuO8ij56o VaymUUrWlM/eYL+geWhCcjIiETsl8KkLGwGb5Gb41j70agr1S3R1IBaMGbcrlEbnGwQc fGiXhUjtZEuqGiO0N5XbnXpG3blmdxhDraNsqWcsq30nzGsALp6V6AhZLdWoD6BhVQDM r22Q== X-Received: by 10.70.108.161 with SMTP id hl1mr34966093pdb.154.1426547008585; Mon, 16 Mar 2015 16:03:28 -0700 (PDT) Received: from localhost.localdomain ([49.205.60.65]) by mx.google.com with ESMTPSA id nw3sm18994274pdb.71.2015.03.16.16.03.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Mar 2015 16:03:27 -0700 (PDT) From: Siva Mannem To: netdev@vger.kernel.org Cc: davem@davemloft.net, sfeldma@gmail.com, Siva Mannem Subject: [PATCH net-next v4 3/3] Validate all netlink attributes and return error if any of the validation fails. Date: Tue, 17 Mar 2015 04:32:44 +0530 Message-Id: <5269ddae1a0a164a488703654c9bb6e24845c637.1426509272.git.siva.mannem.lnx@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch validates all netlink attributes and return error if any of the validation fails. Signed-off-by: Siva Mannem Suggested-by: David Miller --- net/bridge/br_netlink.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index d80e802..0b18c0d 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -740,12 +740,49 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], struct nlattr *data[]) { struct net_bridge *br = netdev_priv(brdev); - int err; + unsigned long forward_delay; + unsigned long hello_time; + unsigned long max_age; + unsigned long ageing_time; + u32 t; + int err = -ERANGE; if (!data) return 0; if (data[IFLA_BR_FORWARD_DELAY]) { + t = nla_get_u32(data[IFLA_BR_FORWARD_DELAY]); + forward_delay = clock_t_to_jiffies(t); + if (forward_delay < BR_MIN_FORWARD_DELAY || + forward_delay > BR_MAX_FORWARD_DELAY) + return err; + } + + if (data[IFLA_BR_HELLO_TIME]) { + t = nla_get_u32(data[IFLA_BR_HELLO_TIME]); + hello_time = clock_t_to_jiffies(t); + if (hello_time < BR_MIN_HELLO_TIME || + hello_time > BR_MAX_HELLO_TIME) + return err; + } + + if (data[IFLA_BR_MAX_AGE]) { + t = nla_get_u32(data[IFLA_BR_MAX_AGE]); + max_age = clock_t_to_jiffies(t); + if (max_age < BR_MIN_MAX_AGE || + max_age > BR_MAX_MAX_AGE) + return err; + } + + if (data[IFLA_BR_AGEING_TIME]) { + t = nla_get_u32(data[IFLA_BR_AGEING_TIME]); + ageing_time = clock_t_to_jiffies(t); + if (ageing_time < BR_MIN_AGEING_TIME || + ageing_time > BR_MAX_AGEING_TIME) + return err; + } + + if (data[IFLA_BR_FORWARD_DELAY]) { err = br_set_forward_delay(br, nla_get_u32(data[IFLA_BR_FORWARD_DELAY])); if (err) return err;