Subject: Re: [PATCH net-next] htb: fix sign extension bug

From: Stephen Hemminger <[email-masked]>
Date: Fri, 2 Aug 2013 08:24:04 -0700

On Fri, 02 Aug 2013 06:36:20 -0700
Eric Dumazet <[email-masked]> wrote:

> On Thu, 2013-08-01 at 22:32 -0700, Stephen Hemminger wrote:
> > 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 <[email-masked]>
> > 
> > --- a/net/sched/sch_htb.c	2013-06-20 09:22:46.489542435 -0700
> > +++ b/net/sched/sch_htb.c	2013-08-01 22:12:43.736307055 -0700
> > @@ -100,7 +100,7 @@ struct htb_class {
> >  	struct psched_ratecfg	ceil;
> >  	s64			buffer, cbuffer;/* token bucket depth/rate */
> >  	s64			mbuffer;	/* max wait time */
> > -	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 */
> >  
> >  	struct tcf_proto	*filter_list;	/* class attached filters */
> > --
> 
> Thanks Stephen.
> 
> Acked-by: Eric Dumazet <[email-masked]>
> 
> It seems appropriate for net tree (and stable)
> 
> We probably should report an error from htb_change_class() ?

There are more signed/unsigned bugs lurking here, and opportunities to
shrink the structure. (for example prio could be u8). Overall this code
uses int where unsigned should be used.

Examples:
static inline void htb_add_class_to_row(struct htb_sched *q,
					struct htb_class *cl, int mask)
{
	q->row_mask[cl->level] |= mask;
	while (mask) {
		int prio = ffz(~mask);
		mask &= ~(1 << prio);
		htb_add_to_id_tree(&q->hlevel[cl->level].hprio[prio].row, cl, prio);
	}
}

Could be:
static void htb_add_class_to_row(struct htb_sched *q,
			  	 struct htb_class *cl, u8 mask)
{
	q->row_mask[cl->level] |= mask;
	while (mask) {
		u8 prio = ffz(~mask);
		mask &= ~(1 << prio);
		htb_add_to_id_tree(&q->hlevel[cl->level].hprio[prio].row, cl, prio);
	}
}

Looks like all use of int in HTB should be re-evaluated to see if a smaller unsigned
type could be used instead.