From patchwork Mon Apr 13 01:11:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 25870 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 6671ADE143 for ; Mon, 13 Apr 2009 11:15:33 +1000 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from hera.kernel.org (hera.kernel.org [140.211.167.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BAEC6DE117; Mon, 13 Apr 2009 11:15:29 +1000 (EST) Received: from hera.kernel.org (IDENT:U2FsdGVkX1/z6LIIGnc1JPNlhiazdBqd8UG8LZdIxNA@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n3D1FNb3005902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 13 Apr 2009 01:15:23 GMT Received: (from geoff@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n3D1FNia005901; Mon, 13 Apr 2009 01:15:23 GMT Message-Id: <20090413011136.561095822@am.sony.com> References: <20090413011136.475152916@am.sony.com> In-Reply-To: <20090413011136.475152916@am.sony.com> User-Agent: quilt/0.46-1 Date: Sun, 12 Apr 2009 18:11:37 -0700 From: Geoff Levand To: Jeremy Kerr Content-Disposition: inline; filename=fix-memmove-size.diff X-Virus-Scanned: ClamAV 0.93.3/9226/Sun Apr 12 20:02:45 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Mon, 13 Apr 2009 01:15:25 +0000 (UTC) Cc: cbe-oss-dev@ozlabs.org Subject: [Cbe-oss-dev] [patch 01/24] petitboot: Fix memmove size X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Correct the byte count for several memmove calls. Signed-off-by: Geoff Levand --- lib/waiter/waiter.c | 3 ++- ui/common/discover-client.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) --- a/lib/waiter/waiter.c +++ b/lib/waiter/waiter.c @@ -43,7 +43,8 @@ void waiter_remove(struct waiter *waiter assert(i >= 0 && i < n_waiters); n_waiters--; - memmove(&waiters[i], &waiters[i+1], n_waiters - i); + memmove(&waiters[i], &waiters[i+1], + (n_waiters - i) * sizeof(waiters[0])); waiters = talloc_realloc(NULL, waiters, struct waiter, n_waiters); } --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -111,7 +111,7 @@ static void device_remove(struct discove /* remove the device from the client's device array */ client->n_devices--; memmove(&client->devices[i], &client->devices[i+1], - client->n_devices - i); + (client->n_devices - i) * sizeof(client->devices[0])); client->devices = talloc_realloc(client, client->devices, struct device *, client->n_devices);