From: Jeet Chaudhuri Date: Thu, 7 Dec 2006 23:32:22 +0000 (+0200) Subject: [PATCH] IrDA: Incorrect TTP header reservation X-Git-Tag: v2.6.19.1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d58808bcc7cb732a4f62af1105d46757d3167e57;p=thirdparty%2Fkernel%2Fstable.git [PATCH] IrDA: Incorrect TTP header reservation 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 --- diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 3c2e70b77df16..da73e63ba5a68 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c @@ -1099,7 +1099,7 @@ int irttp_connect_request(struct tsap_cb *self, __u8 dtsap_sel, 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; /* @@ -1348,7 +1348,7 @@ int irttp_connect_response(struct tsap_cb *self, __u32 max_sdu_size, 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; /*