From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57A2CC433F5 for ; Tue, 12 Oct 2021 11:06:39 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CDEE560E78 for ; Tue, 12 Oct 2021 11:06:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CDEE560E78 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C6C7C8375B; Tue, 12 Oct 2021 13:05:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="qYAOgrf4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4022383721; Tue, 12 Oct 2021 13:05:24 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F1DAD83744 for ; Tue, 12 Oct 2021 13:05:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id C6ECD61074; Tue, 12 Oct 2021 11:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634036715; bh=uDA8A2dmUkfYJ34B02KW6lLxsKKBPRQG1JeKOc+CKyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qYAOgrf42CNrn+rDrrNCOKSQwNruA6Qg6q0BfkWLzqZLtv2+uKUWUv8JQ1Lb9eeck Bmdh1KgKHgFfxruDV/e0nrcpcJYFn2ZInaolqtcw9MDqCon1Z+xi3HiImMZnGRI+Qz tEt1ax+sZ3LoHUV3mnNxgw8MZIzstJlYNy6HDpN9CNbrBX3PUrEV7Fgvb9tcdjB9Sz t7w5rE3QbWpkUbMS9utZL0CjFIjKgeRvR8JldQrk1YlkbWd5JtC3jBmz6HA1GxeGlU nvAirZaBpbN84TIFJjluXivvQEMioIgXXppzqCcEIrG8oYneFM7RXQsQVqRO2aiER+ KiWbitjIeS1Ug== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Simon Glass , Tom Rini Cc: U-Boot Mailing List , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 08/10] env: Use strncpy() instead of ad-hoc code to copy variable value Date: Tue, 12 Oct 2021 13:04:59 +0200 Message-Id: <20211012110501.6118-9-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211012110501.6118-1-kabel@kernel.org> References: <20211012110501.6118-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Copy the value of the found variable into given buffer with strncpy(). Signed-off-by: Marek Behún --- cmd/nvedit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 412918a000..51b9e4ffa4 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -746,18 +746,13 @@ int env_get_f(const char *name, char *buf, unsigned len) continue; /* found; copy out */ - for (n = 0; n < len; ++n, ++buf) { - *buf = env[val++]; - if (*buf == '\0') - return n; + n = strncpy(buf, &env[val], len) - buf; + if (len && n == len) { + buf[len - 1] = '\0'; + printf("env_buf [%u bytes] too small for value of \"%s\"\n", + len, name); } - if (n) - *--buf = '\0'; - - printf("env_buf [%u bytes] too small for value of \"%s\"\n", - len, name); - return n; } -- 2.32.0