From patchwork Wed Feb 11 19:33:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 22930 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id D6355DDDAE for ; Thu, 12 Feb 2009 06:33:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756344AbZBKTd0 (ORCPT ); Wed, 11 Feb 2009 14:33:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756291AbZBKTdZ (ORCPT ); Wed, 11 Feb 2009 14:33:25 -0500 Received: from mail-bw0-f161.google.com ([209.85.218.161]:41768 "EHLO mail-bw0-f161.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756145AbZBKTdY (ORCPT ); Wed, 11 Feb 2009 14:33:24 -0500 Received: by bwz5 with SMTP id 5so523361bwz.13 for ; Wed, 11 Feb 2009 11:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=TTYdAVVVikeko1AB0FaueENDdCXDNEptQ5lxKCiqmKU=; b=K2sYXoM6cp3XUPnOl2qsMJSyw/KdeEsMbr4Gkkavz5o/cHDPY9j81EAcbMIUpWF28X vwMZWBn6lyF62C2H6EEK7rpoK1WtAnt61LXhJhJ81Iki1gRuoAvGqHq2BjO4E2qAcsxg pStek1KvDQXCE65gSFc0UeXfHp64+PJP5hl2Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=ikPOzHK4skJhrcUKtiqiqSYcDmIfSorbbP5gDJReoXUilrZw+dkLnWvQ/K3baP6QkY fhGO+mGv9ZnEvPuyOxDGlxSp4iLkG7JFxGOwxR1TQN6JuSx8YGPdFcyfn/9/ph40gJgH LmmkPKbTtvQL+z18w2BrBG3Rook/pIy2nH9h0= Received: by 10.223.110.144 with SMTP id n16mr1165610fap.63.1234380798825; Wed, 11 Feb 2009 11:33:18 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 1sm2763473nfv.30.2009.02.11.11.33.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Feb 2009 11:33:18 -0800 (PST) Message-ID: <49932805.7050309@gmail.com> Date: Wed, 11 Feb 2009 20:33:25 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: Jarek Poplawski CC: "David S. Miller" , netdev@vger.kernel.org, Andrew Morton Subject: Re: [PATCH] net: off by one, try #2 References: <20090211133341.GB12362@ff.dom.local> <4992DF3C.7070802@gmail.com> <20090211171403.GA2539@ami.dom.local> In-Reply-To: <20090211171403.GA2539@ami.dom.local> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jarek Poplawski wrote: > On Wed, Feb 11, 2009 at 03:22:52PM +0100, Roel Kluin wrote: >>>> With while (x++ < n) { ... } x can reach n+1. >>> Yes, but it looks like here is even more... >>> i is also misused here and array can be overriden, so additional >>> break/return is needed. >> Thanks, is this how it should be? > > It looks (almost) OK to me. :-) Except this > 80 line. > > On the other hand, I wonder if it's not a good time to make it more > readable; I mean the first while (): length, ";", and maybe ++j > similarly to i now? > > BTW, I hope you remember about irda. > > Jarek P. Thanks again for reviewing, how's this? with irda this time. -------------------->8----------------8<----------------------- With while (x++ < n) { ... } x can reach n+1. As Jarek Poplawski pointed out, array pcb->data.raw was not correctly used. Signed-off-by: Roel Kluin --- -- 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 diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 6124605..4ade64a 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c @@ -493,15 +493,21 @@ static bool receive_pcb(struct net_device *dev, pcb_struct * pcb) } /* read the data */ spin_lock_irqsave(&adapter->lock, flags); - i = 0; - do { - j = 0; - while (((stat = get_status(dev->base_addr)) & ACRF) == 0 && j++ < 20000); - pcb->data.raw[i++] = inb_command(dev->base_addr); - if (i > MAX_PCB_DATA) - INVALID_PCB_MSG(i); - } while ((stat & ASF_PCB_MASK) != ASF_PCB_END && j < 20000); + for (i = 0; i < MAX_PCB_DATA; i++) { + for (j = 0; j < 20000; j++) { + stat = get_status(dev->base_addr); + if (stat & ACRF) + break; + } + pcb->data.raw[i] = inb_command(dev->base_addr); + if (stat & ASF_PCB_MASK == ASF_PCB_END || j >= 20000) + break; + } spin_unlock_irqrestore(&adapter->lock, flags); + if (i >= MAX_PCB_DATA) { + INVALID_PCB_MSG(i); + return false; + } if (j >= 20000) { TIMEOUT_MSG(__LINE__); return false; diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index 7eafdca..85e88da 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c @@ -585,7 +585,7 @@ static int mcs_speed_change(struct mcs_cb *mcs) mcs_get_reg(mcs, MCS_RESV_REG, &rval); } while(cnt++ < 100 && (rval & MCS_IRINTX)); - if(cnt >= 100) { + if (cnt > 100) { IRDA_ERROR("unable to change speed\n"); ret = -EIO; goto error;