From patchwork Tue Jan 21 23:36:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3521141 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1B659F2ED for ; Tue, 21 Jan 2014 23:36:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 192AD20103 for ; Tue, 21 Jan 2014 23:36:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8918520149 for ; Tue, 21 Jan 2014 23:36:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754462AbaAUXgx (ORCPT ); Tue, 21 Jan 2014 18:36:53 -0500 Received: from mail-wg0-f47.google.com ([74.125.82.47]:53218 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221AbaAUXgq (ORCPT ); Tue, 21 Jan 2014 18:36:46 -0500 Received: by mail-wg0-f47.google.com with SMTP id m15so8462845wgh.26 for ; Tue, 21 Jan 2014 15:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=x1xy93mSN6ok4XSAceM+HKlPynnIcwS/rdlv+1+mkKc=; b=iyI8eXB/CIdUMheRzQ90y0Exr4nKBKM50GCHFn8AXmGjLvXpitSuZjNk8U9iBr+cd9 jmQBX1dnLatPwMlgtUtEQq1Me3ACmh+4oEi7dK/ouwILT/upRnkqeKrEdIdXpH5bMG3u 6XtkeagGGoP3eKXGk08AV9j2Pc021j/vAsIb4zt5nfihYkb6kAWpAZufRvLeXIuMd19/ 4LV7ILvonqClMYhWKW1oF8IVuj5kdss3fb07hiolaJrJCaAF7x2QQtxWuQGsv0CXLWDI l4enSMSsC6CbEvz2BNlj3J1fIBxNRrGpZqSt1xAgM5GmhfHByGg2YrQvxxQyTOQcOdAY pdkQ== X-Received: by 10.181.5.65 with SMTP id ck1mr4940282wid.57.1390347405123; Tue, 21 Jan 2014 15:36:45 -0800 (PST) Received: from storm-desktop.lan (bl10-142-212.dsl.telepac.pt. [85.243.142.212]) by mx.google.com with ESMTPSA id dm2sm14046439wib.8.2014.01.21.15.36.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 15:36:44 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: fix snprintf usage by send's gen_unique_name Date: Tue, 21 Jan 2014 23:36:38 +0000 Message-Id: <1390347398-6490-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.3 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 buffer size argument passed to snprintf must account for the trailing null byte added by snprintf, and it returns a value >= then sizeof(buffer) when the string can't fit in the buffer. Since our buffer has a size of 64 characters, and the maximum orphan name we can generate is 63 characters wide, we must pass 64 as the buffer size to snprintf, and not 63. Signed-off-by: Filipe David Borba Manana Reviewed-by: David Sterba --- fs/btrfs/send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 84aed2f..27edc5e 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1336,7 +1336,7 @@ static int gen_unique_name(struct send_ctx *sctx, return -ENOMEM; while (1) { - len = snprintf(tmp, sizeof(tmp) - 1, "o%llu-%llu-%llu", + len = snprintf(tmp, sizeof(tmp), "o%llu-%llu-%llu", ino, gen, idx); if (len >= sizeof(tmp)) { /* should really not happen */