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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 E2FA0C3A5A3 for ; Tue, 27 Aug 2019 07:56:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B62082173E for ; Tue, 27 Aug 2019 07:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892560; bh=07DBjmrnK+4KXHGEwkJ9AMWymOayCreOothOCT/aqb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mWJdv5hI7xYzFKEsq8nRfbidEPnlVxi3dkKLj5eRFf9il8CqMSEXTBX00G4j142SG Mex860OONLfb2EQHhHFXUC2BiCd5+Gl9n0RnhadY3czE6uldyrpQDt0eXL6IC2N+kC sNEa4d92RaZzPMAMedExHU85tGQbKA9gzY2+ZiNo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729668AbfH0Hz7 (ORCPT ); Tue, 27 Aug 2019 03:55:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:47842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730454AbfH0Hz4 (ORCPT ); Tue, 27 Aug 2019 03:55:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 71027206BF; Tue, 27 Aug 2019 07:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892556; bh=07DBjmrnK+4KXHGEwkJ9AMWymOayCreOothOCT/aqb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W3VCp53GBdMS6zZ99nXBBT6HRKoyEfohyn8SPOkQcobdliBIXCJ9UNNayNLxBPhQg wOTEzHVlAV4XEzSWVTzOYqJT0azZi2sccsJBMAfLs0twugIM0t4/zU2SCapM5vbMe7 HOck0DU5pvwraqvjFxaQBjWEsmL+5XHPaiFdmu6g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wang Xiayang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 33/98] net/ethernet/qlogic/qed: force the string buffer NULL-terminated Date: Tue, 27 Aug 2019 09:50:12 +0200 Message-Id: <20190827072719.913350183@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072718.142728620@linuxfoundation.org> References: <20190827072718.142728620@linuxfoundation.org> User-Agent: quilt/0.66 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 [ 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 b22f464ea3fa7..f9e475075d3ea 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_int.c +++ b/drivers/net/ethernet/qlogic/qed/qed_int.c @@ -939,7 +939,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