Commit c9696b2b authored May 03, 2010 by Johannes Berg Committed by Reinette Chatre May 13, 2010

iwlwifi: don't crash on firmware file missing info



If a firmware file misses one of the required
instruction or data pieces, the driver currently
crashes. Let it gracefully refuse that firmware
file instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>

parent 1d60a79e

drivers/net/wireless/iwlwifi/iwl-helpers.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,11 @@ static inline void iwl_free_fw_desc(struct pci_dev *pci_dev,
		static inline int iwl_alloc_fw_desc(struct pci_dev *pci_dev,
		struct fw_desc *desc)
		{
		if (!desc->len) {
		desc->v_addr = NULL;
		return -EINVAL;
		}

		desc->v_addr = dma_alloc_coherent(&pci_dev->dev, desc->len,
		&desc->p_addr, GFP_KERNEL);
		return (desc->v_addr != NULL) ? 0 : -ENOMEM;

Admin message