linux-kernel - [PATCH] btrfs: Fix 64-bit divisions in btrfs_commit_stats

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 16 Jun 2022 10:08:14 +0200
From:   Geert Uytterhoeven <geert@...ux-m68k.org>
To:     Ioannis Angelakopoulos <iangelak@...com>, Chris Mason <clm@...com>,
        Josef Bacik <josef@...icpanda.com>,
        David Sterba <dsterba@...e.com>
Cc:     linux-btrfs@...r.kernel.org, linux-kernel@...r.kernel.org,
        Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: [PATCH] btrfs: Fix 64-bit divisions in btrfs_commit_stats_show() on 32-bit

On 32-bit (e.g. m68k):

    ERROR: modpost: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!

Fix this by using div_u64() instead.

Reported-by: noreply@...erman.id.au
Fixes: e665ec2ab6e1ae36 ("btrfs: Expose the BTRFS commit stats through sysfs")
Signed-off-by: Geert Uytterhoeven <geert@...ux-m68k.org>
---
 fs/btrfs/sysfs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index bce2573b02861149..a24cf7e0900a23cb 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -9,6 +9,7 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/bug.h>
+#include <linux/math64.h>
 #include <crypto/hash.h>
 
 #include "ctree.h"
@@ -1002,9 +1003,9 @@ static ssize_t btrfs_commit_stats_show(struct kobject *kobj,
 		"max_commit_ms %llu\n"
 		"total_commit_ms %llu\n",
 		fs_info->commit_stats.commit_count,
-		fs_info->commit_stats.last_commit_dur / NSEC_PER_MSEC,
-		fs_info->commit_stats.max_commit_dur / NSEC_PER_MSEC,
-		fs_info->commit_stats.total_commit_dur / NSEC_PER_MSEC);
+		div_u64(fs_info->commit_stats.last_commit_dur, NSEC_PER_MSEC),
+		div_u64(fs_info->commit_stats.max_commit_dur, NSEC_PER_MSEC),
+		div_u64(fs_info->commit_stats.total_commit_dur, NSEC_PER_MSEC));
 }
 
 static ssize_t btrfs_commit_stats_store(struct kobject *kobj,
-- 
2.25.1