osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

gprs_ns2_frgre: set a correct gre pointer for ipv6 

Also fixes a nullpointer deref because iph is NULL on IPv6

Related: CID#216555
Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb
This commit is contained in:
Alexander Couzens 2021-02-03 11:46:59 +01:00
parent ca3550a261
commit 47ed2a6b4a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gb/gprs_ns2_frgre.c
View File

@ -339,7 +339,11 @@ static struct msgb *read_nsfrgre_msg(struct osmo_fd *bfd, int *error,
break;
}
greh = (struct gre_hdr *) (msg->data + iph->ihl*4);
if (iph)
greh = (struct gre_hdr *) (msg->data + iph->ihl*4);
else
greh = (struct gre_hdr *) (msg->data + sizeof(struct ip6_hdr));
if (greh->flags) {
LOGBIND(bind, LOGL_NOTICE, "Unknown GRE flags 0x%04x\n", osmo_ntohs(greh->flags));
}