2019-03-11 23:22:42

by Aditya Pakki

Subject: [PATCH] netfilter: ip6t_srh: Fix potential NULL pointer dereference

skb_header_pointer in srh_mt6 may return a NULL pointer that is
dereferenced in ipv6_masked_addr_cmp. This patch avoids such a scenario.

Signed-off-by: Aditya Pakki <[email protected]>
---
net/ipv6/netfilter/ip6t_srh.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/netfilter/ip6t_srh.c b/net/ipv6/netfilter/ip6t_srh.c
index 1059894a6f4c..5a1c0437f74b 100644
--- a/net/ipv6/netfilter/ip6t_srh.c
+++ b/net/ipv6/netfilter/ip6t_srh.c
@@ -210,9 +210,10 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)
psidoff = srhoff + sizeof(struct ipv6_sr_hdr) +
((srh->segments_left + 1) * sizeof(struct in6_addr));
psid = skb_header_pointer(skb, psidoff, sizeof(_psid), &_psid);
- if (NF_SRH_INVF(srhinfo, IP6T_SRH_INV_PSID,
+ if (psid &&
+ NF_SRH_INVF(srhinfo, IP6T_SRH_INV_PSID,
ipv6_masked_addr_cmp(psid, &srhinfo->psid_msk,
- &srhinfo->psid_addr)))
+ &srhinfo->psid_addr)))
return false;
}

@@ -223,7 +224,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)
nsidoff = srhoff + sizeof(struct ipv6_sr_hdr) +
((srh->segments_left - 1) * sizeof(struct in6_addr));
nsid = skb_header_pointer(skb, nsidoff, sizeof(_nsid), &_nsid);
- if (NF_SRH_INVF(srhinfo, IP6T_SRH_INV_NSID,
+ if (nsid &&
+ NF_SRH_INVF(srhinfo, IP6T_SRH_INV_NSID,
ipv6_masked_addr_cmp(nsid, &srhinfo->nsid_msk,
&srhinfo->nsid_addr)))
return false;
@@ -233,7 +235,8 @@ static bool srh1_mt6(const struct sk_buff *skb, struct xt_action_param *par)
if (srhinfo->mt_flags & IP6T_SRH_LSID) {
lsidoff = srhoff + sizeof(struct ipv6_sr_hdr);
lsid = skb_header_pointer(skb, lsidoff, sizeof(_lsid), &_lsid);
- if (NF_SRH_INVF(srhinfo, IP6T_SRH_INV_LSID,
+ if (lsid &&
+ NF_SRH_INVF(srhinfo, IP6T_SRH_INV_LSID,
ipv6_masked_addr_cmp(lsid, &srhinfo->lsid_msk,
&srhinfo->lsid_addr)))
return false;
--
2.17.1

2019-03-18 15:29:06

by Pablo Neira Ayuso

Subject: Re: [PATCH] netfilter: ip6t_srh: Fix potential NULL pointer dereference

On Mon, Mar 11, 2019 at 06:19:20PM -0500, Aditya Pakki wrote:
> skb_header_pointer in srh_mt6 may return a NULL pointer that is
> dereferenced in ipv6_masked_addr_cmp. This patch avoids such a scenario.

I'll take this one instead:

https://patchwork.ozlabs.org/patch/1056390/

Thanks for submitting a patch anyway.