diff options
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e4115672b6c..4e0c9227418 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1200,7 +1200,7 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {  		int end; -		BUG_TRAP(start <= offset + len); +		WARN_ON(start > offset + len);  		end = start + skb_shinfo(skb)->frags[i].size;  		if ((copy = end - offset) > 0) { @@ -1229,7 +1229,7 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)  		for (; list; list = list->next) {  			int end; -			BUG_TRAP(start <= offset + len); +			WARN_ON(start > offset + len);  			end = start + list->len;  			if ((copy = end - offset) > 0) { @@ -1475,7 +1475,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)  		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];  		int end; -		BUG_TRAP(start <= offset + len); +		WARN_ON(start > offset + len);  		end = start + frag->size;  		if ((copy = end - offset) > 0) { @@ -1503,7 +1503,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)  		for (; list; list = list->next) {  			int end; -			BUG_TRAP(start <= offset + len); +			WARN_ON(start > offset + len);  			end = start + list->len;  			if ((copy = end - offset) > 0) { @@ -1552,7 +1552,7 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {  		int end; -		BUG_TRAP(start <= offset + len); +		WARN_ON(start > offset + len);  		end = start + skb_shinfo(skb)->frags[i].size;  		if ((copy = end - offset) > 0) { @@ -1581,7 +1581,7 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,  		for (; list; list = list->next) {  			int end; -			BUG_TRAP(start <= offset + len); +			WARN_ON(start > offset + len);  			end = start + list->len;  			if ((copy = end - offset) > 0) { @@ -1629,7 +1629,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {  		int end; -		BUG_TRAP(start <= offset + len); +		WARN_ON(start > offset + len);  		end = start + skb_shinfo(skb)->frags[i].size;  		if ((copy = end - offset) > 0) { @@ -1662,7 +1662,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,  			__wsum csum2;  			int end; -			BUG_TRAP(start <= offset + len); +			WARN_ON(start > offset + len);  			end = start + list->len;  			if ((copy = end - offset) > 0) { @@ -2373,7 +2373,7 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {  		int end; -		BUG_TRAP(start <= offset + len); +		WARN_ON(start > offset + len);  		end = start + skb_shinfo(skb)->frags[i].size;  		if ((copy = end - offset) > 0) { @@ -2397,7 +2397,7 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)  		for (; list; list = list->next) {  			int end; -			BUG_TRAP(start <= offset + len); +			WARN_ON(start > offset + len);  			end = start + list->len;  			if ((copy = end - offset) > 0) {  |