From patchwork Tue Jun 22 07:26:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 56409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 88C32B6F05 for ; Tue, 22 Jun 2010 17:25:50 +1000 (EST) Received: from localhost ([127.0.0.1]:52994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OQxrW-0000nu-8s for incoming@patchwork.ozlabs.org; Tue, 22 Jun 2010 03:25:38 -0400 Received: from [140.186.70.92] (port=35222 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OQxqy-0000nT-BZ for qemu-devel@nongnu.org; Tue, 22 Jun 2010 03:25:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OQxqw-0005zd-QY for qemu-devel@nongnu.org; Tue, 22 Jun 2010 03:25:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56508) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OQxqw-0005zD-K0 for qemu-devel@nongnu.org; Tue, 22 Jun 2010 03:25:02 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5M7OxNd022597 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Jun 2010 03:24:59 -0400 Received: from localhost (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5M7OuOb025152; Tue, 22 Jun 2010 03:24:58 -0400 From: Amit Shah To: qemu list Date: Tue, 22 Jun 2010 12:56:26 +0530 Message-Id: <8565079cfd2bbfe3cba8c4f073d4c142937e3dee.1277191581.git.amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , "Kirill A. Shutemov" , Anthony Liguori , Juan Quintela Subject: [Qemu-devel] [PATCH STABLE-0.12] block/vvfat.c: fix warnings with _FORTIFY_SOURCE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Kirill A. Shutemov CC block/vvfat.o cc1: warnings being treated as errors block/vvfat.c: In function 'commit_one_file': block/vvfat.c:2259: error: ignoring return value of 'ftruncate', declared with attribute warn_unused_result make: *** [block/vvfat.o] Error 1 CC block/vvfat.o In file included from /usr/include/stdio.h:912, from ./qemu-common.h:19, from block/vvfat.c:27: In function 'snprintf', inlined from 'init_directories' at block/vvfat.c:871, inlined from 'vvfat_open' at block/vvfat.c:1068: /usr/include/bits/stdio2.h:65: error: call to __builtin___snprintf_chk will always overflow destination buffer make: *** [block/vvfat.o] Error 1 Signed-off-by: Kirill A. Shutemov Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori (cherry picked from commit 2dedf83ef0cc3463783d6b71bf1b25476f691f3a) Signed-off-by: Amit Shah Acked-by: Juan Quintela --- block/vvfat.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index c1acb35..592d6e6 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -868,7 +868,8 @@ static int init_directories(BDRVVVFATState* s, { direntry_t* entry=array_get_next(&(s->directory)); entry->attributes=0x28; /* archive | volume label */ - snprintf((char*)entry->name,11,"QEMU VVFAT"); + memcpy(entry->name,"QEMU VVF",8); + memcpy(entry->extension,"AT ",3); } /* Now build FAT, and write back information into directory */ @@ -2256,7 +2257,11 @@ static int commit_one_file(BDRVVVFATState* s, c = c1; } - ftruncate(fd, size); + if (ftruncate(fd, size)) { + perror("ftruncate()"); + close(fd); + return -4; + } close(fd); return commit_mappings(s, first_cluster, dir_index);