From: Chris Wright Date: Mon, 11 Dec 2006 22:23:24 +0000 (-0800) Subject: irda fix for 2.6.18 X-Git-Tag: v2.6.18.6~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea104701f4d0cc79fa6ddf810866c8b17fbd664c;p=thirdparty%2Fkernel%2Fstable-queue.git irda fix for 2.6.18 --- diff --git a/queue-2.6.18/irda-incorrect-ttp-header-reservation.patch b/queue-2.6.18/irda-incorrect-ttp-header-reservation.patch new file mode 100644 index 00000000000..cbb28999165 --- /dev/null +++ b/queue-2.6.18/irda-incorrect-ttp-header-reservation.patch @@ -0,0 +1,42 @@ +From stable-bounces@linux.kernel.org Thu Dec 7 15:37:55 2006 +Date: Fri, 8 Dec 2006 01:32:22 +0200 +From: Samuel Ortiz +To: stable@kernel.org +Message-ID: <20061207233222.GA4549@sortiz.org> +Cc: "David S. Miller" +Subject: IrDA: Incorrect TTP header reservation + +From: Jeet Chaudhuri + +We must reserve SAR + MAX_HEADER bytes for IrLMP to fit in. +This fixes an oops reported (and fixed) by Jeet Chaudhuri, when max_sdu_size +is greater than 0. + +Signed-off-by: Samuel Ortiz +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright + +--- + net/irda/irttp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.18.5.orig/net/irda/irttp.c ++++ linux-2.6.18.5/net/irda/irttp.c +@@ -1098,7 +1098,7 @@ int irttp_connect_request(struct tsap_cb + return -ENOMEM; + + /* Reserve space for MUX_CONTROL and LAP header */ +- skb_reserve(tx_skb, TTP_MAX_HEADER); ++ skb_reserve(tx_skb, TTP_MAX_HEADER + TTP_SAR_HEADER); + } else { + tx_skb = userdata; + /* +@@ -1346,7 +1346,7 @@ int irttp_connect_response(struct tsap_c + return -ENOMEM; + + /* Reserve space for MUX_CONTROL and LAP header */ +- skb_reserve(tx_skb, TTP_MAX_HEADER); ++ skb_reserve(tx_skb, TTP_MAX_HEADER + TTP_SAR_HEADER); + } else { + tx_skb = userdata; + /* diff --git a/queue-2.6.18/series b/queue-2.6.18/series index 72e5426f212..cbd07eb25a9 100644 --- a/queue-2.6.18/series +++ b/queue-2.6.18/series @@ -11,3 +11,4 @@ sunhme-fix-for-sunhme-failures-on-x86.patch xfrm-use-output-device-disable_xfrm-for-forwarded-packets.patch dm-snapshot-fix-freeing-pending-exception.patch ipsec-fix-inetpeer-leak-in-ipv4-xfrm-dst-entries.patch +irda-incorrect-ttp-header-reservation.patch