mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 10:26:10 +01:00 
			
		
		
		
	If hash_calculate is invoked with region_count = 0, it will try to hash
INT_MAX regions. We should check this parameter.
* Avoid a comparison with different signedness.
* Check that region_count is at least 1.
* Avoid a superfluous assignment.
Fixes: b37b46f042 ("rsa: Use checksum algorithms from struct hash_algo")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
		
	
		
			
				
	
	
		
			55 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0+
 | |
| /*
 | |
|  * Copyright (c) 2013, Andreas Oetken.
 | |
|  */
 | |
| 
 | |
| #ifndef USE_HOSTCC
 | |
| #include <common.h>
 | |
| #include <fdtdec.h>
 | |
| #include <asm/byteorder.h>
 | |
| #include <linux/errno.h>
 | |
| #include <asm/unaligned.h>
 | |
| #include <hash.h>
 | |
| #else
 | |
| #include "fdt_host.h"
 | |
| #endif
 | |
| #include <hash.h>
 | |
| #include <image.h>
 | |
| 
 | |
| int hash_calculate(const char *name,
 | |
| 		    const struct image_region *region,
 | |
| 		    int region_count, uint8_t *checksum)
 | |
| {
 | |
| 	struct hash_algo *algo;
 | |
| 	int ret = 0;
 | |
| 	void *ctx;
 | |
| 	int i;
 | |
| 
 | |
| 	if (region_count < 1)
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	ret = hash_progressive_lookup_algo(name, &algo);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	ret = algo->hash_init(algo, &ctx);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	for (i = 0; i < region_count - 1; i++) {
 | |
| 		ret = algo->hash_update(algo, ctx, region[i].data,
 | |
| 					region[i].size, 0);
 | |
| 		if (ret)
 | |
| 			return ret;
 | |
| 	}
 | |
| 
 | |
| 	ret = algo->hash_update(algo, ctx, region[i].data, region[i].size, 1);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 	ret = algo->hash_finish(algo, ctx, checksum, algo->digest_size);
 | |
| 	if (ret)
 | |
| 		return ret;
 | |
| 
 | |
| 	return 0;
 | |
| }
 |