From patchwork Mon Mar 25 17:22:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hong zhi guo X-Patchwork-Id: 230762 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 9923E2C008D for ; Tue, 26 Mar 2013 04:22:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758787Ab3CYRWo (ORCPT ); Mon, 25 Mar 2013 13:22:44 -0400 Received: from mail-da0-f48.google.com ([209.85.210.48]:62594 "EHLO mail-da0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758012Ab3CYRWm (ORCPT ); Mon, 25 Mar 2013 13:22:42 -0400 Received: by mail-da0-f48.google.com with SMTP id p8so3273498dan.21 for ; Mon, 25 Mar 2013 10:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=xO3ynZIsOSnq6mCYPWc7EjO+7/a1x5HqY6fBMJXxdy8=; b=Q8IuJ/SbJx2/Gq1kRNFH8E3SLgQ11CbT1Uq+3sMw3/h6jNG6MNkNRJj1z++qwxUeUd nMH++bG91hA6Syxh19ZP0G3UidUEsfjEN3LLEpOnH+uSkA5WWlo3PKgYdKDfBYeLUwvO /hIuJDKsJZfGaJmhTvy5zgJ1wQVyFWtwz3G0t7pHDyR2U3g69GTx2OLVdA1VH6iPyLnc Mv76O1ypnHrm9G5YrthhO4GFkygRSNhMolz/WbNIxxw8ts0rkyfnX6SXNM3EIjtw7Wbh kiVykzbgjWFR2Mlv0xzTbODtC2flra9yzmnXiVDZaleTxEJW923S/ce/NQFG8aPChFlX A7Lw== X-Received: by 10.68.247.72 with SMTP id yc8mr15752370pbc.23.1364232161546; Mon, 25 Mar 2013 10:22:41 -0700 (PDT) Received: from suse.kiko.com ([111.161.70.12]) by mx.google.com with ESMTPS id ab1sm14106143pbd.37.2013.03.25.10.22.38 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Mar 2013 10:22:40 -0700 (PDT) From: Hong Zhiguo To: netdev@vger.kernel.org Cc: davem@davemloft.net, stephen@networkplumber.org, tgraf@suug.ch, Hong Zhiguo Subject: [PATCH net-next] netlink: add missing length check of rtnl msg Date: Tue, 26 Mar 2013 01:22:23 +0800 Message-Id: <1364232143-16754-1-git-send-email-honkiko@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the legacy array rtm_min still exists, the length check within these functions is covered by rtm_min[RTM_NEWTFILTER], rtm_min[RTM_NEWQDISC] and rtm_min[RTM_NEWTCLASS]. But after Thomas Graf removed rtm_min several days ago, these checks are missing. Other doit functions should be OK. Signed-off-by: Hong Zhiguo --- net/sched/cls_api.c | 4 ++++ net/sched/sch_api.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 9a04b98..01bfa9c 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -141,6 +141,10 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) if ((n->nlmsg_type != RTM_GETTFILTER) && !capable(CAP_NET_ADMIN)) return -EPERM; + + if (nlmsg_len(n) < sizeof(*t)) + return -EINVAL; + replay: t = nlmsg_data(n); protocol = TC_H_MIN(t->tcm_info); diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 0bbce22..b30a988 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -977,7 +977,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n) struct tcmsg *tcm = nlmsg_data(n); struct nlattr *tca[TCA_MAX + 1]; struct net_device *dev; - u32 clid = tcm->tcm_parent; + u32 clid; struct Qdisc *q = NULL; struct Qdisc *p = NULL; int err; @@ -985,6 +985,9 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n) if ((n->nlmsg_type != RTM_GETQDISC) && !capable(CAP_NET_ADMIN)) return -EPERM; + if (nlmsg_len(n) < sizeof(*tcm)) + return -EINVAL; + dev = __dev_get_by_index(net, tcm->tcm_ifindex); if (!dev) return -ENODEV; @@ -993,6 +996,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n) if (err < 0) return err; + clid = tcm->tcm_parent; if (clid) { if (clid != TC_H_ROOT) { if (TC_H_MAJ(clid) != TC_H_MAJ(TC_H_INGRESS)) { @@ -1051,6 +1055,9 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n) if (!capable(CAP_NET_ADMIN)) return -EPERM; + if (nlmsg_len(n) < sizeof(*tcm)) + return -EINVAL; + replay: /* Reinit, just in case something touches this. */ tcm = nlmsg_data(n); @@ -1382,14 +1389,17 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n) const struct Qdisc_class_ops *cops; unsigned long cl = 0; unsigned long new_cl; - u32 portid = tcm->tcm_parent; - u32 clid = tcm->tcm_handle; - u32 qid = TC_H_MAJ(clid); + u32 portid; + u32 clid; + u32 qid; int err; if ((n->nlmsg_type != RTM_GETTCLASS) && !capable(CAP_NET_ADMIN)) return -EPERM; + if (nlmsg_len(n) < sizeof(*tcm)) + return -EINVAL; + dev = __dev_get_by_index(net, tcm->tcm_ifindex); if (!dev) return -ENODEV; @@ -1413,6 +1423,10 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n) /* Step 1. Determine qdisc handle X:0 */ + portid = tcm->tcm_parent; + clid = tcm->tcm_handle; + qid = TC_H_MAJ(clid); + if (portid != TC_H_ROOT) { u32 qid1 = TC_H_MAJ(portid);