Re: [PATCH net-next 02/11] net: sched: cls_u32: make sure that divisor is a power of 2

2018-10-08 Thread Jamal Hadi Salim 

On 2018-10-08 4:46 a.m., Sergei Shtylyov wrote:

Hello!

On 07.10.2018 19:38, Jamal Hadi Salim wrote:


From: Al Viro 

Tested by modifying iproute2 to to allow


    One "to" is enough, no? :-)



Will fix in updated version.

cheers,
jamal

Re: [PATCH net-next 02/11] net: sched: cls_u32: make sure that divisor is a power of 2

2018-10-08 Thread Sergei Shtylyov 

Hello!

On 07.10.2018 19:38, Jamal Hadi Salim wrote:


From: Al Viro 

Tested by modifying iproute2 to to allow


   One "to" is enough, no? :-)


sending a divisor > 255

Tested-by: Jamal Hadi Salim 
Signed-off-by: Al Viro 
Signed-off-by: Jamal Hadi Salim 

[...]

MBR, Sergei

[PATCH net-next 02/11] net: sched: cls_u32: make sure that divisor is a power of 2

2018-10-07 Thread Jamal Hadi Salim 
From: Al Viro 

Tested by modifying iproute2 to to allow
sending a divisor > 255 

Tested-by: Jamal Hadi Salim 
Signed-off-by: Al Viro 
Signed-off-by: Jamal Hadi Salim 
---
 net/sched/cls_u32.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 3357331a80a2..ce55eea448a0 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -994,7 +994,11 @@ static int u32_change(struct net *net, struct sk_buff 
*in_skb,
if (tb[TCA_U32_DIVISOR]) {
unsigned int divisor = nla_get_u32(tb[TCA_U32_DIVISOR]);
 
-   if (--divisor > 0x100) {
+   if (!is_power_of_2(divisor)) {
+   NL_SET_ERR_MSG_MOD(extack, "Divisor is not a power of 
2");
+   return -EINVAL;
+   }
+   if (divisor-- > 0x100) {
NL_SET_ERR_MSG_MOD(extack, "Exceeded maximum 256 hash 
buckets");
return -EINVAL;
}
-- 
2.11.0