From patchwork Tue May 29 06:21:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 921852 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hys5Skrt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40w3Y35M5Hz9s15 for ; Tue, 29 May 2018 16:22:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754511AbeE2GWC (ORCPT ); Tue, 29 May 2018 02:22:02 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35232 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754205AbeE2GWC (ORCPT ); Tue, 29 May 2018 02:22:02 -0400 Received: by mail-pg0-f66.google.com with SMTP id 15-v6so5802784pge.2; Mon, 28 May 2018 23:22:01 -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=B1KMD9a/bfxsCilZpzbH1VPrBWHVNp+3bNPMXeNDGY8=; b=hys5Skrta+kUxLP9AFbzgpY/wWRcddbkjgUVEo4Z/J7/X3bzdj3j+Qa4NN7oNAkpj+ NfsFAmnqNDVCjBq+pM8SKBGRi0yrvBuAxxgERqu5sxYnPzLqq+2UE9gCTwNy+z+MBxW7 4GD4LtqxZJ/iWhiodygPi4RbGG4mZ+nKo71vXJ69CYPyvvFBKUuQQlSS4eWl49r09rTZ V+j11rYqjOa5pytsq9/05Vf+0hKFXAregkFiG+dcYGP1N06ibneEUXLsKyzjNt8mWHEp h9d86sQN2PenE1/Pjw3UPw7tY/7bkdSE+VbLSHnawnSLdEPZeOfBDkWIZlXCqKIpWHIH 9sJg== 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=B1KMD9a/bfxsCilZpzbH1VPrBWHVNp+3bNPMXeNDGY8=; b=V3kkrDOU8rGNy3yyRJIUVmRIqUKKVpndvo01d3CNPwDii5bff8AJyeDpacZwDzRKRX mLhzbUmnCw916StH1aW7aiuSEvnB3mAkjSbDuK7is+ubu65TDGI+wRB0no932Q0x9qKs rIj7xLf6a9WaGBvEsao3wnC7mhGMGWBINNVzas9AHKbXtnVNF6+5dQ+JhiTHcpb/P8bQ ztEjEcaitPblKhhLjpXcOkp2SOGR14dp+l0kSj4UZxN4W+FuodmzKZk4DWQ7rwP85jq9 JbHGZHEHlT4Kcpx8qNjVDE7ZYc1pxnkxSaK5+85mhSbz6bBQ/8iw0LrPCYR6h5dfHWxW a6Ww== X-Gm-Message-State: ALKqPwf0cjKfuBC/UfFYXvUYLD25GFif4CQXusPJp6BuCw16PJFPG/x7 fEY569tgbR/LOD5Gcf/FtD0= X-Google-Smtp-Source: AB8JxZq6KhbtwEaeR/jwjBbI5/+CriVs0iWY3hKp5Pt8NhSQA2PrcvEDCuyQ5K3cbRGQfGxr+S2W/Q== X-Received: by 2002:a63:56:: with SMTP id 83-v6mr12391325pga.29.1527574921295; Mon, 28 May 2018 23:22:01 -0700 (PDT) Received: from localhost.localdomain (c-24-6-183-110.hsd1.ca.comcast.net. [24.6.183.110]) by smtp.googlemail.com with ESMTPSA id u9-v6sm74412992pfj.10.2018.05.28.23.22.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 May 2018 23:22:00 -0700 (PDT) From: Nick Desaulniers To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: Nick Desaulniers , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ext4: prefer strlcpy to strncpy Date: Mon, 28 May 2018 23:21:53 -0700 Message-Id: <1527574913-10561-1-git-send-email-nick.desaulniers@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Fixes a stringop-truncation warning from gcc-8. Signed-off-by: Nick Desaulniers --- fs/ext4/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index eb104e8..d47c85f 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -323,11 +323,11 @@ static void __save_error_info(struct super_block *sb, const char *func, return; es->s_state |= cpu_to_le16(EXT4_ERROR_FS); es->s_last_error_time = cpu_to_le32(get_seconds()); - strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); + strlcpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); es->s_last_error_line = cpu_to_le32(line); if (!es->s_first_error_time) { es->s_first_error_time = es->s_last_error_time; - strncpy(es->s_first_error_func, func, + strlcpy(es->s_first_error_func, func, sizeof(es->s_first_error_func)); es->s_first_error_line = cpu_to_le32(line); es->s_first_error_ino = es->s_last_error_ino;