From patchwork Mon Sep 3 20:56:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 181413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C9F7D2C0095 for ; Tue, 4 Sep 2012 06:56:12 +1000 (EST) Received: from localhost ([::1]:34444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8dgo-0006o4-6u for incoming@patchwork.ozlabs.org; Mon, 03 Sep 2012 16:56:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8dgh-0006no-Sm for qemu-devel@nongnu.org; Mon, 03 Sep 2012 16:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T8dgh-0001Dj-3u for qemu-devel@nongnu.org; Mon, 03 Sep 2012 16:56:03 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:49450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8dgg-0001C0-Th for qemu-devel@nongnu.org; Mon, 03 Sep 2012 16:56:03 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id C728A7280029; Mon, 3 Sep 2012 22:56:01 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eOY0MibWqdIC; Mon, 3 Sep 2012 22:56:01 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 3780A728002B; Mon, 3 Sep 2012 22:56:01 +0200 (CEST) From: Stefan Weil To: Andrzej Zaborowski Date: Mon, 3 Sep 2012 22:56:00 +0200 Message-Id: <1346705760-11648-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Cc: Stefan Weil , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] hw/wm8750: Fix potential buffer overflow X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Report from smatch: hw/wm8750.c:369 wm8750_tx(12) error: buffer overflow 's->i2c_data' 2 <= 2 It looks like the preprocessor statements were simply misplaced. Replace also __FUNCTION__ by __func__ to please checkpatch.pl. Signed-off-by: Stefan Weil Reviewed-by: Peter Maydell --- hw/wm8750.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/wm8750.c b/hw/wm8750.c index 11bcec3..44f138f 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -361,10 +361,10 @@ static int wm8750_tx(I2CSlave *i2c, uint8_t data) uint16_t value; if (s->i2c_len >= 2) { - printf("%s: long message (%i bytes)\n", __FUNCTION__, s->i2c_len); #ifdef VERBOSE - return 1; + printf("%s: long message (%i bytes)\n", __func__, s->i2c_len); #endif + return 1; } s->i2c_data[s->i2c_len ++] = data; if (s->i2c_len != 2)