diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2012-06-21 12:59:14 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2012-06-22 13:32:19 +0200 |
| commit | 192fa11dab177027ad349363b39ff6435524b23d (patch) | |
| tree | 6a7b7d2e7691ff1e776ca4a094d6f8a370bf09b0 | |
| parent | 6f3cd63551db013e3cf5dfcebc41115322d5cfe9 (diff) | |
| download | lvm2-192fa11dab177027ad349363b39ff6435524b23d.tar.gz lvm2-192fa11dab177027ad349363b39ff6435524b23d.tar.xz lvm2-192fa11dab177027ad349363b39ff6435524b23d.zip | |
fix: use 64bit math for reserved memory
If the user specifies number in the range of [4G/1024, 4G>,
the used value would wrap around (32bit math).
So keep the math 64bit.
Note, using such large lvm.conf values is pointless with lvm2.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/mm/memlock.c | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Use 64bit math for reserved memory and stack. Add tests for kernel_send() errors in cmirrod. Print clean_bits in pull_state, fix cut&paste typo in cmirrord. Add tests for errors from closedir(), close() in cmirrord. diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index 8c631bf4..17dee1c9 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -446,12 +446,12 @@ void memlock_dec_daemon(struct cmd_context *cmd) void memlock_init(struct cmd_context *cmd) { /* When threaded, caller already limited stack size so just use the default. */ - _size_stack = 1024 * (cmd->threaded ? DEFAULT_RESERVED_STACK : - find_config_tree_int(cmd, "activation/reserved_stack", - DEFAULT_RESERVED_STACK)); + _size_stack = 1024ULL * (cmd->threaded ? DEFAULT_RESERVED_STACK : + find_config_tree_int(cmd, "activation/reserved_stack", + DEFAULT_RESERVED_STACK)); _size_malloc_tmp = find_config_tree_int(cmd, "activation/reserved_memory", - DEFAULT_RESERVED_MEMORY) * 1024; + DEFAULT_RESERVED_MEMORY) * 1024ULL; _default_priority = find_config_tree_int(cmd, "activation/process_priority", DEFAULT_PROCESS_PRIORITY); |