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

Commit af793736 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "netfilter: add back stackpointer size checks"

parents 8e706a6c a919af8f

net/ipv4/netfilter/arp_tables.c

+4 −0
Original line number Diff line number Diff line
@@ -329,6 +329,10 @@ unsigned int arpt_do_table(struct sk_buff *skb, 
			}

			if (table_base + v

			    != arpt_next_entry(e)) {

				if (unlikely(stackidx >= private->stacksize)) {

					verdict = NF_DROP;

					break;

				}

				jumpstack[stackidx++] = e;

			}

net/ipv4/netfilter/ip_tables.c

+4 −2
Original line number Diff line number Diff line
@@ -408,9 +408,11 @@ ipt_do_table(struct sk_buff *skb, 
			}

			if (table_base + v != ipt_next_entry(e) &&

			    !(e->ip.flags & IPT_F_GOTO)) {

				if (unlikely(stackidx >= private->stacksize)) {

					verdict = NF_DROP;

					break;

				}

				jumpstack[stackidx++] = e;

				pr_debug("Pushed %p into pos %u\n",

					 e, stackidx - 1);

			}



			e = get_entry(table_base, v);

net/ipv6/netfilter/ip6_tables.c

+4 −0
Original line number Diff line number Diff line
@@ -429,6 +429,10 @@ ip6t_do_table(struct sk_buff *skb, 
			}

			if (table_base + v != ip6t_next_entry(e) &&

			    !(e->ipv6.flags & IP6T_F_GOTO)) {

				if (unlikely(stackidx >= private->stacksize)) {

					verdict = NF_DROP;

					break;

				}

				jumpstack[stackidx++] = e;

			}