Merge "wil6210: fix length check in __wmi_send" (11885f4c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/ath/wil6210/interrupt.c

+21 −1

Original line number	Diff line number	Diff line
		@@ -358,6 +358,25 @@ static void wil_cache_mbox_regs(struct wil6210_priv *wil)
		wil_mbox_ring_le2cpus(&wil->mbox_ctl.tx);
		}

		static bool wil_validate_mbox_regs(struct wil6210_priv *wil)
		{
		size_t min_size = sizeof(struct wil6210_mbox_hdr) +
		sizeof(struct wmi_cmd_hdr);

		if (wil->mbox_ctl.rx.entry_size < min_size) {
		wil_err(wil, "rx mbox entry too small (%d)\n",
		wil->mbox_ctl.rx.entry_size);
		return false;
		}
		if (wil->mbox_ctl.tx.entry_size < min_size) {
		wil_err(wil, "tx mbox entry too small (%d)\n",
		wil->mbox_ctl.tx.entry_size);
		return false;
		}

		return true;
		}

		static irqreturn_t wil6210_irq_misc(int irq, void *cookie)
		{
		struct wil6210_priv *wil = cookie;
		@@ -393,6 +412,7 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie)
		if (isr & ISR_MISC_FW_READY) {
		wil_dbg_irq(wil, "IRQ: FW ready\n");
		wil_cache_mbox_regs(wil);
		if (wil_validate_mbox_regs(wil))
		set_bit(wil_status_mbox_ready, wil->status);
		/**
		* Actual FW ready indicated by the

+1 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ static int __wmi_send(struct wil6210_priv wil, u16 cmdid, void buf, u16 len)
		uint retry;
		int rc = 0;

		if (sizeof(cmd) + len > r->entry_size) {
		if (len > r->entry_size - sizeof(cmd)) {
		wil_err(wil, "WMI size too large: %d bytes, max is %d\n",
		(int)(sizeof(cmd) + len), r->entry_size);
		return -ERANGE;