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

From: Rob Herring
Date: Mon Jan 16 2017 - 15:41:29 EST


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@xxxxxxxxxx>
Cc: Frank Rowand <frowand.list@xxxxxxxxx>
---
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