netlink: add missing length check of rtnl msg
Subsystems (3)
PATCH 1/1 netlink: add missing length check of rtnl msg
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.
--- net/sched/cls_api.c | 4 ++++ net/sched/sch_api.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-)
net/sched/cls_api.c +4 -0
@@ -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);
net/sched/sch_api.c +18 -4
@@ -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);
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Hong Zhiguo <[email protected]>
Date: Tue, 26 Mar 2013 01:22:23 +0800
Quoted 10 lines
When the legacy array
rtm_minstill 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_minseveral days ago, these checks are missing.Other doit functions should be OK.
Signed-off-by Hong Zhiguo <[email protected]>
This looks good, Thomas please review.
Quoted 15 lines · Hong Zhiguo
net/sched/cls_api.c +0
-0protocol =TC_H_MIN (t->tcm_info);net/sched/sch_api.c +1
-1@@ -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;
net/sched/sch_api.c static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n) · line 993
Quoted 9 lines
net/sched/sch_api.c +3
-0@@ -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 ;
What do you think about moving the nlmsg_parse() call from below here to before __dev_get_by_index()? It also verifies the header length and it's how other netlink code verifies the message type specific header as well.
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n) · line 1060
Quoted 8 lines
net/sched/sch_api.c +3
-0if (err <0 )@@ -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 ; +
Same here.
Quoted 14 lines
net/sched/sch_api.c +3
-3replay:/* 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;
net/sched/sch_api.c static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n) · line 1405
Quoted 10 lines
net/sched/sch_api.c +3
-0if ((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 ;
And here.
PATCH v2 1/1 netlink: have length check of rtnl msg before deref
In reply to Hong ZhiguoWhen 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.
--- net/sched/cls_api.c | 9 +++++---- net/sched/sch_api.c | 36 +++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 19 deletions(-)
net/sched/cls_api.c +5 -4
@@ -141,7 +141,12 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n)if ((n->nlmsg_type !=RTM_GETTFILTER ) && !capable (CAP_NET_ADMIN ))return -EPERM ; + replay: + err =nlmsg_parse (n,sizeof (*t), tca,TCA_MAX ,NULL ); +if (err <0 ) +return err; + t =nlmsg_data (n); protocol =TC_H_MIN (t->tcm_info); prio =TC_H_MAJ (t->tcm_info);
@@ -164,10 +169,6 @@ replay:if (dev ==NULL )return -ENODEV ; - err =nlmsg_parse (n,sizeof (*t), tca,TCA_MAX ,NULL ); -if (err <0 ) -return err; -/* Find qdisc */ if (!parent) { q = dev->qdisc;
net/sched/sch_api.c +21 -15
@@ -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,14 +985,15 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n)if ((n->nlmsg_type !=RTM_GETQDISC ) && !capable (CAP_NET_ADMIN ))return -EPERM ; - dev =__dev_get_by_index (net, tcm->tcm_ifindex); -if (!dev) -return -ENODEV ; - err =nlmsg_parse (n,sizeof (*tcm), tca,TCA_MAX ,NULL );if (err <0 )return err; + dev =__dev_get_by_index (net, tcm->tcm_ifindex); +if (!dev) +return -ENODEV ; + + clid = tcm->tcm_parent;if (clid) {if (clid !=TC_H_ROOT ) {if (TC_H_MAJ (clid) !=TC_H_MAJ (TC_H_INGRESS )) {
@@ -1053,6 +1054,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n) replay:/* Reinit, just in case something touches this. */ + err =nlmsg_parse (n,sizeof (*tcm), tca,TCA_MAX ,NULL ); +if (err <0 ) +return err; + tcm =nlmsg_data (n); clid = tcm->tcm_parent; q = p =NULL ;
@@ -1061,9 +1066,6 @@ replay:if (!dev)return -ENODEV ; - err =nlmsg_parse (n,sizeof (*tcm), tca,TCA_MAX ,NULL ); -if (err <0 ) -return err;if (clid) {if (clid !=TC_H_ROOT ) {
@@ -1382,22 +1384,22 @@ 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 ; - dev =__dev_get_by_index (net, tcm->tcm_ifindex); -if (!dev) -return -ENODEV ; - err =nlmsg_parse (n,sizeof (*tcm), tca,TCA_MAX ,NULL );if (err <0 )return err; + dev =__dev_get_by_index (net, tcm->tcm_ifindex); +if (!dev) +return -ENODEV ; +/* parent == TC_H_UNSPEC - unspecified parent. parent == TC_H_ROOT - class is root, which has no parent.
@@ -1413,6 +1415,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);
Signature · 1 line
1.7.10.4
Re: [PATCH v2 net-next] netlink: have length check of rtnl msg before deref
Quoted 8 lines · Hong Zhiguo
When the legacy array
rtm_minstill 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_minseveral days ago, these checks are missing. Other doit functions should be OK.Signed-off-by Hong Zhiguo <[email protected]>
Re: [PATCH v2 net-next] netlink: have length check of rtnl msg before deref
From: Thomas Graf <[email protected]>
Date: Tue, 26 Mar 2013 08:59:37 +0000
Quoted 11 lines · Hong Zhiguo
Quoted 8 lines
When the legacy array
rtm_minstill 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_minseveral days ago, these checks are missing. Other doit functions should be OK.Signed-off-by Hong Zhiguo <[email protected]>Acked-by Thomas Graf <[email protected]>
Applied, thanks.