* Re: [PATCH 2/3] [LLC]: bogus llc packet length
[not found] <47e7678b.1aba720a.6925.fffff466@mx.google.com>
@ 2008-03-24 16:43 ` Arnaldo Carvalho de Melo
2008-03-25 5:16 ` Joonwoo Park
0 siblings, 1 reply; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2008-03-24 16:43 UTC (permalink / raw)
To: joonwpark81; +Cc: davem, netdev
Em Mon, Mar 24, 2008 at 05:34:16PM +0900, joonwpark81@gmail.com escreveu:
> From: Joonwoo Park <joonwpark81@gmail.com>
>
> discard llc packet which has bogus packet length.
>
> Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
> ---
> diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
> index c40c9b2..a2bbc7c 100644
> --- a/net/llc/llc_input.c
> +++ b/net/llc/llc_input.c
> @@ -117,8 +117,12 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
> skb_pull(skb, llc_len);
> if (skb->protocol == htons(ETH_P_802_2)) {
> __be16 pdulen = eth_hdr(skb)->h_proto;
> - u16 data_size = ntohs(pdulen) - llc_len;
> + s32 data_size = ntohs(pdulen) - llc_len;
>
> + if (data_size < 0
> + || ((skb_tail_pointer(skb) - (u8 *)pdu) - llc_len)
> + < data_size)
> + return 0;
Rewrite this as:
if (data_size < 0 ||
((skb_tail_pointer(skb) -
(u8 *)pdu) - llc_len) < data_size)
And stick my:
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
:-)
> if (unlikely(pskb_trim_rcsum(skb, data_size)))
> return 0;
> }
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] [LLC]: bogus llc packet length
2008-03-24 16:43 ` Arnaldo Carvalho de Melo
@ 2008-03-25 5:16 ` Joonwoo Park
0 siblings, 0 replies; 5+ messages in thread
From: Joonwoo Park @ 2008-03-25 5:16 UTC (permalink / raw)
To: davem; +Cc: netdev, joonwpark81, Arnaldo Carvalho de Melo
2008/3/25, Arnaldo Carvalho de Melo <acme@redhat.com>:
> Em Mon, Mar 24, 2008 at 05:34:16PM +0900, joonwpark81@gmail.com escreveu:
> > From: Joonwoo Park <joonwpark81@gmail.com>
> >
> > discard llc packet which has bogus packet length.
> >
> > Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
> > ---
> > diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
> > index c40c9b2..a2bbc7c 100644
> > --- a/net/llc/llc_input.c
> > +++ b/net/llc/llc_input.c
> > @@ -117,8 +117,12 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
> > skb_pull(skb, llc_len);
> > if (skb->protocol == htons(ETH_P_802_2)) {
> > __be16 pdulen = eth_hdr(skb)->h_proto;
> > - u16 data_size = ntohs(pdulen) - llc_len;
> > + s32 data_size = ntohs(pdulen) - llc_len;
> >
> > + if (data_size < 0
> > + || ((skb_tail_pointer(skb) - (u8 *)pdu) - llc_len)
> > + < data_size)
> > + return 0;
>
> Rewrite this as:
>
> if (data_size < 0 ||
> ((skb_tail_pointer(skb) -
> (u8 *)pdu) - llc_len) < data_size)
Thanks Arnaldo.
Dave, I'll update this with the others.
>
> And stick my:
>
> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> :-)
Thanks,
Joonwoo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/3] [LLC]: bogus llc packet length
@ 2008-03-28 7:59 Joonwoo Park
2008-03-28 13:13 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 5+ messages in thread
From: Joonwoo Park @ 2008-03-28 7:59 UTC (permalink / raw)
To: davem; +Cc: Joonwoo Park, Arnaldo Carvalho de Melo, netdev
discard llc packet which has bogus packet length.
Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
net/llc/llc_input.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index c40c9b2..bfd2567 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -117,8 +117,12 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
skb_pull(skb, llc_len);
if (skb->protocol == htons(ETH_P_802_2)) {
__be16 pdulen = eth_hdr(skb)->h_proto;
- u16 data_size = ntohs(pdulen) - llc_len;
+ s32 data_size = ntohs(pdulen) - llc_len;
+ if (data_size < 0 ||
+ ((skb_tail_pointer(skb) -
+ (u8 *)pdu) - llc_len) < data_size)
+ return 0;
if (unlikely(pskb_trim_rcsum(skb, data_size)))
return 0;
}
--
1.5.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] [LLC]: bogus llc packet length
2008-03-28 7:59 [PATCH 2/3] [LLC]: bogus llc packet length Joonwoo Park
@ 2008-03-28 13:13 ` Arnaldo Carvalho de Melo
2008-03-28 23:27 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2008-03-28 13:13 UTC (permalink / raw)
To: Joonwoo Park; +Cc: davem, Arnaldo Carvalho de Melo, netdev
Em Fri, Mar 28, 2008 at 04:59:35PM +0900, Joonwoo Park escreveu:
> discard llc packet which has bogus packet length.
>
> Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Dave, can you please apply this one?
> net/llc/llc_input.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
> index c40c9b2..bfd2567 100644
> --- a/net/llc/llc_input.c
> +++ b/net/llc/llc_input.c
> @@ -117,8 +117,12 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
> skb_pull(skb, llc_len);
> if (skb->protocol == htons(ETH_P_802_2)) {
> __be16 pdulen = eth_hdr(skb)->h_proto;
> - u16 data_size = ntohs(pdulen) - llc_len;
> + s32 data_size = ntohs(pdulen) - llc_len;
>
> + if (data_size < 0 ||
> + ((skb_tail_pointer(skb) -
> + (u8 *)pdu) - llc_len) < data_size)
> + return 0;
> if (unlikely(pskb_trim_rcsum(skb, data_size)))
> return 0;
> }
> --
> 1.5.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] [LLC]: bogus llc packet length
2008-03-28 13:13 ` Arnaldo Carvalho de Melo
@ 2008-03-28 23:27 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2008-03-28 23:27 UTC (permalink / raw)
To: acme; +Cc: joonwpark81, netdev
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 28 Mar 2008 10:13:17 -0300
> Em Fri, Mar 28, 2008 at 04:59:35PM +0900, Joonwoo Park escreveu:
> > discard llc packet which has bogus packet length.
> >
> > Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
> > Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Dave, can you please apply this one?
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-03-28 23:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-28 7:59 [PATCH 2/3] [LLC]: bogus llc packet length Joonwoo Park
2008-03-28 13:13 ` Arnaldo Carvalho de Melo
2008-03-28 23:27 ` David Miller
[not found] <47e7678b.1aba720a.6925.fffff466@mx.google.com>
2008-03-24 16:43 ` Arnaldo Carvalho de Melo
2008-03-25 5:16 ` Joonwoo Park
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).