Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947565AbWLIACv (ORCPT ); Fri, 8 Dec 2006 19:02:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1947549AbWLIACn (ORCPT ); Fri, 8 Dec 2006 19:02:43 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:37671 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947547AbWLIACV (ORCPT ); Fri, 8 Dec 2006 19:02:21 -0500 Message-Id: <20061209000140.767367000@sous-sol.org> References: <20061208235751.890503000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Fri, 08 Dec 2006 15:58:13 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Samuel Ortiz , "David S. Miller" , Jeet Chaudhuri Subject: [patch 22/32] IrDA: Incorrect TTP header reservation Content-Disposition: inline; filename=irda-incorrect-ttp-header-reservation.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1403 Lines: 44 -stable review patch. If anyone has any objections, please let us know. ------------------ 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.19.orig/net/irda/irttp.c +++ linux-2.6.19/net/irda/irttp.c @@ -1099,7 +1099,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; /* @@ -1348,7 +1348,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; /* -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/