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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83D80C7618F for ; Mon, 15 Jul 2019 14:01:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D7F6217D8 for ; Mon, 15 Jul 2019 14:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199278; bh=Yf2R0tM/bEIm2s6ta7L7vGbzeVyOgOPjlCcPctN/KQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BzKPcHIPye960TGRkrInIcLRtvxlmpFG9RxS6Vjr7yRp5CFnPPm69bpV1DpW4/HpH pPhiQiq065hLQfupEo/J+2dJtloRmZLo8/gu0jW+IDcn2ak6YQB3QinGh/ILpnN1gr yIcYX3it1zltzuQQx7ZK6rl59arTmP70RhtyJcmg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387396AbfGOOBO (ORCPT ); Mon, 15 Jul 2019 10:01:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:43536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731326AbfGOOBN (ORCPT ); Mon, 15 Jul 2019 10:01:13 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 125A52083D; Mon, 15 Jul 2019 14:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199272; bh=Yf2R0tM/bEIm2s6ta7L7vGbzeVyOgOPjlCcPctN/KQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fwv++oL5V0EuBr5agcmvMIwP64BBBKR9Q/ptnmuLzQJrZHJwJcn8vhNobB6FluTR2 zp/oD1l5l87sVoLtqjTWiSWDHyRFFIgHmYSI0aunMM/nprM10tNkw4R/368m0PQc5h IqXczvIfMONgopWUwsMLv5Hd+KCEhaj1izF5AM9Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrii Nakryiko , Magnus Karlsson , Yonghong Song , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 224/249] libbpf: fix GCC8 warning for strncpy Date: Mon, 15 Jul 2019 09:46:29 -0400 Message-Id: <20190715134655.4076-224-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andrii Nakryiko [ Upstream commit cdfc7f888c2a355b01308e97c6df108f1c2b64e8 ] GCC8 started emitting warning about using strncpy with number of bytes exactly equal destination size, which is generally unsafe, as can lead to non-zero terminated string being copied. Use IFNAMSIZ - 1 as number of bytes to ensure name is always zero-terminated. Signed-off-by: Andrii Nakryiko Cc: Magnus Karlsson Acked-by: Yonghong Song Acked-by: Magnus Karlsson Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- tools/lib/bpf/xsk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index 38667b62f1fe..8a7a05bc657d 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -337,7 +337,8 @@ static int xsk_get_max_queues(struct xsk_socket *xsk) channels.cmd = ETHTOOL_GCHANNELS; ifr.ifr_data = (void *)&channels; - strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ); + strncpy(ifr.ifr_name, xsk->ifname, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ - 1] = '\0'; err = ioctl(fd, SIOCETHTOOL, &ifr); if (err && errno != EOPNOTSUPP) { ret = -errno; -- 2.20.1