From: Greg Kroah-Hartman Date: Mon, 9 Oct 2023 13:00:10 +0000 (+0200) Subject: fix up queue-4.14/dccp-fix-dccp_v4_err-dccp_v6_err-again.patch X-Git-Tag: v4.14.327~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2448da727e9221db1d571cc07ac64ebd7bdf3e9e;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.14/dccp-fix-dccp_v4_err-dccp_v6_err-again.patch Wrong return type --- diff --git a/queue-4.14/dccp-fix-dccp_v4_err-dccp_v6_err-again.patch b/queue-4.14/dccp-fix-dccp_v4_err-dccp_v6_err-again.patch index 5441502bfb4..91b372db0a8 100644 --- a/queue-4.14/dccp-fix-dccp_v4_err-dccp_v6_err-again.patch +++ b/queue-4.14/dccp-fix-dccp_v4_err-dccp_v6_err-again.patch @@ -83,15 +83,13 @@ Reviewed-by: Jann Horn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - net/dccp/ipv4.c | 9 ++------- - net/dccp/ipv6.c | 9 ++------- + net/dccp/ipv4.c | 9 ++------- + net/dccp/ipv6.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) -diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c -index b2fc9ef7708f2..1e71fca79c2fd 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c -@@ -247,13 +247,8 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) +@@ -247,13 +247,8 @@ static void dccp_v4_err(struct sk_buff * int err; struct net *net = dev_net(skb->dev); @@ -103,15 +101,13 @@ index b2fc9ef7708f2..1e71fca79c2fd 100644 - * beyond 8 bytes, so we have to pskb_may_pull() ourselves. - */ + if (!pskb_may_pull(skb, offset + sizeof(*dh))) -+ return -EINVAL; ++ return; dh = (struct dccp_hdr *)(skb->data + offset); if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh))) return; -diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c -index f8d8caa967b11..889613b7a0c39 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c -@@ -80,13 +80,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, +@@ -80,13 +80,8 @@ static void dccp_v6_err(struct sk_buff * __u64 seq; struct net *net = dev_net(skb->dev); @@ -123,10 +119,7 @@ index f8d8caa967b11..889613b7a0c39 100644 - * beyond 8 bytes, so we have to pskb_may_pull() ourselves. - */ + if (!pskb_may_pull(skb, offset + sizeof(*dh))) -+ return -EINVAL; ++ return; dh = (struct dccp_hdr *)(skb->data + offset); if (!pskb_may_pull(skb, offset + __dccp_basic_hdr_len(dh))) return; --- -2.40.1 -