diff mbox series

image-host: Fix error value paths and emit error messages to stderr.

Message ID 20240321112222.237341-1-hugo.cornelis@essensium.com
State Accepted
Commit 55a7d60f8f10b1c3c5a8e29571c065d61f5dd12f
Delegated to: Tom Rini
Headers show
Series image-host: Fix error value paths and emit error messages to stderr. | expand

Commit Message

Hugo Cornelis March 21, 2024, 11:22 a.m. UTC 
A recent refactoring in image-host.c messed up the return values of
the function that reads the encryptiong keys.  This patch fixes this
and also makes sure that error output goes to stderr instead of to
stdout.

Signed-off-by: Hugo Cornelis <hugo.cornelis@essensium.com>
---
 tools/image-host.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Tom Rini April 12, 2024, 6:52 p.m. UTC | #1 
On Thu, Mar 21, 2024 at 12:22:22PM +0100, Hugo Cornelis wrote:

> A recent refactoring in image-host.c messed up the return values of
> the function that reads the encryptiong keys.  This patch fixes this
> and also makes sure that error output goes to stderr instead of to
> stdout.
> 
> Signed-off-by: Hugo Cornelis <hugo.cornelis@essensium.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/tools/image-host.c b/tools/image-host.c
index b2a0f2e6d1..7bfc0cb6b1 100644
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -346,17 +346,17 @@  static int fit_image_read_key_iv_data(const char *keydir, const char *key_iv_nam
 				      unsigned char *key_iv_data, int expected_size)
 {
 	char filename[PATH_MAX];
-	int ret = -1;
+	int ret;
 
 	ret = snprintf(filename, sizeof(filename), "%s/%s%s",
 		       keydir, key_iv_name, ".bin");
 	if (ret >= sizeof(filename)) {
-		printf("Can't format the key or IV filename when setting up the cipher: insufficient buffer space\n");
-		ret = -1;
+		fprintf(stderr, "Can't format the key or IV filename when setting up the cipher: insufficient buffer space\n");
+		return -1;
 	}
 	if (ret < 0) {
-		printf("Can't format the key or IV filename when setting up the cipher: snprintf error\n");
-		ret = -1;
+		fprintf(stderr, "Can't format the key or IV filename when setting up the cipher: snprintf error\n");
+		return -1;
 	}
 
 	ret = fit_image_read_data(filename, key_iv_data, expected_size);