[Bug 198500] [gjournal] sysctl kern.geom.journal.cache.limit 32 bit integer overflow

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198500

--- Comment #3 from longwitz at incore.de ---
Yes, my patch was for 10.3 r317782 and worked only for amd64. The following
(untested) patch is against HEAD and should work for both i386 and amd64:

--- g_journal.c.orig    2017-05-10 21:25:30.000000000 +0200
+++ g_journal.c 2017-05-10 21:43:24.000000000 +0200
@@ -130,26 +130,26 @@
 SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW,
     &g_journal_do_optimize, 0, "Try to combine bios on flush and copy");

-static u_int g_journal_cache_used = 0;
-static u_int g_journal_cache_limit = 64 * 1024 * 1024;
+static u_long g_journal_cache_used = 0;
+static u_long g_journal_cache_limit = 64 * 1024 * 1024;
 static u_int g_journal_cache_divisor = 2;
 static u_int g_journal_cache_switch = 90;
 static u_int g_journal_cache_misses = 0;
 static u_int g_journal_cache_alloc_failures = 0;
-static u_int g_journal_cache_low = 0;
+static u_long g_journal_cache_low = 0;

 static SYSCTL_NODE(_kern_geom_journal, OID_AUTO, cache, CTLFLAG_RW, 0,
     "GEOM_JOURNAL cache");
-SYSCTL_UINT(_kern_geom_journal_cache, OID_AUTO, used, CTLFLAG_RD,
+SYSCTL_ULONG(_kern_geom_journal_cache, OID_AUTO, used, CTLFLAG_RD,
     &g_journal_cache_used, 0, "Number of allocated bytes");
 static int
 g_journal_cache_limit_sysctl(SYSCTL_HANDLER_ARGS)
 {
-       u_int limit;
+       u_long limit;
        int error;

        limit = g_journal_cache_limit;
-       error = sysctl_handle_int(oidp, &limit, 0, req);
+       error = sysctl_handle_long(oidp, &limit, 0, req);
        if (error != 0 || req->newptr == NULL)
                return (error);
        g_journal_cache_limit = limit;
@@ -157,7 +157,7 @@
        return (0);
 }
 SYSCTL_PROC(_kern_geom_journal_cache, OID_AUTO, limit,
-    CTLTYPE_UINT | CTLFLAG_RWTUN, NULL, 0, g_journal_cache_limit_sysctl, "I",
+    CTLTYPE_ULONG | CTLFLAG_RWTUN, NULL, 0, g_journal_cache_limit_sysctl,
"LU",
     "Maximum number of allocated bytes");
 SYSCTL_UINT(_kern_geom_journal_cache, OID_AUTO, divisor, CTLFLAG_RDTUN,
     &g_journal_cache_divisor, 0,
@@ -3046,9 +3046,9 @@
                        kproc_exit(0);
                }
                if (error == 0 && g_journal_sync_requested == 0) {
-                       GJ_DEBUG(1, "Out of cache, force switch (used=%u "
-                           "limit=%u).", g_journal_cache_used,
-                           g_journal_cache_limit);
+                       GJ_DEBUG(1, "Out of cache, force switch (used=%jd "
+                           "limit=%jd).", (intmax_t)g_journal_cache_used,
+                           (intmax_t)g_journal_cache_limit);
                }
                GJ_TIMER_START(1, &bt);
                g_journal_do_switch(mp);

I like to mention that kern.geom.journal.cache.limit does not work as a tunable
in loader.conf because g_journal.c overwrites this immediately in
g_journal_init(). Therefore I use kern.geom.journal.cache.divisor in
loader.conf to justify the cache at boottime.

-- 
You are receiving this mail because:
You are the assignee for the bug.