Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e365f160 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

p54: prevent upload of wrong firmwares 



This patch will prevent anyone to upload a firmware which was not designed for his device.

There's still a catch:
There is no easy way to detect if a firmware is for PCI or for USB (1st Gen),
because they all share the same LM86 identifier.

Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6982869d

drivers/net/wireless/p54/p54pci.c

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,12 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev) 
	if (err)

		return err;



	if (priv->common.fw_interface != FW_LM86) {

		dev_err(&priv->pdev->dev, "wrong firmware, "

			"please get a LM86(PCI) firmware a try again.\n");

		return -EINVAL;

	}



	data = (__le32 *) priv->firmware->data;

	remains = priv->firmware->size;

	device_addr = ISL38XX_DEV_FIRMWARE_ADDR;

drivers/net/wireless/p54/p54usb.c

+15 −0
Original line number Diff line number Diff line
@@ -498,6 +498,13 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev) 
	if (err)

		goto err_upload_failed;



	if (priv->common.fw_interface != FW_LM87) {

		dev_err(&priv->udev->dev, "wrong firmware, "

			"please get a LM87 firmware and try again.\n");

		err = -EINVAL;

		goto err_upload_failed;

	}



	left = block_size = min((size_t)P54U_FW_BLOCK, fw_entry->size);

	strcpy(buf, p54u_firmware_upload_3887);

	left -= strlen(p54u_firmware_upload_3887);
@@ -648,6 +655,14 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev) 
		return err;

	}



	if (priv->common.fw_interface != FW_LM86) {

		dev_err(&priv->udev->dev, "wrong firmware, "

			"please get a LM86(USB) firmware and try again.\n");

		kfree(buf);

		release_firmware(fw_entry);

		return -EINVAL;

	}



#define P54U_WRITE(type, addr, data) \

	do {\

		err = p54u_write(priv, buf, type,\