diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-25 04:37:00 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-25 04:37:00 +0000 |
| commit | 6cbc0a272572035a0c0c63932c466c648eb0ea5b (patch) | |
| tree | 037691ae21aa57af86885c78472987dabb124af6 /sbin/camcontrol | |
| parent | c3b2fc1a17134a82c9af92b29e06104271f9df71 (diff) | |
| download | FreeBSD-src-6cbc0a272572035a0c0c63932c466c648eb0ea5b.zip FreeBSD-src-6cbc0a272572035a0c0c63932c466c648eb0ea5b.tar.gz | |
Limit RESOLUTION_MAX to INT_MAX, not UINT_MAX (all spelled out) so the
mode value isn't always clipped to -1 when (resolution * size) == 32, which
would have been the case with values => {4i,32b,32t}.
This seems to have been broken in r64382.
MFC after: 1 week
X-MFC with: r289915
PR: 200619
Reported by: Michael Baptist
Submitted by: Lars Skodje
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sbin/camcontrol')
| -rw-r--r-- | sbin/camcontrol/modeedit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c index 00ab974..8262c3c 100644 --- a/sbin/camcontrol/modeedit.c +++ b/sbin/camcontrol/modeedit.c @@ -246,7 +246,7 @@ editentry_set(char *name, char *newvalue, int editonly) * currently workaround it (even for int64's), so we have to kludge it. */ #define RESOLUTION_MAX(size) ((resolution * (size) == 32)? \ - (int)0xffffffff: (1 << (resolution * (size))) - 1) + INT_MAX: (1 << (resolution * (size))) - 1) assert(newvalue != NULL); if (*newvalue == '\0') |
