From patchwork Tue Mar 12 08:49:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 138208 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5A92743C8E; Tue, 12 Mar 2024 09:57:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5DEB40A89; Tue, 12 Mar 2024 09:57:04 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by mails.dpdk.org (Postfix) with ESMTP id D45B240282 for ; Tue, 12 Mar 2024 09:49:14 +0100 (CET) Received: from kunlun.arch.suse.cz (unknown [10.100.128.76]) by smtp-out2.suse.de (Postfix) with ESMTP id 85D2B5D263; Tue, 12 Mar 2024 08:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1710233354; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19yx/4XHDt3LMKe2WxZ4q2JBNdKzN4HFyJjaplqHw+E=; b=CNH9B6il2yWAy4LMXwhFSKo+ndObR7LcID1eITkt5bO42+DtaNjzJJ3NOt+4Z4kviqhzOL Btpd5AkQj589HgwtpUEsM05c/O51mQHV4uhcsnZCt+arJHqZCB8vbmtb60AuRkpenKIcmd Mv5oI3y5FNxknMLFwbjGaLVPIKX2crM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1710233354; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19yx/4XHDt3LMKe2WxZ4q2JBNdKzN4HFyJjaplqHw+E=; b=H14Wpt4y+MVVim21WtCI+LCbyhp/EPD7zai3/le28zKXxROvnFBx87usmzVGYvg7HfUTX4 EWCMSORxPyxUoWCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1710233354; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19yx/4XHDt3LMKe2WxZ4q2JBNdKzN4HFyJjaplqHw+E=; b=CNH9B6il2yWAy4LMXwhFSKo+ndObR7LcID1eITkt5bO42+DtaNjzJJ3NOt+4Z4kviqhzOL Btpd5AkQj589HgwtpUEsM05c/O51mQHV4uhcsnZCt+arJHqZCB8vbmtb60AuRkpenKIcmd Mv5oI3y5FNxknMLFwbjGaLVPIKX2crM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1710233354; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19yx/4XHDt3LMKe2WxZ4q2JBNdKzN4HFyJjaplqHw+E=; b=H14Wpt4y+MVVim21WtCI+LCbyhp/EPD7zai3/le28zKXxROvnFBx87usmzVGYvg7HfUTX4 EWCMSORxPyxUoWCQ== From: Jiri Slaby To: Ferruh Yigit Cc: dev@dpdk.org, Jiri Slaby Subject: [PATCH stable-22.11] kni: fix build with Linux 6.8 Date: Tue, 12 Mar 2024 09:49:14 +0100 Message-ID: <20240312084914.92056-1-jslaby@suse.cz> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: ** X-Spam-Score: 2.71 X-Spamd-Result: default: False [2.71 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(2.81)[0.938]; NEURAL_HAM_LONG(-1.00)[-1.000]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-0.00)[29.71%] X-Spam-Flag: NO X-Mailman-Approved-At: Tue, 12 Mar 2024 09:57:02 +0100 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org strlcpy() was removed in commit d26270061ae6 (string: Remove strlcpy()), use strscpy() instead. The patches fixes this: kernel/linux/kni/kni_net.c: In function ‘kni_get_drvinfo’: kernel/linux/kni/kni_net.c:835:9: error: implicit declaration of function ‘strlcpy’; did you mean ‘strscpy’? Intended esp. for stable/22.11. It should go wherever kni is still in the tree. Signed-off-by: Jiri Slaby --- kernel/linux/kni/kni_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 779ee345..c115a728 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -832,8 +832,8 @@ static const struct net_device_ops kni_net_netdev_ops = { static void kni_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strlcpy(info->version, KNI_VERSION, sizeof(info->version)); - strlcpy(info->driver, "kni", sizeof(info->driver)); + strscpy(info->version, KNI_VERSION, sizeof(info->version)); + strscpy(info->driver, "kni", sizeof(info->driver)); } static const struct ethtool_ops kni_net_ethtool_ops = {