diff options
author | asomers <asomers@FreeBSD.org> | 2016-07-12 22:19:25 +0000 |
---|---|---|
committer | asomers <asomers@FreeBSD.org> | 2016-07-12 22:19:25 +0000 |
commit | ca02bfc136dcbf690b54466b85955727b7ef87cc (patch) | |
tree | 7ab2e1fa13e6597bd18643477ae2062a7167e6e6 /sbin | |
parent | edfc782bc1685f4da72cd7310fc157ab72ede448 (diff) | |
download | FreeBSD-src-ca02bfc136dcbf690b54466b85955727b7ef87cc.zip FreeBSD-src-ca02bfc136dcbf690b54466b85955727b7ef87cc.tar.gz |
MFC r302174
Fix "sysctl vm.vmtotal" output on machines with > 2TB virtual memory
sbin/sysctl/sysctl.c
Fix integer overflows in printf format strings
PR: 199673
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/sysctl/sysctl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index c0bcc81..9f5811c 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -547,15 +547,15 @@ S_vmtotal(size_t l2, void *p) "%hd Sleep: %hd)\n", v->t_rq, v->t_dw, v->t_pw, v->t_sl); printf( - "Virtual Memory:\t\t(Total: %dK Active: %dK)\n", - v->t_vm * pageKilo, v->t_avm * pageKilo); - printf("Real Memory:\t\t(Total: %dK Active: %dK)\n", - v->t_rm * pageKilo, v->t_arm * pageKilo); - printf("Shared Virtual Memory:\t(Total: %dK Active: %dK)\n", - v->t_vmshr * pageKilo, v->t_avmshr * pageKilo); - printf("Shared Real Memory:\t(Total: %dK Active: %dK)\n", - v->t_rmshr * pageKilo, v->t_armshr * pageKilo); - printf("Free Memory:\t%dK", v->t_free * pageKilo); + "Virtual Memory:\t\t(Total: %jdK Active: %jdK)\n", + (intmax_t)v->t_vm * pageKilo, (intmax_t)v->t_avm * pageKilo); + printf("Real Memory:\t\t(Total: %jdK Active: %jdK)\n", + (intmax_t)v->t_rm * pageKilo, (intmax_t)v->t_arm * pageKilo); + printf("Shared Virtual Memory:\t(Total: %jdK Active: %jdK)\n", + (intmax_t)v->t_vmshr * pageKilo, (intmax_t)v->t_avmshr * pageKilo); + printf("Shared Real Memory:\t(Total: %jdK Active: %jdK)\n", + (intmax_t)v->t_rmshr * pageKilo, (intmax_t)v->t_armshr * pageKilo); + printf("Free Memory:\t%jdK", (intmax_t)v->t_free * pageKilo); return (0); } |