net: hns3: fix different snprintf() limit
Subsystems (5)
PATCH 1/2 net: hns3: fix different snprintf() limit
This patch doesn't affect runtime at all, it's just a correctness issue.
The ptp->info.name[] buffer has 16 characters but the snprintf() limit was capped at 32 characters. Fortunately, HCLGE_DRIVER_NAME is "hclge" which isn't close to 16 characters so we're fine.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c +1 -3
@@ -415,8 +415,6 @@ int hclge_ptp_get_ts_info(struct hnae3_handle *handle,static int hclge_ptp_create_clock (struct hclge_dev *hdev) { -#define HCLGE_PTP_NAME_LEN 32 -struct hclge_ptp *ptp; ptp =devm_kzalloc (&hdev->pdev->dev,sizeof (*ptp),GFP_KERNEL );
@@ -424,7 +422,7 @@ static int hclge_ptp_create_clock(struct hclge_dev *hdev)return -ENOMEM ; ptp->hdev = hdev; -snprintf (ptp->info.name,HCLGE_PTP_NAME_LEN ,"%s" , +snprintf (ptp->info.name,sizeof (ptp->info.name),"%s" ,HCLGE_DRIVER_NAME ); ptp->info.owner =THIS_MODULE ; ptp->info.max_adj =HCLGE_PTP_CYCLE_ADJ_MAX ;
Signature · 1 line
2.30.2
PATCH 2/2 net: hns3: fix a double shift bug
These flags are used to set and test bits like this:
if (!test_bit(HCLGE_PTP_FLAG_TX_EN, &ptp->flags) ||
The issue is that test_bit() takes a bit number like 1, but we are passing BIT(1) instead and it's testing BIT(BIT(1)). This does not cause a problem because it is always done consistently and the bit values are very small.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h +3 -3
@@ -43,9 +43,9 @@#define HCLGE_PTP_SEC_H_OFFSET 32u#define HCLGE_PTP_SEC_L_MASK GENMASK(31, 0) -#define HCLGE_PTP_FLAG_EN BIT(0) -#define HCLGE_PTP_FLAG_TX_EN BIT(1) -#define HCLGE_PTP_FLAG_RX_EN BIT(2) +#define HCLGE_PTP_FLAG_EN 0 +#define HCLGE_PTP_FLAG_TX_EN 1 +#define HCLGE_PTP_FLAG_RX_EN 2struct hclge_ptp {struct hclge_dev *hdev;
Signature · 1 line
2.30.2
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 10 lines · On Sat, 19 Jun 2021 16:47:38 +0300 you wrote:
This patch doesn't affect runtime at all, it's just a correctness issue.
The ptp->info.name[] buffer has 16 characters but the
snprintf()limit was capped at 32 characters. Fortunately,HCLGE_DRIVER_NAMEis "hclge" which isn't close to 16 characters so we're fine.Fixes 0bf5eb788512 ("net: hns3: add support for PTP")Signed-off-by Dan Carpenter <[email protected]>[...]
Here is the summary with links:
- [net-next,1/2] net: hns3: fix different snprintf() limit
https://git.kernel.org/netdev/net-next/c/faebad853455 - [net-next,2/2] net: hns3: fix a double shift bug https://git.kernel.org/netdev/net-next/c/956c3ae411b2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html