Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp10792201imu; Thu, 6 Dec 2018 06:54:37 -0800 (PST) X-Google-Smtp-Source: AFSGD/UaAAjPaVVsTKszX0kr6yXr0R5x+KKK/hkuN9wd9h0R4qFv7ZQuamz/MqVAaKOzbhjPidV8 X-Received: by 2002:a63:ab08:: with SMTP id p8mr23997030pgf.87.1544108077066; Thu, 06 Dec 2018 06:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544108077; cv=none; d=google.com; s=arc-20160816; b=URsiAls3LQOsAUosL9KjvAjWSII/gwxQ/9tVu37kk74n95KCa1Fe7+Alc02V6UbooE +AIt9ctZJUtTpiFxENIxsorH7L2Vh7QBJBf8RLAOy5IytZTuampBsfeYj0SyX0BSSlYe nQISPB2DM9lZh5NdACUWTtbSfJa5i51YL65MZ0eww2dEm1D0e38jkSHhihCB42zjjm/d 3OY0KcFzfBdmVXGQN7pyl1JtIi3Qmues3/2u0SL4fGtsnlbQiOAMh/BCiH2fhiUTVMx0 3e7TkYIFMUqrPe7o5m2UEmH+IZtfeeZwgFpAq5avz8kN5DMpVeQEq10N11G2zQTTRye4 Eh6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1cRrMByra/wsMxWGgPXsgtlMHsLrECHHUsbeDZEvGxU=; b=jmfjv/4cmM4sScn9K0jX9qPu9+SvJ5UD++x1J3FNQGuxB325c3WqIgE3RUo84j2+eB M7VfL9dj4XDafZ6u58TlEQveoQOYQstsK1zTEkOCCEBV8j3stjWen8Vmkl/wbaQDfQPP 0MwWkvykIo0fz4LxhScSyjhTVogjVwGZx/E1XPO9gN1xLkwODDnpOktZhgst6VZb1SjM IosEd4ONqWYYI3UTKhXMt2hLwKtjba+bJxupbYkw2e2gbCXpaZudwoXiXCzuals89duM W601+F1z8/DCnVciHCtki5m9blvdNlgiuUGSaSLDRwNfZ2/dUXxIbotPJhio/EffAXvO QVJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d5hR3+lJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h14si428611pgd.189.2018.12.06.06.54.21; Thu, 06 Dec 2018 06:54:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d5hR3+lJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731047AbeLFOpX (ORCPT + 99 others); Thu, 6 Dec 2018 09:45:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:50064 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730539AbeLFOpV (ORCPT ); Thu, 6 Dec 2018 09:45:21 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3BE302082B; Thu, 6 Dec 2018 14:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544107520; bh=7PdvY6VK14D/V0mMZ88C1Ed5U84XooBzyNRD5Vgqfi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d5hR3+lJabj+U8jF0fjxqOoNzwfr7lhl825ZNpbhgzBICePKXuBgJRPJDhjozvNXX 0JZF4nyyshJurKWT+ovSQqCtmcACwmdBXrWVkdpKJwvJuWp2S17OyEC8wgFmx8Oqka Jp2rlCJiuOiRHydlT0MwiTiaGxMejscZJnmOwJg4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Torvalds Subject: [PATCH 4.9 005/101] unifdef: use memcpy instead of strncpy Date: Thu, 6 Dec 2018 15:38:04 +0100 Message-Id: <20181206143011.928684610@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206143011.174892052@linuxfoundation.org> References: <20181206143011.174892052@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Torvalds commit 38c7b224ce22c25fed04007839edf974bd13439d upstream. New versions of gcc reasonably warn about the odd pattern of strncpy(p, q, strlen(q)); which really doesn't make sense: the strncpy() ends up being just a slow and odd way to write memcpy() in this case. There was a comment about _why_ the code used strncpy - to avoid the terminating NUL byte, but memcpy does the same and avoids the warning. Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- scripts/unifdef.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/scripts/unifdef.c +++ b/scripts/unifdef.c @@ -395,7 +395,7 @@ usage(void) * When we have processed a group that starts off with a known-false * #if/#elif sequence (which has therefore been deleted) followed by a * #elif that we don't understand and therefore must keep, we edit the - * latter into a #if to keep the nesting correct. We use strncpy() to + * latter into a #if to keep the nesting correct. We use memcpy() to * overwrite the 4 byte token "elif" with "if " without a '\0' byte. * * When we find a true #elif in a group, the following block will @@ -450,7 +450,7 @@ static void Idrop (void) { Fdrop(); ign static void Itrue (void) { Ftrue(); ignoreon(); } static void Ifalse(void) { Ffalse(); ignoreon(); } /* modify this line */ -static void Mpass (void) { strncpy(keyword, "if ", 4); Pelif(); } +static void Mpass (void) { memcpy(keyword, "if ", 4); Pelif(); } static void Mtrue (void) { keywordedit("else"); state(IS_TRUE_MIDDLE); } static void Melif (void) { keywordedit("endif"); state(IS_FALSE_TRAILER); } static void Melse (void) { keywordedit("endif"); state(IS_FALSE_ELSE); }