From patchwork Mon Nov 27 13:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 13469514 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GOWM5Y87" Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D59F6137 for ; Mon, 27 Nov 2023 05:00:58 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40b397793aaso17270135e9.0 for ; Mon, 27 Nov 2023 05:00:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701090057; x=1701694857; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=WgASahz0x5Po2Cv0bwXpcZwkazchSSzp18r4ApB/m2A=; b=GOWM5Y87CdZ2/2yc3aU5yHYvHpykL1gtu1iHfceER6GCjZz3+MSe8VMQnmw7gm2if5 q8pSxvX/bohku0KaCTPMI6/ieojS090FOh/VnwA/VswX0VbwC3hgARtN9j4xnoQIhlUw rJkMhh9vgcAolH/xg3jKBBxChJ5oaP8tPeOm0NMwOVK/0Yv/0tQxcb6L4lTb1dlhfRtK zl7tPey9Q9Oi16zwUHtWb+NsFGf3JZ/roW5RYqtHNzsDEre9nKRK9A8AGSzpgZ1TqE5R aox3ERPMlAOkpAHL9eaLgYADI4JOqSLHwJFrUlTJ6eL2I0KXuXZYAEFqORKnO6Z6jbbT bQTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701090057; x=1701694857; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WgASahz0x5Po2Cv0bwXpcZwkazchSSzp18r4ApB/m2A=; b=gop7mKujGKVBJyr9aVrOJCnYIlwewzzPF+V+d3dp+RWixVbCJT2fN94B3VAnKUXnge Kn1+pz9YACL69eGp3e07KbaE/TLFa18UCI1I9zxtqmvUTTrwraxRZe1JEEN3fsF0dth4 QogGuzoRnG0cOG5ZkEaYwnOBtnKlW0urOIQml9Ur7B2hJlDuPqYvOXd2RTp4ewxWgFzU XMicsUCSNSfrtcXo1t+s4TYk4remVmjt7nu8sCTRzWxDzrizaIvwCv7a3v6Pi4GZllGo oGG/8zkVVoK58E+B5qcRd4MHyOGZEbr+EnNwAkh+bIUb6rK1khJNhqF+row1lXL33eod LjsA== X-Gm-Message-State: AOJu0YxTMJA0DvhAajMmFMPnfvQ3Y2MRkjCyd0sd3SscORFLtCu8lKhP vgx3GvGGi4qfCik0+xyunrruhw== X-Google-Smtp-Source: AGHT+IFhyPwnwrRCuQw2LDntEhS+wmv0YqUCtrD6IQ+NLOxpkYcGUcE3+zqQkK18Pal9cVoEZM9XQg== X-Received: by 2002:a05:600c:138d:b0:40b:2afd:1a9 with SMTP id u13-20020a05600c138d00b0040b2afd01a9mr12835439wmf.15.1701090057225; Mon, 27 Nov 2023 05:00:57 -0800 (PST) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b00407460234f9sm13905925wmb.21.2023.11.27.05.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 05:00:56 -0800 (PST) Date: Mon, 27 Nov 2023 16:00:53 +0300 From: Dan Carpenter To: Rahul Rameshbabu Cc: Saeed Mahameed , Leon Romanovsky , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Dragos Tatulea , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH net] net/mlx5e: Fix snprintf return check Message-ID: Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding This code prints a string and then if there wasn't enough space for the whole string, then it prints a slightly shorter string. However, the test for overflow should have been >= instead of == because snprintf() returns the number of bytes which *would* have been printed if there were enough space. Fixes: 41e63c2baa11 ("net/mlx5e: Check return value of snprintf writing to fw_version buffer") Fixes: 1b2bd0c0264f ("net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors") Signed-off-by: Dan Carpenter --- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index 792a0ea544cd..c7c1b667b105 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -49,7 +49,7 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%04d (%.16s)", fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id); - if (count == sizeof(drvinfo->fw_version)) + if (count >= sizeof(drvinfo->fw_version)) snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%04d", fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev)); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index fe0726c7b847..a7c77a63cc29 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -78,7 +78,7 @@ static void mlx5e_rep_get_drvinfo(struct net_device *dev, count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%04d (%.16s)", fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id); - if (count == sizeof(drvinfo->fw_version)) + if (count >= sizeof(drvinfo->fw_version)) snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%04d", fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev));