mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
netfilter: nft_exthdr: Fix non-linear header modification
[ Upstream commit28427f368f
] Fix skb_ensure_writable() size. Don't use nft_tcp_header_pointer() to make it explicit that pointers point to the packet (not local buffer). Fixes:99d1712bc4
("netfilter: exthdr: tcp option set support") Fixes:7890cbea66
("netfilter: exthdr: add support for tcp option removal") Cc: stable@vger.kernel.org Signed-off-by: Xiao Liang <shaw.leon@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7ca3a1b0f4
commit
f5ba6d9d6b
1 changed files with 8 additions and 12 deletions
|
@ -245,7 +245,12 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,
|
||||||
if (!tcph)
|
if (!tcph)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
if (skb_ensure_writable(pkt->skb, nft_thoff(pkt) + tcphdr_len))
|
||||||
|
goto err;
|
||||||
|
|
||||||
|
tcph = (struct tcphdr *)(pkt->skb->data + nft_thoff(pkt));
|
||||||
opt = (u8 *)tcph;
|
opt = (u8 *)tcph;
|
||||||
|
|
||||||
for (i = sizeof(*tcph); i < tcphdr_len - 1; i += optl) {
|
for (i = sizeof(*tcph); i < tcphdr_len - 1; i += optl) {
|
||||||
union {
|
union {
|
||||||
__be16 v16;
|
__be16 v16;
|
||||||
|
@ -260,15 +265,6 @@ static void nft_exthdr_tcp_set_eval(const struct nft_expr *expr,
|
||||||
if (i + optl > tcphdr_len || priv->len + priv->offset > optl)
|
if (i + optl > tcphdr_len || priv->len + priv->offset > optl)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
if (skb_ensure_writable(pkt->skb,
|
|
||||||
nft_thoff(pkt) + i + priv->len))
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
tcph = nft_tcp_header_pointer(pkt, sizeof(buff), buff,
|
|
||||||
&tcphdr_len);
|
|
||||||
if (!tcph)
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
offset = i + priv->offset;
|
offset = i + priv->offset;
|
||||||
|
|
||||||
switch (priv->len) {
|
switch (priv->len) {
|
||||||
|
@ -332,9 +328,9 @@ static void nft_exthdr_tcp_strip_eval(const struct nft_expr *expr,
|
||||||
if (skb_ensure_writable(pkt->skb, nft_thoff(pkt) + tcphdr_len))
|
if (skb_ensure_writable(pkt->skb, nft_thoff(pkt) + tcphdr_len))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
opt = (u8 *)nft_tcp_header_pointer(pkt, sizeof(buff), buff, &tcphdr_len);
|
tcph = (struct tcphdr *)(pkt->skb->data + nft_thoff(pkt));
|
||||||
if (!opt)
|
opt = (u8 *)tcph;
|
||||||
goto err;
|
|
||||||
for (i = sizeof(*tcph); i < tcphdr_len - 1; i += optl) {
|
for (i = sizeof(*tcph); i < tcphdr_len - 1; i += optl) {
|
||||||
unsigned int j;
|
unsigned int j;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue