Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e6146e8684ed6dd4c0ff85ca21bf4324114fbbfa

Authored by Jozsef Kadlecsik
Committed by Patrick McHardy
1 parent f3dfd1538f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

netfilter: ipset: use unified from/to address masking and check the usage 

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Showing 8 changed files with 15 additions and 17 deletions Side-by-side Diff

include/linux/netfilter/ipset/pfxlen.h
Diff comments   View file @ e6146e8
... ... @@ -35,5 +35,11 @@
35 35  
36 36 extern u32 ip_set_range_to_cidr(u32 from, u32 to, u8 *cidr);
37 37  
  38 +#define ip_set_mask_from_to(from, to, cidr) \
  39 +do { \
  40 + from &= ip_set_hostmask(cidr); \
  41 + to = from | ~ip_set_hostmask(cidr); \
  42 +} while (0)
  43 +
38 44 #endif /*_PFXLEN_H */
net/netfilter/ipset/ip_set_bitmap_ip.c
Diff comments   View file @ e6146e8
... ... @@ -283,8 +283,7 @@
283 283  
284 284 if (cidr > 32)
285 285 return -IPSET_ERR_INVALID_CIDR;
286   - ip &= ip_set_hostmask(cidr);
287   - ip_to = ip | ~ip_set_hostmask(cidr);
  286 + ip_set_mask_from_to(ip, ip_to, cidr);
288 287 } else
289 288 ip_to = ip;
290 289  
... ... @@ -478,8 +477,7 @@
478 477  
479 478 if (cidr >= 32)
480 479 return -IPSET_ERR_INVALID_CIDR;
481   - first_ip &= ip_set_hostmask(cidr);
482   - last_ip = first_ip | ~ip_set_hostmask(cidr);
  480 + ip_set_mask_from_to(first_ip, last_ip, cidr);
483 481 } else
484 482 return -IPSET_ERR_PROTOCOL;
485 483  
net/netfilter/ipset/ip_set_bitmap_ipmac.c
Diff comments   View file @ e6146e8
... ... @@ -578,7 +578,7 @@
578 578  
579 579 if (cidr >= 32)
580 580 return -IPSET_ERR_INVALID_CIDR;
581   - last_ip = first_ip | ~ip_set_hostmask(cidr);
  581 + ip_set_mask_from_to(first_ip, last_ip, cidr);
582 582 } else
583 583 return -IPSET_ERR_PROTOCOL;
584 584  
net/netfilter/ipset/ip_set_hash_ip.c
Diff comments   View file @ e6146e8
... ... @@ -177,8 +177,7 @@
177 177  
178 178 if (cidr > 32)
179 179 return -IPSET_ERR_INVALID_CIDR;
180   - ip &= ip_set_hostmask(cidr);
181   - ip_to = ip | ~ip_set_hostmask(cidr);
  180 + ip_set_mask_from_to(ip, ip_to, cidr);
182 181 } else
183 182 ip_to = ip;
184 183  
net/netfilter/ipset/ip_set_hash_ipport.c
Diff comments   View file @ e6146e8
... ... @@ -216,8 +216,7 @@
216 216  
217 217 if (cidr > 32)
218 218 return -IPSET_ERR_INVALID_CIDR;
219   - ip &= ip_set_hostmask(cidr);
220   - ip_to = ip | ~ip_set_hostmask(cidr);
  219 + ip_set_mask_from_to(ip, ip_to, cidr);
221 220 } else
222 221 ip_to = ip;
223 222  
net/netfilter/ipset/ip_set_hash_ipportip.c
Diff comments   View file @ e6146e8
... ... @@ -224,8 +224,7 @@
224 224  
225 225 if (cidr > 32)
226 226 return -IPSET_ERR_INVALID_CIDR;
227   - ip &= ip_set_hostmask(cidr);
228   - ip_to = ip | ~ip_set_hostmask(cidr);
  227 + ip_set_mask_from_to(ip, ip_to, cidr);
229 228 } else
230 229 ip_to = ip;
231 230  
net/netfilter/ipset/ip_set_hash_ipportnet.c
Diff comments   View file @ e6146e8
... ... @@ -254,8 +254,7 @@
254 254  
255 255 if (cidr > 32)
256 256 return -IPSET_ERR_INVALID_CIDR;
257   - ip &= ip_set_hostmask(cidr);
258   - ip_to = ip | ~ip_set_hostmask(cidr);
  257 + ip_set_mask_from_to(ip, ip_to, cidr);
259 258 }
260 259  
261 260 port_to = port = ntohs(data.port);
... ... @@ -273,8 +272,7 @@
273 272 if (ip2_from + UINT_MAX == ip2_to)
274 273 return -IPSET_ERR_HASH_RANGE;
275 274 } else {
276   - ip2_from &= ip_set_hostmask(data.cidr);
277   - ip2_to = ip2_from | ~ip_set_hostmask(data.cidr);
  275 + ip_set_mask_from_to(ip2_from, ip2_to, data.cidr);
278 276 }
279 277  
280 278 if (retried)
net/netfilter/ipset/ip_set_hash_netport.c
Diff comments   View file @ e6146e8
... ... @@ -245,8 +245,7 @@
245 245 if (ip + UINT_MAX == ip_to)
246 246 return -IPSET_ERR_HASH_RANGE;
247 247 } else {
248   - ip &= ip_set_hostmask(data.cidr);
249   - ip_to = ip | ~ip_set_hostmask(data.cidr);
  248 + ip_set_mask_from_to(ip, ip_to, data.cidr);
250 249 }
251 250  
252 251 if (retried)