From linux-kernel-owner+willy=40w.ods.org-S264278AbUEIMIV@vger.kernel.org Sun May 9 14:10:05 2004 Return-Path: Received: from willy.net1.nerim.net (vax [10.2.1.2]) by alpha.home.local (8.12.4/8.12.1) with ESMTP id i49CA4dB020322 for ; Sun, 9 May 2004 14:10:05 +0200 Received: from vger.kernel.org (vger.kernel.org [12.107.209.244]) by willy.net1.nerim.net (8.12.9/8.12.1) with ESMTP id i49CA3Cb028600 for ; Sun, 9 May 2004 14:10:04 +0200 (CEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264278AbUEIMIV (ORCPT ); Sun, 9 May 2004 08:08:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264296AbUEIMIV (ORCPT ); Sun, 9 May 2004 08:08:21 -0400 Received: from linuxhacker.ru ([217.76.32.60]:29146 "EHLO shrek.linuxhacker.ru") by vger.kernel.org with ESMTP id S264278AbUEIMIS (ORCPT ); Sun, 9 May 2004 08:08:18 -0400 Received: from shrek.linuxhacker.ru (localhost.localdomain [127.0.0.1]) by shrek.linuxhacker.ru (8.12.8/8.12.8) with ESMTP id i49C8BMF009065; Sun, 9 May 2004 16:08:12 +0400 Received: (from uucp@localhost) by shrek.linuxhacker.ru (8.12.8/8.12.8/Submit) with UUCP id i49C8Bvm009063; Sun, 9 May 2004 16:08:11 +0400 Received: from orc.linuxhacker.ru (orc.linuxhacker.ru [127.0.0.1]) by orc.linuxhacker.ru (8.12.10/8.12.10) with ESMTP id i49C8YZQ013914; Sun, 9 May 2004 15:08:34 +0300 Received: (from green@localhost) by orc.linuxhacker.ru (8.12.10/8.12.10/Submit) id i49C8Y2i013913; Sun, 9 May 2004 15:08:34 +0300 Date: Sun, 9 May 2004 15:08:34 +0300 From: Oleg Drokin To: marcelo.tosatti@cyclades.com, linux-kernel@vger.kernel.org Subject: [2.4] [PATCH] Fix possible memleaks in VIA IrDA driver Message-ID: <20040509120834.GA13899@linuxhacker.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Spam-Status: No, hits=-4.8 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=2.61 X-Spam-Checker-Version: SpamAssassin 2.61 (1.212.2.1-2003-12-09-exp) on shrek.linuxhacker.ru Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org Status: RO Content-Length: 2061 Lines: 74 Hello! Patch below fixes some possible memleaks in VIA IrDA driver, also checks for skb->data being non-NULL are dropped since alloc_skb cannot return such skbs as far as I can see. Bye, Oleg ===== drivers/net/irda/via-ircc.c 1.3 vs edited ===== --- 1.3/drivers/net/irda/via-ircc.c Fri Jan 30 21:14:14 2004 +++ edited/drivers/net/irda/via-ircc.c Sun May 9 15:01:34 2004 @@ -1142,13 +1142,16 @@ st_fifo->head++; st_fifo->len--; - skb = dev_alloc_skb(len + 1 - 4); /* - * if frame size,data ptr,or skb ptr are wrong ,the get next + * if frame size or data ptr are wrong ,then get next * entry. */ - if ((skb == NULL) || (skb->data == NULL) - || (self->rx_buff.data == NULL) || (len < 6)) { + if ((self->rx_buff.data == NULL) || (len < 6)) { + self->stats.rx_dropped++; + return TRUE; + } + skb = dev_alloc_skb(len + 1 - 4); + if (!skb) { self->stats.rx_dropped++; return TRUE; } @@ -1194,8 +1197,12 @@ #ifdef DBGMSG DBG(printk(KERN_INFO "upload_rxdata: len=%x\n", len)); #endif + if ((len - 4) < 2) { + self->stats.rx_dropped++; + return FALSE; + } skb = dev_alloc_skb(len + 1); - if ((skb == NULL) || ((len - 4) < 2)) { + if (!skb) { self->stats.rx_dropped++; return FALSE; } @@ -1258,13 +1265,17 @@ st_fifo->head++; st_fifo->len--; - skb = dev_alloc_skb(len + 1 - 4); /* - * if frame size, data ptr, or skb ptr are wrong, + * if frame size or data ptr are wrong, * then get next entry. */ - if ((skb == NULL) || (skb->data == NULL) - || (self->rx_buff.data == NULL) || (len < 6)) { + if ((self->rx_buff.data == NULL) || (len < 6)) { + self->stats.rx_dropped++; + continue; + } + + skb = dev_alloc_skb(len + 1 - 4); + if (!skb) { self->stats.rx_dropped++; continue; } - 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/