Skip to content

Commit 4afce7e

Browse files
committed
MT#63317 re-fix extension parsing
Basically a revert of Ie62fa4ed Maybe this is correct now? Change-Id: Ia2b1b5d35c2a209430a23110f1b929e2b1ac80fb (cherry picked from commit 8a3d8c9)
1 parent 9e1bcc9 commit 4afce7e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

kernel-module/xt_RTPENGINE.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4223,7 +4223,7 @@ static void parse_rtp(struct rtp_parsed *rtp, struct sk_buff *skb) {
42234223
if (rtp->payload_len < sizeof(*ext))
42244224
goto error;
42254225
ext = (void *) rtp->payload;
4226-
ext_len = sizeof(*ext) + 4 + ntohs(ext->length) * 4;
4226+
ext_len = sizeof(*ext) + ntohs(ext->length) * 4;
42274227
if (rtp->payload_len < ext_len)
42284228
goto error;
42294229
rtp->payload += ext_len;

lib/rtplib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int rtp_payload(struct rtp_header **out, str *p, const str *s) {
9191
goto error;
9292
ext = (void *) p->s;
9393
err = "short packet (header extensions)";
94-
if (str_shift(p, sizeof(*ext) + 4 + ntohs(ext->length) * 4))
94+
if (str_shift(p, sizeof(*ext) + ntohs(ext->length) * 4))
9595
goto error;
9696
}
9797

0 commit comments

Comments
 (0)