Message ID | 20091008072323.GA3255@psychotron.lab.eng.brq.redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Jiri Pirko <jpirko@redhat.com> Date: Thu, 8 Oct 2009 09:23:23 +0200 > Commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 introduced a typo in > initialization. This patch fixes this. > > Signed-off-by: Jiri Pirko <jpirko@redhat.com> Doesn't this leak some uninitialized bytes to userspace? Therefore, this fix probably belongs in net-2.6 and -stable instead of net-next-2.6, right? > diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c > index 6a53694..7cf6c0f 100644 > --- a/net/sched/cls_api.c > +++ b/net/sched/cls_api.c > @@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, > tcm = NLMSG_DATA(nlh); > tcm->tcm_family = AF_UNSPEC; > tcm->tcm__pad1 = 0; > - tcm->tcm__pad1 = 0; > + tcm->tcm__pad2 = 0; > tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; > tcm->tcm_parent = tp->classid; > tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol); -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thu, Oct 08, 2009 at 09:57:43AM CEST, davem@davemloft.net wrote: >From: Jiri Pirko <jpirko@redhat.com> >Date: Thu, 8 Oct 2009 09:23:23 +0200 > >> Commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 introduced a typo in >> initialization. This patch fixes this. >> >> Signed-off-by: Jiri Pirko <jpirko@redhat.com> > >Doesn't this leak some uninitialized bytes to userspace? Yes it does. > >Therefore, this fix probably belongs in net-2.6 and -stable instead >of net-next-2.6, right? Okay. The patch is applicable on net-2.6 (I presume on -stable too). Feel free to apply. Thanks. Jirka > >> diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c >> index 6a53694..7cf6c0f 100644 >> --- a/net/sched/cls_api.c >> +++ b/net/sched/cls_api.c >> @@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, >> tcm = NLMSG_DATA(nlh); >> tcm->tcm_family = AF_UNSPEC; >> tcm->tcm__pad1 = 0; >> - tcm->tcm__pad1 = 0; >> + tcm->tcm__pad2 = 0; >> tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; >> tcm->tcm_parent = tp->classid; >> tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol); -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Pirko <jpirko@redhat.com> Date: Thu, 8 Oct 2009 10:08:59 +0200 > Thu, Oct 08, 2009 at 09:57:43AM CEST, davem@davemloft.net wrote: >>From: Jiri Pirko <jpirko@redhat.com> >>Date: Thu, 8 Oct 2009 09:23:23 +0200 >> >>Therefore, this fix probably belongs in net-2.6 and -stable instead >>of net-next-2.6, right? > > Okay. The patch is applicable on net-2.6 (I presume on -stable too). Feel free > to apply. Great, I'll take care of this, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 6a53694..7cf6c0f 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, tcm = NLMSG_DATA(nlh); tcm->tcm_family = AF_UNSPEC; tcm->tcm__pad1 = 0; - tcm->tcm__pad1 = 0; + tcm->tcm__pad2 = 0; tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; tcm->tcm_parent = tp->classid; tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);
Commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 introduced a typo in initialization. This patch fixes this. Signed-off-by: Jiri Pirko <jpirko@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html