[PATCH 1/2] of: fix of_device_get_modalias returned length when truncating buffers

From	Rob Herring <robh@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] of: fix of_device_get_modalias returned length when truncating buffers
Date	2017-01-16 21:50 +0100
Message-ID	<t0mo1-5OK-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

If the length of the modalias is greater than the buffer size, then the
modalias is truncated. However the untruncated length is returned which
will cause an error. Fix this to return the truncated length. If an error
in the case was desired, then then we should just return -ENOMEM.

The reality is no device will ever have 4KB of compatible strings to hit
this case.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
---
 drivers/of/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/device.c b/drivers/of/device.c
index fd5cfad7c403..bd620452f255 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -223,7 +223,7 @@ ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
 			str[i] = '_';
 	}
 
-	return tsize;
+	return repend;
 }
 
 /**
-- 
2.10.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] of: fix of_device_get_modalias returned length when truncating buffers Rob Herring <robh@kernel.org> - 2017-01-16 21:50 +0100
  [PATCH 2/2] of: Add function for generating a DT modalias with a newline Rob Herring <robh@kernel.org> - 2017-01-16 21:50 +0100
    Re: [PATCH 2/2] of: Add function for generating a DT modalias with a  newline Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-01-19 11:40 +0100

csiph-web