From patchwork Wed May 9 09:23:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Meyering X-Patchwork-Id: 157972 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 87C15B6FA1 for ; Thu, 10 May 2012 00:23:24 +1000 (EST) Received: from localhost ([::1]:58363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SS6Vz-0007JI-Ow for incoming@patchwork.ozlabs.org; Wed, 09 May 2012 09:01:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SS38C-00063P-Ez for qemu-devel@nongnu.org; Wed, 09 May 2012 05:24:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SS383-00025m-JB for qemu-devel@nongnu.org; Wed, 09 May 2012 05:24:24 -0400 Received: from mx.meyering.net ([88.168.87.75]:36916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SS383-000242-Bq for qemu-devel@nongnu.org; Wed, 09 May 2012 05:24:15 -0400 Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id B66CE606E8; Wed, 9 May 2012 11:24:12 +0200 (CEST) From: Jim Meyering To: qemu-devel@nongnu.org Date: Wed, 9 May 2012 11:23:49 +0200 Message-Id: <1336555446-20180-6-git-send-email-jim@meyering.net> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1336555446-20180-1-git-send-email-jim@meyering.net> References: <1336555446-20180-1-git-send-email-jim@meyering.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 88.168.87.75 X-Mailman-Approved-At: Wed, 09 May 2012 08:59:40 -0400 Cc: Jim Meyering , Anthony Liguori Subject: [Qemu-devel] [PATCH 05/22] lm32: avoid buffer overrun 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 From: Jim Meyering Actually do what the comment says, using pstrcpy to NUL-terminate: strncpy does not always do that. Signed-off-by: Jim Meyering --- hw/lm32_hwsetup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/lm32_hwsetup.h b/hw/lm32_hwsetup.h index 8fc285e..70dc61f 100644 --- a/hw/lm32_hwsetup.h +++ b/hw/lm32_hwsetup.h @@ -96,7 +96,7 @@ static inline void hwsetup_add_tag(HWSetup *hw, enum hwsetup_tag t) static inline void hwsetup_add_str(HWSetup *hw, const char *str) { - strncpy(hw->ptr, str, 31); /* make sure last byte is zero */ + pstrcpy(hw->ptr, 32, str); hw->ptr += 32; }