Commit 24328b80 authored Jul 11, 2018 by Dan Carpenter Committed by Greg Kroah-Hartman Sep 26, 2018

mei: bus: type promotion bug in mei_nfc_if_version()



commit b40b3e9358fbafff6a4ba0f4b9658f6617146f9c upstream.

We accidentally removed the check for negative returns
without considering the issue of type promotion.
The "if_version_length" variable is type size_t so if __mei_cl_recv()
returns a negative then "bytes_recv" is type promoted
to a high positive value and treated as success.

Cc: <stable@vger.kernel.org>
Fixes: 582ab27a063a ("mei: bus: fix received data size check in NFC fixup")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8b97b2ec

drivers/misc/mei/bus-fixup.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ static int mei_nfc_if_version(struct mei_cl *cl,

	ret = 0;		ret = 0;
	bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length);		bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length);
	if (bytes_recv < if_version_length) {		if (bytes_recv < 0 \|\| bytes_recv < if_version_length) {
	dev_err(bus->dev, "Could not read IF version\n");		dev_err(bus->dev, "Could not read IF version\n");
	ret = -EIO;		ret = -EIO;
	goto err;		goto err;