From patchwork Thu Jul 25 09:32:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 2833287 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6724FC0319 for ; Thu, 25 Jul 2013 09:32:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D7E52025A for ; Thu, 25 Jul 2013 09:32:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 257A820249 for ; Thu, 25 Jul 2013 09:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755542Ab3GYJcy (ORCPT ); Thu, 25 Jul 2013 05:32:54 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:41120 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755444Ab3GYJcv (ORCPT ); Thu, 25 Jul 2013 05:32:51 -0400 Received: by mail-pd0-f182.google.com with SMTP id r10so1476874pdi.41 for ; Thu, 25 Jul 2013 02:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=RmQTWcpA4D/mWFIpJmDJpflyWRDlt5xpCr802B1dZiU=; b=VHxfZjFoGKfgRhwn9YAVY4pwKsGz5KjL9138hf6fag4/2hOmju0dVN2Cv9K5hvzLY3 9sgfiYpAXw8vAAXxHfIa8m6pT88B/rjYuQl1HbOOe/F3Tg75QTolVMmMHcfU9NvylSOH j88DC8o4Fw8QrYxpDDFarECYaAHHxz6cT/QAYnq68wgPjFaWkUwdzQUXPSoWMA/fWFC4 nUpZQ3kG7VaGu63kSIIHHQqOeYf1nWHgDb3T6DwsJh9y+50cPS3Wrj5ku/dNGx4nkKbv PTVKw/OTpjsDkRoH33zXiXWaMAgm+w/TpMpdA0wnuTJvDtzv7kaNSjXZRlJCQMnHWJME 3exg== X-Received: by 10.69.10.129 with SMTP id ea1mr46937245pbd.107.1374744771185; Thu, 25 Jul 2013 02:32:51 -0700 (PDT) Received: from localhost ([203.114.244.88]) by mx.google.com with ESMTPSA id 7sm49200167paf.22.2013.07.25.02.32.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 02:32:50 -0700 (PDT) From: Eryu Guan To: linux-btrfs@vger.kernel.org Cc: Eryu Guan Subject: [PATCH] btrfs-progs: fix segfault when listing column OTIME on big endian host Date: Thu, 25 Jul 2013 17:32:29 +0800 Message-Id: <1374744749-12231-1-git-send-email-guaneryu@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The second btrfs command segfaults on big endian host(ppc64) btrfs subvolume snapshot /mnt/btrfs /mnt/btrfs/snap btrfs subvolume list -s /mnt/btrfs And ltrace shows localtime(0x10029c482d0) = 0 strftime( --- SIGSEGV (Segmentation fault) --- The corresponding code btrfs-list.c: case BTRFS_LIST_OTIME: if (subv->otime) strftime(tstr, 256, "%Y-%m-%d %X", localtime(&subv->otime)); else strcpy(tstr, "-"); printf("%s", tstr); break; localtime() returned NULL then strftime() got SIGSEGV. The reason is that ri->otime.sec is stored as little endian but assigned to 't' without conversion. Signed-off-by: Eryu Guan --- btrfs-list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btrfs-list.c b/btrfs-list.c index 4fab858..ca1bae8 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -1052,7 +1052,7 @@ static int __list_subvol_search(int fd, struct root_lookup *root_lookup) flags = btrfs_root_flags(ri); if(sh.len > sizeof(struct btrfs_root_item_v0)) { - t = ri->otime.sec; + t = le64_to_cpu(ri->otime.sec); ogen = btrfs_root_otransid(ri); memcpy(uuid, ri->uuid, BTRFS_UUID_SIZE); memcpy(puuid, ri->parent_uuid, BTRFS_UUID_SIZE);