[U-Boot] [PATCH 1/1] Fix min/max macros in include/common.h

There is a bug in the min and max macros in common.h which occurs if Y is a larger type than X. For example, if Y is a 64-bit value and X is a 32-bit value then Y will be truncated to 32-bits. This fix matches what is done in the Linux kernel but without the additional type checking present in the kernel version.
Signed-off-by: Aaron Williams aaron.williams@caviumnetworks.com
include/common.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/common.h b/include/common.h index d8c912d..cf5c076 100644 --- a/include/common.h +++ b/include/common.h @@ -180,11 +180,13 @@ typedef void (interrupt_handler_t)(void *); * General Purpose Utilities */ #define min(X, Y) \ - ({ typeof (X) __x = (X), __y = (Y); \ + ({ typeof (X) __x = (X); \ + typeof (Y) __y = (Y); \ (__x < __y) ? __x : __y; })
#define max(X, Y) \ - ({ typeof (X) __x = (X), __y = (Y); \ + ({ typeof (X) __x = (X); \ + typeof (Y) __y = (Y); \ (__x > __y) ? __x : __y; })
#define MIN(x, y) min(x, y)

Dear Aaron Williams,
In message 201101311955.50902.Aaron.Williams@caviumnetworks.com you wrote:
There is a bug in the min and max macros in common.h which occurs if Y is a larger type than X. For example, if Y is a 64-bit value and X is a 32-bit value then Y will be truncated to 32-bits. This fix matches what is done in the Linux kernel but without the additional type checking present in the kernel version.
Please stick to the rules. When resubmitting a patch you are supposed to mark it as a reposting, and to keep the message references in place so mails get threaded properly. Please make sure and read http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions
Best regards,
Wolfgang Denk

Dear Aaron Williams,
In message 201101311955.50902.Aaron.Williams@caviumnetworks.com you wrote:
There is a bug in the min and max macros in common.h which occurs if Y is a larger type than X. For example, if Y is a 64-bit value and X is a 32-bit value then Y will be truncated to 32-bits. This fix matches what is done in the Linux kernel but without the additional type checking present in the kernel version.
Signed-off-by: Aaron Williams aaron.williams@caviumnetworks.com
include/common.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
Applied, after manually fixing the bad patch format ("---" separator line missing). I recommend to use "git format-patch" and "git send-email"!
Thanks.
Wolfgang Denk
participants (2)
-
Aaron Williams
-
Wolfgang Denk