3571e53040
patches for easier mirroring, to eliminate a special copy, to make www.freebsd.org/security a full copy of security.freebsd.org and be eventually be the same. For now files are just sitting there. The symlinks are missing. Discussed on: www (repository location) Discussed with: simon (so)
127 lines
3.7 KiB
Diff
127 lines
3.7 KiB
Diff
Index: sys/net/if_spppsubr.c
|
|
===================================================================
|
|
RCS file: /home/ncvs/src/sys/net/if_spppsubr.c,v
|
|
retrieving revision 1.124
|
|
diff -u -I__FBSDID -r1.124 if_spppsubr.c
|
|
--- sys/net/if_spppsubr.c 15 Jul 2006 02:49:35 -0000 1.124
|
|
+++ sys/net/if_spppsubr.c 21 Aug 2006 11:32:49 -0000
|
|
@@ -2363,7 +2363,8 @@
|
|
|
|
/* pass 1: check for things that need to be rejected */
|
|
p = (void*) (h+1);
|
|
- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
|
|
+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len-=p[1], p+=p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_lcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -2442,7 +2443,8 @@
|
|
|
|
p = (void*) (h+1);
|
|
len = origlen;
|
|
- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
|
|
+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len-=p[1], p+=p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_lcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -2584,7 +2586,8 @@
|
|
SPP_ARGS(ifp));
|
|
|
|
p = (void*) (h+1);
|
|
- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
|
|
+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len -= p[1], p += p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_lcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -2648,7 +2651,8 @@
|
|
SPP_ARGS(ifp));
|
|
|
|
p = (void*) (h+1);
|
|
- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
|
|
+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len -= p[1], p += p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_lcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3039,7 +3043,8 @@
|
|
log(LOG_DEBUG, SPP_FMT "ipcp parse opts: ",
|
|
SPP_ARGS(ifp));
|
|
p = (void*) (h+1);
|
|
- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
|
|
+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len-=p[1], p+=p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_ipcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3108,7 +3113,8 @@
|
|
SPP_ARGS(ifp));
|
|
p = (void*) (h+1);
|
|
len = origlen;
|
|
- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
|
|
+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len-=p[1], p+=p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_ipcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3239,7 +3245,8 @@
|
|
SPP_ARGS(ifp));
|
|
|
|
p = (void*) (h+1);
|
|
- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
|
|
+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len -= p[1], p += p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_ipcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3285,7 +3292,8 @@
|
|
SPP_ARGS(ifp));
|
|
|
|
p = (void*) (h+1);
|
|
- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
|
|
+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len -= p[1], p += p[1]) {
|
|
if (debug)
|
|
log(-1, " %s ", sppp_ipcp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3511,7 +3519,8 @@
|
|
SPP_ARGS(ifp));
|
|
p = (void*) (h+1);
|
|
ifidcount = 0;
|
|
- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
|
|
+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len-=p[1], p+=p[1]) {
|
|
if (debug)
|
|
log(-1, " %s", sppp_ipv6cp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3561,7 +3570,8 @@
|
|
p = (void*) (h+1);
|
|
len = origlen;
|
|
type = CONF_ACK;
|
|
- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
|
|
+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len-=p[1], p+=p[1]) {
|
|
if (debug)
|
|
log(-1, " %s", sppp_ipv6cp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3660,7 +3670,8 @@
|
|
SPP_ARGS(ifp));
|
|
|
|
p = (void*) (h+1);
|
|
- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
|
|
+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len -= p[1], p += p[1]) {
|
|
if (debug)
|
|
log(-1, " %s", sppp_ipv6cp_opt_name(*p));
|
|
switch (*p) {
|
|
@@ -3706,7 +3717,8 @@
|
|
SPP_ARGS(ifp));
|
|
|
|
p = (void*) (h+1);
|
|
- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
|
|
+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
|
|
+ len -= p[1], p += p[1]) {
|
|
if (debug)
|
|
log(-1, " %s", sppp_ipv6cp_opt_name(*p));
|
|
switch (*p) {
|