Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a62660 authored by Kris Katterjohn's avatar Kris Katterjohn Committed by David S. Miller
Browse files

[NET]: Change some "if (x) BUG();" to "BUG_ON(x);" 



This changes some simple "if (x) BUG();" statements to "BUG_ON(x);"

Signed-off-by: default avatarKris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4bba3925

net/core/dev.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -1092,15 +1092,12 @@ int skb_checksum_help(struct sk_buff *skb, int inward) 
			goto out;

			goto out;

	}

	}





	if (offset > (int)skb->len)

	BUG_ON(offset > (int)skb->len);

		BUG();

	csum = skb_checksum(skb, offset, skb->len-offset, 0);

	csum = skb_checksum(skb, offset, skb->len-offset, 0);





	offset = skb->tail - skb->h.raw;

	offset = skb->tail - skb->h.raw;

	if (offset <= 0)

	BUG_ON(offset <= 0);

		BUG();

	BUG_ON(skb->csum + 2 > offset);

	if (skb->csum + 2 > offset)

		BUG();





	*(u16*)(skb->h.raw + skb->csum) = csum_fold(csum);

	*(u16*)(skb->h.raw + skb->csum) = csum_fold(csum);

	skb->ip_summed = CHECKSUM_NONE;

	skb->ip_summed = CHECKSUM_NONE;

net/core/skbuff.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -791,8 +791,7 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc) 
		int end = offset + skb_shinfo(skb)->frags[i].size;

		int end = offset + skb_shinfo(skb)->frags[i].size;

		if (end > len) {

		if (end > len) {

			if (skb_cloned(skb)) {

			if (skb_cloned(skb)) {

				if (!realloc)

				BUG_ON(!realloc);

					BUG();

				if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))

				if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))

					return -ENOMEM;

					return -ENOMEM;

			}

			}
@@ -894,8 +893,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta) 
		struct sk_buff *insp = NULL;

		struct sk_buff *insp = NULL;





		do {

		do {

			if (!list)

			BUG_ON(!list);

				BUG();





			if (list->len <= eat) {

			if (list->len <= eat) {

				/* Eaten as whole. */

				/* Eaten as whole. */
@@ -1199,8 +1197,7 @@ unsigned int skb_checksum(const struct sk_buff *skb, int offset, 
			start = end;

			start = end;

		}

		}

	}

	}

	if (len)

	BUG_ON(len);

		BUG();





	return csum;

	return csum;

}

}
@@ -1282,8 +1279,7 @@ unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, 
			start = end;

			start = end;

		}

		}

	}

	}

	if (len)

	BUG_ON(len);

		BUG();

	return csum;

	return csum;

}

}
@@ -1297,8 +1293,7 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to) 
	else

	else

		csstart = skb_headlen(skb);

		csstart = skb_headlen(skb);





	if (csstart > skb_headlen(skb))

	BUG_ON(csstart > skb_headlen(skb));

		BUG();





	memcpy(to, skb->data, csstart);

	memcpy(to, skb->data, csstart);

net/ipv4/icmp.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -899,8 +899,7 @@ static void icmp_address_reply(struct sk_buff *skb) 
		u32 _mask, *mp;

		u32 _mask, *mp;





		mp = skb_header_pointer(skb, 0, sizeof(_mask), &_mask);

		mp = skb_header_pointer(skb, 0, sizeof(_mask), &_mask);

		if (mp == NULL)

		BUG_ON(mp == NULL);

			BUG();

		for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {

		for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {

			if (*mp == ifa->ifa_mask &&

			if (*mp == ifa->ifa_mask &&

			    inet_ifa_match(rt->rt_src, ifa))

			    inet_ifa_match(rt->rt_src, ifa))

net/ipv4/inetpeer.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -304,8 +304,7 @@ static void unlink_from_pool(struct inet_peer *p) 
			/* look for a node to insert instead of p */

			/* look for a node to insert instead of p */

			struct inet_peer *t;

			struct inet_peer *t;

			t = lookup_rightempty(p);

			t = lookup_rightempty(p);

			if (*stackptr[-1] != t)

			BUG_ON(*stackptr[-1] != t);

				BUG();

			**--stackptr = t->avl_left;

			**--stackptr = t->avl_left;

			/* t is removed, t->v4daddr > x->v4daddr for any

			/* t is removed, t->v4daddr > x->v4daddr for any

			 * x in p->avl_left subtree.

			 * x in p->avl_left subtree.
@@ -314,8 +313,7 @@ static void unlink_from_pool(struct inet_peer *p) 
			t->avl_left = p->avl_left;

			t->avl_left = p->avl_left;

			t->avl_right = p->avl_right;

			t->avl_right = p->avl_right;

			t->avl_height = p->avl_height;

			t->avl_height = p->avl_height;

			if (delp[1] != &p->avl_left)

			BUG_ON(delp[1] != &p->avl_left);

				BUG();

			delp[1] = &t->avl_left; /* was &p->avl_left */

			delp[1] = &t->avl_left; /* was &p->avl_left */

		}

		}

		peer_avl_rebalance(stack, stackptr);

		peer_avl_rebalance(stack, stackptr);

net/ipv4/tcp_input.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3347,7 +3347,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, 
			int offset = start - TCP_SKB_CB(skb)->seq;

			int offset = start - TCP_SKB_CB(skb)->seq;

			int size = TCP_SKB_CB(skb)->end_seq - start;

			int size = TCP_SKB_CB(skb)->end_seq - start;





			if (offset < 0) BUG();

			BUG_ON(offset < 0);

			if (size > 0) {

			if (size > 0) {

				size = min(copy, size);

				size = min(copy, size);

				if (skb_copy_bits(skb, offset, skb_put(nskb, size), size))

				if (skb_copy_bits(skb, offset, skb_put(nskb, size), size))