mmap_cache: add function to enable mmap_cache

[strace] / filter_qualify.c

diff --git a/filter_qualify.c b/filter_qualify.c
index 356f4725884d22ecfaf533e19762d4dbf6159953..49f0d612046384aef2ef28461d56c33fed6a05e0 100644 (file)
--- a/filter_qualify.c
+++ b/filter_qualify.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2016-2017 The strace developers.
+ * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -83,7 +83,7 @@ parse_inject_token(const char *const token, struct inject_opts *const fopts,
                   const bool fault_tokens_only)
 {
        const char *val;
-       int intval;
+       kernel_long_t intval;
 
        if ((val = STR_STRIP_PREFIX(token, "when=")) != token) {
                /*
@@ -129,9 +129,23 @@ parse_inject_token(const char *const token, struct inject_opts *const fopts,
                   && (val = STR_STRIP_PREFIX(token, "retval=")) != token) {
                if (fopts->data.flags & INJECT_F_RETVAL)
                        return false;
-               intval = string_to_uint(val);
+               intval = string_to_kulong(val);
                if (intval < 0)
                        return false;
+
+#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG && !HAVE_ARCH_DEDICATED_ERR_REG
+               if ((int) intval != intval)
+                       error_msg("Injected return value %" PRI_kld " will be"
+                                 " clipped to %d in compat personality",
+                                 intval, (int) intval);
+
+               if ((int) intval < 0 && (int) intval >= -MAX_ERRNO_VALUE)
+                       error_msg("Inadvertent injection of error %d is"
+                                 " possible in compat personality for"
+                                 " retval=%" PRI_kld,
+                                 -(int) intval, intval);
+#endif
+
                fopts->data.rval = intval;
                fopts->data.flags |= INJECT_F_RETVAL;
        } else if (!fault_tokens_only