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=ham 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 748F7C32750 for ; Wed, 14 Aug 2019 02:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 440652084F for ; Wed, 14 Aug 2019 02:34:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565750096; bh=g43v1qWwCctTqaytwmXqEvCGCh3tRqeegcByztUxogY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k+qftStDW/JaV8lis5rpb3Nf9lJpipwsRYUZ5Ymb8WEBM/AMxMQuv06kkWKI3by3M lyomoF34YnDvA5uISkkuuFPkmITF7EXbEzlVKFVv7kgxF3OkuwOstnPiTuXtgn+T7b NcGPiFrV4Ke4fG6u7fo3J7arxP5kFwT2rkBm7qGU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727747AbfHNCNn (ORCPT ); Tue, 13 Aug 2019 22:13:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:45642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727729AbfHNCNj (ORCPT ); Tue, 13 Aug 2019 22:13:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 40F1021743; Wed, 14 Aug 2019 02:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748817; bh=g43v1qWwCctTqaytwmXqEvCGCh3tRqeegcByztUxogY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZY1ggm3CgU1PpCBHsiR6w1Q4I+i1J9rtvjOEZ2ArBcEXYKHfF7BGxj1JEURvQio+U 1Df8R2HDrAg2/zprhP1nfe3GCxKHeC1HaK0THNNHyWnvE6o2s4/3NsH3yN4qms+uHa nBuqIAdyAVWKMB4fbpnwWW3G9PPmhbzpX0P8h6UI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang Xiayang , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 078/123] net/ethernet/qlogic/qed: force the string buffer NULL-terminated Date: Tue, 13 Aug 2019 22:10:02 -0400 Message-Id: <20190814021047.14828-78-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Xiayang [ Upstream commit 3690c8c9a8edff0db077a38783112d8fe12a7dd2 ] strncpy() does not ensure NULL-termination when the input string size equals to the destination buffer size 30. The output string is passed to qed_int_deassertion_aeu_bit() which calls DP_INFO() and relies NULL-termination. Use strlcpy instead. The other conditional branch above strncpy() needs no fix as snprintf() ensures NULL-termination. This issue is identified by a Coccinelle script. Signed-off-by: Wang Xiayang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c index fdfedbc8e4311..70a771cd87889 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_int.c +++ b/drivers/net/ethernet/qlogic/qed/qed_int.c @@ -1093,7 +1093,7 @@ static int qed_int_deassertion(struct qed_hwfn *p_hwfn, snprintf(bit_name, 30, p_aeu->bit_name, num); else - strncpy(bit_name, + strlcpy(bit_name, p_aeu->bit_name, 30); /* We now need to pass bitmask in its -- 2.20.1