From patchwork Fri Feb 2 19:11:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Benatto X-Patchwork-Id: 10198041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6136060388 for ; Fri, 2 Feb 2018 19:11:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5224128F59 for ; Fri, 2 Feb 2018 19:11:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 467C928F5B; Fri, 2 Feb 2018 19:11:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A664828F59 for ; Fri, 2 Feb 2018 19:11:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbeBBTLa (ORCPT ); Fri, 2 Feb 2018 14:11:30 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:39249 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752527AbeBBTL3 (ORCPT ); Fri, 2 Feb 2018 14:11:29 -0500 Received: by mail-qk0-f196.google.com with SMTP id n129so14519370qke.6 for ; Fri, 02 Feb 2018 11:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6rBeSarmgFSDoujRY54tAdcA3AwnXUv1doU/4myRHzQ=; b=mr1f0W6miXIEfXlj03GZbKuPSC5L/ulawZBQqAYaKL9YY5aRsDqtTqiI/3uLFKfvSK 9eG9yCvy7xlvW87LmYak2afpMrpNuJrBnmxeSBQ1bVYEtWJakCKqOLaym6pJnDhwIwxI DneHbZwe/Lkc1YRkeTv9Pk5usDDMxcJ3qnlh2jljiqfwX8ScddYH5rGSS/YzTvOVNvCp zJkhge7vhJwHqeyoNp4ltxj/f9W4k6rf/Pm7YR56Kp55PCJa6EpcjhC46mrczKEw4FGb RRJxpptKqFgEWCWCw/x/UOw2y3c6fcrp1QVttAev8n+zt8Cr5qpKv4ObNp6MFU0vPXWy QvUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6rBeSarmgFSDoujRY54tAdcA3AwnXUv1doU/4myRHzQ=; b=du398LS5fOEn6zHfZDs9EarVMw51BHO5qUkqvXFJ+vsffAjaXOdiFvu9zcbOhvnVDi vr1Athciz6ZaUdWUJ8/TN0cU9wtEUJX4F0zxEsizGydpxY+HWxxQ3lC5hNxvuN7eSREt GTDEGC7wmqtzvPlgnJJzrDvfkHupO83FO/X4CDzq67fn3ftT7x/b4dHoEn960SgLLkZm nmVk8mFzKb41vuqsZ/8pjTyCgFznCTF2dJpQFsXiLpioWWEhfG7d2qChAqZ8j5u3Wg2s EU6yxvnpUjHSg/vMwSjDVgJjW4rNo6diKw+UYHGIhQ82eqBKHG/lgBuggFCgEkUGcQ+u NdOA== X-Gm-Message-State: APf1xPADo95px1n+wxNCgAFaCPhT4DdUgtjTiNNvpGCHTKsyjphgKl1E zN7YU6Y7h6SGqfCzdVR+BUsvPA== X-Google-Smtp-Source: AH8x227xLgJKf20KZoYAVcwquf3Uc725VHLyQBUdWMcSCpKEmCNjbmNSOt48rzIl/vJbP/znEuDX5Q== X-Received: by 10.55.66.76 with SMTP id p73mr10073352qka.300.1517598688209; Fri, 02 Feb 2018 11:11:28 -0800 (PST) Received: from testarossa.localdomain ([191.177.187.140]) by smtp.googlemail.com with ESMTPSA id e16sm1840444qtk.32.2018.02.02.11.11.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2018 11:11:27 -0800 (PST) From: Marco A Benatto To: linux-xfs@vger.kernel.org Cc: mbenatto@redhat.com Subject: [PATCH 2/2] xfs_mdrestore: Don't rewind source file stream Date: Fri, 2 Feb 2018 17:11:14 -0200 Message-Id: <1517598674-52297-2-git-send-email-marco.antonio.780@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517598674-52297-1-git-send-email-marco.antonio.780@gmail.com> References: <1517598674-52297-1-git-send-email-marco.antonio.780@gmail.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Today, xfs_mdrestore from stdin will fail if the -i flag is specified, because it attempts to rewind the stream after the initial read of the metablock. This fails, and results in an abort with "specified file is not a metadata dump." Read the metablock exactly once in main(), validate the magic, print informational flags if requested, and then pass it to perform_restore() which will then continue the restore process. Reported-by: Darrick J. Wong Signed-off-by: Marco A Benatto --- mdrestore/xfs_mdrestore.c | 52 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index 0bb4ac8..15231a1 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -51,11 +51,22 @@ print_progress(const char *fmt, ...) progress_since_warning = 1; } +/* + * perform_restore() -- do the actual work to restore the metadump + * + * @src_f: A FILE pointer to the source metadump + * @dst_fd: the file descriptor for the target file + * @is_target_file: designates whether the target is a regular file + * @mb: the metadump's first xfs_metablock_t, read and verified by the caller + * + * src_f should be positioned just past a read the previously validated metablock + */ static void perform_restore( FILE *src_f, int dst_fd, - int is_target_file) + int is_target_file, + const xfs_metablock_t tmb) { xfs_metablock_t *metablock; /* header + index + blocks */ __be64 *block_index; @@ -64,22 +75,9 @@ perform_restore( int max_indices; int cur_index; int mb_count; - xfs_metablock_t tmb; xfs_sb_t sb; int64_t bytes_read; - /* - * read in first blocks (superblock 0), set "inprogress" flag for it, - * read in the rest of the file, and if complete, clear SB 0's - * "inprogress flag" - */ - - if (fread(&tmb, sizeof(tmb), 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); - - if (be32_to_cpu(tmb.mb_magic) != XFS_MD_MAGIC) - fatal("specified file is not a metadata dump\n"); - block_size = 1 << tmb.mb_blocklog; max_indices = (block_size - sizeof(xfs_metablock_t)) / sizeof(__be64); @@ -211,6 +209,7 @@ main( int open_flags; struct stat statbuf; int is_target_file; + xfs_metablock_t mb; progname = basename(argv[0]); @@ -237,7 +236,12 @@ main( if (!show_info && argc - optind != 2) usage(); - /* open source */ + /* + * open source and test if this really is a dump. The first metadatablock + * will be passed to perform_restore() which will continue to read the + * file from this point. This avoids rewind the stream, which causes + * restore to fail when source was being read from stdin. + */ if (strcmp(argv[optind], "-") == 0) { src_f = stdin; if (isatty(fileno(stdin))) @@ -248,15 +252,12 @@ main( fatal("cannot open source dump file\n"); } - if (show_info) { - xfs_metablock_t mb; - - if (fread(&mb, sizeof(mb), 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); - - if (be32_to_cpu(mb.mb_magic) != XFS_MD_MAGIC) - fatal("specified file is not a metadata dump\n"); + if (fread(&mb, sizeof(mb), 1, src_f) != 1) + fatal("error reading from file: %s\n", strerror(errno)); + if (be32_to_cpu(mb.mb_magic) != XFS_MD_MAGIC) + fatal("specified file is not a metadata dump\n"); + if (show_info) { if (mb.mb_info & XFS_METADUMP_INFO_FLAGS) { printf("%s: %sobfuscated, %s log, %s metadata blocks\n", argv[optind], @@ -270,9 +271,6 @@ main( if (argc - optind == 1) exit(0); - - /* Go back to the beginning for the restore function */ - fseek(src_f, 0L, SEEK_SET); } optind++; @@ -301,7 +299,7 @@ main( if (dst_fd < 0) fatal("couldn't open target \"%s\"\n", argv[optind]); - perform_restore(src_f, dst_fd, is_target_file); + perform_restore(src_f, dst_fd, is_target_file, mb); close(dst_fd); if (src_f != stdin)