aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-08-01 22:32:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-14 05:50:47 -0700
commit77e9ebfd7c33f34f42761db4194961320264a482 (patch)
tree941ad031fae5ace5d36ab792d9208923c6a0c6c6 /net
parent03188ddd7dd3fdc65d626ac8bb9d1851502263c5 (diff)
downloadkernel_samsung_smdk4412-77e9ebfd7c33f34f42761db4194961320264a482.zip
kernel_samsung_smdk4412-77e9ebfd7c33f34f42761db4194961320264a482.tar.gz
kernel_samsung_smdk4412-77e9ebfd7c33f34f42761db4194961320264a482.tar.bz2
htb: fix sign extension bug
[ Upstream commit cbd375567f7e4811b1c721f75ec519828ac6583f ] When userspace passes a large priority value the assignment of the unsigned value hopt->prio to signed int cl->prio causes cl->prio to become negative and the comparison is with TC_HTB_NUMPRIO is always false. The result is that HTB crashes by referencing outside the array when processing packets. With this patch the large value wraps around like other values outside the normal range. See: https://bugzilla.kernel.org/show_bug.cgi?id=60669 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_htb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index f08b9166..caa5aff 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -86,7 +86,7 @@ struct htb_class {
unsigned int children;
struct htb_class *parent; /* parent class */
- int prio; /* these two are used only by leaves... */
+ u32 prio; /* these two are used only by leaves... */
int quantum; /* but stored for parent-to-leaf return */
union {