|
@@ -167,7 +167,7 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb)
|
|
|
soffset -= 4;
|
|
|
if (soffset > 3) {
|
|
|
memcpy(&faddr, &start[soffset-1], 4);
|
|
|
- for (soffset-=4, doffset=4; soffset > 3; soffset-=4, doffset+=4)
|
|
|
+ for (soffset -= 4, doffset = 4; soffset > 3; soffset -= 4, doffset += 4)
|
|
|
memcpy(&dptr[doffset-1], &start[soffset-1], 4);
|
|
|
/*
|
|
|
* RFC1812 requires to fix illegal source routes.
|
|
@@ -227,7 +227,7 @@ void ip_options_fragment(struct sk_buff *skb)
|
|
|
continue;
|
|
|
}
|
|
|
optlen = optptr[1];
|
|
|
- if (optlen<2 || optlen>l)
|
|
|
+ if (optlen < 2 || optlen > l)
|
|
|
return;
|
|
|
if (!IPOPT_COPIED(*optptr))
|
|
|
memset(optptr, IPOPT_NOOP, optlen);
|
|
@@ -276,7 +276,7 @@ int ip_options_compile(struct net *net,
|
|
|
for (l = opt->optlen; l > 0; ) {
|
|
|
switch (*optptr) {
|
|
|
case IPOPT_END:
|
|
|
- for (optptr++, l--; l>0; optptr++, l--) {
|
|
|
+ for (optptr++, l--; l > 0; optptr++, l--) {
|
|
|
if (*optptr != IPOPT_END) {
|
|
|
*optptr = IPOPT_END;
|
|
|
opt->is_changed = 1;
|
|
@@ -289,7 +289,7 @@ int ip_options_compile(struct net *net,
|
|
|
continue;
|
|
|
}
|
|
|
optlen = optptr[1];
|
|
|
- if (optlen<2 || optlen>l) {
|
|
|
+ if (optlen < 2 || optlen > l) {
|
|
|
pp_ptr = optptr;
|
|
|
goto error;
|
|
|
}
|
|
@@ -572,7 +572,7 @@ void ip_forward_options(struct sk_buff *skb)
|
|
|
|
|
|
optptr = raw + opt->srr;
|
|
|
|
|
|
- for ( srrptr=optptr[2], srrspace = optptr[1];
|
|
|
+ for ( srrptr = optptr[2], srrspace = optptr[1];
|
|
|
srrptr <= srrspace;
|
|
|
srrptr += 4
|
|
|
) {
|
|
@@ -628,7 +628,7 @@ int ip_options_rcv_srr(struct sk_buff *skb)
|
|
|
if (rt->rt_type != RTN_LOCAL)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- for (srrptr=optptr[2], srrspace = optptr[1]; srrptr <= srrspace; srrptr += 4) {
|
|
|
+ for (srrptr = optptr[2], srrspace = optptr[1]; srrptr <= srrspace; srrptr += 4) {
|
|
|
if (srrptr + 3 > srrspace) {
|
|
|
icmp_send(skb, ICMP_PARAMETERPROB, 0, htonl((opt->srr+2)<<24));
|
|
|
return -EINVAL;
|