Commit 8d6ab5c5 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bjorn Helgaas
Browse files

tg3: Validate VPD checksum with pci_vpd_check_csum() 

Validate the VPD checksum with pci_vpd_check_csum() to simplify the code.

Link: https://lore.kernel.org/r/7297fce9-47db-3b86-366e-10b9ef43beaf@gmail.com


Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f240e150

drivers/net/ethernet/broadcom/tg3.c

+4 −27
Original line number Diff line number Diff line
@@ -13010,33 +13010,10 @@ static int tg3_test_nvram(struct tg3 *tp) 
	if (!buf)

		return -ENOMEM;



	i = pci_vpd_find_tag((u8 *)buf, len, PCI_VPD_LRDT_RO_DATA);

	if (i > 0) {

		j = pci_vpd_lrdt_size(&((u8 *)buf)[i]);

		if (j < 0)

			goto out;



		if (i + PCI_VPD_LRDT_TAG_SIZE + j > len)

			goto out;



		i += PCI_VPD_LRDT_TAG_SIZE;

		j = pci_vpd_find_info_keyword((u8 *)buf, i, j,

					      PCI_VPD_RO_KEYWORD_CHKSUM);

		if (j > 0) {

			u8 csum8 = 0;



			j += PCI_VPD_INFO_FLD_HDR_SIZE;



			for (i = 0; i <= j; i++)

				csum8 += ((u8 *)buf)[i];



			if (csum8)

				goto out;

		}

	}



	err = pci_vpd_check_csum(buf, len);

	/* go on if no checksum found */

	if (err == 1)

		err = 0;



out:

	kfree(buf);

	return err;