From patchwork Tue Mar 13 19:50:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Mesoraca X-Patchwork-Id: 10280639 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 8B10E6038F for ; Tue, 13 Mar 2018 19:51:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70ECB2846C for ; Tue, 13 Mar 2018 19:51:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FA10285A6; Tue, 13 Mar 2018 19:51:36 +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 E74FF285E5 for ; Tue, 13 Mar 2018 19:50:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752238AbeCMTuj (ORCPT ); Tue, 13 Mar 2018 15:50:39 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:46233 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751606AbeCMTui (ORCPT ); Tue, 13 Mar 2018 15:50:38 -0400 Received: by mail-wr0-f196.google.com with SMTP id m12so2080977wrm.13; Tue, 13 Mar 2018 12:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=z3LpzP0/rt/gJXoQPm132osZo5pA7pNwvqGehVEpDeI=; b=RrfBxtQdiA2UlR0iHJ4robya5A8zuMNlobAob6Jh9CWzecwRuBx8+ftY7JJHAKCQAZ 73ODNfOXUYLcIKTvkxNTN0Lch+2shUpfwBvg2Vp/PJ417FAqhOPLWOJLEUymjVwv2hV+ rn2yLxsbVZu9D2PrEQ5xG7iVpj4TMI+t7eSjRjdlDRq3DZM1/a3KpmqGM7M5+pOaBmI4 dQziJ8L9OurVnDGOd60VsTCmk2Qescq0gJfSfJkbakYJ54oCcb4nGkbc1ahyVOSVqk1s zRDsClrw5lqTiTYBGzYk+Dtg1BZaIKxRo/qRm+RQTYRmLko0K5VK7gONJyI3pcNmihVo uTlw== 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; bh=z3LpzP0/rt/gJXoQPm132osZo5pA7pNwvqGehVEpDeI=; b=k+W2KjlYcKfAd+DnVaVSGNVCWCd0JB7i8CXlh+YDDfneyUchUNMqRwua1Xei54pTKu g7pMqgpTV++5815m3hZBQYQCPOzg1OvxRNUfvwCQ/DjR3u2kV88Z9NZpOuHPhu9QH2Be Jh/W5c/gqqrDjil2f7rSTIB5920rTfxmx1FxqKmO34XPfnoD7HkJkmg55KmbIZmKS8iO /FIcGLnFzcl4Q9uHTCEL/RVebusrSNB955s0em/W3IQYFJSwamaEpy4DEMalBxVp4F0w Q4oDLfD47omzUrecku3xm8Cqt0KkBv1Qo8Cs5E6Mtwaskvv8LC8sFc71ql7fIwLVqiFH ZfLg== X-Gm-Message-State: AElRT7H6wS4LdPVlYgOg1dywnPza5h9/COc5KkRBBUsnbMVTi0fpzjEk J1cTNxEtWs6gXt6eTbgbv7TEbG6JJBI= X-Google-Smtp-Source: AG47ELtJnZRZc1hMCBv58gO8jwFvt/ZdzXjrUFe3sRadOSsfUAt2KosSIDuZ3F+3x4CiJsYWnHHC3g== X-Received: by 10.223.172.167 with SMTP id o36mr1693158wrc.34.1520970636967; Tue, 13 Mar 2018 12:50:36 -0700 (PDT) Received: from localhost ([37.176.236.47]) by smtp.gmail.com with ESMTPSA id z18sm942349wrh.2.2018.03.13.12.50.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 12:50:36 -0700 (PDT) From: Salvatore Mesoraca To: linux-kernel@vger.kernel.org Cc: kernel-hardening@lists.openwall.com, linux-btrfs@vger.kernel.org, Chris Mason , David Sterba , Josef Bacik , Kees Cook , Salvatore Mesoraca Subject: [PATCH] Btrfs: drop a VLA in btrfs_check_super_csum() Date: Tue, 13 Mar 2018 20:50:22 +0100 Message-Id: <1520970622-19535-1-git-send-email-s.mesoraca16@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid a VLA[1] by using a real constant expression instead of a variable. The compiler should be able to optimize the original code and avoid using an actual VLA. Anyway this change is useful because it will avoid a false positive with -Wvla, it might also help the compiler generating better code. [1] https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Salvatore Mesoraca --- fs/btrfs/disk-io.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 21f34ad..88cef92 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -403,8 +403,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, if (csum_type == BTRFS_CSUM_TYPE_CRC32) { u32 crc = ~(u32)0; - const int csum_size = sizeof(crc); - char result[csum_size]; + char result[sizeof(crc)]; /* * The super_block structure does not span the whole @@ -415,7 +414,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, crc, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE); btrfs_csum_final(crc, result); - if (memcmp(raw_disk_sb, result, csum_size)) + if (memcmp(raw_disk_sb, result, sizeof(result))) ret = 1; }