]> granicus.if.org Git - php/commitdiff
Accorate handling of too big inodes of chroot directories
authorDmitry Stogov <dmitry@zend.com>
Wed, 16 Nov 2016 22:08:42 +0000 (01:08 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 16 Nov 2016 22:08:42 +0000 (01:08 +0300)
ext/opcache/ZendAccelerator.c

index 9d0d32e8e440f96735557f00e802f1f3a0cedb62..7e8a444e7fce4a6dbf7219a2452dbf9c854e885b 100644 (file)
@@ -2155,18 +2155,14 @@ static void accel_activate(void)
                if (stat("/", &buf) != 0) {
                        ZCG(root_hash) = 0;
                } else {
-                       unsigned long x = buf.st_ino;
-
-#if SIZEOF_LONG == 4
-                       x = ((x >> 16) ^ x) * 0x45d9f3b;
-                       x = ((x >> 16) ^ x) * 0x45d9f3b;
-                       x = (x >> 16) ^ x;
-#elif SIZEOF_LONG == 8
-                       x = (x ^ (x >> 30)) * 0xbf58476d1ce4e5b9;
-                       x = (x ^ (x >> 27)) * 0x94d049bb133111eb;
-                       x = x ^ (x >> 31);
-#endif
-                       ZCG(root_hash) = x;
+                       ZCG(root_hash) = buf.st_ino;
+                       if (sizeof(buf.st_ino) > sizeof(ZCG(root_hash))) {
+                               if (ZCG(root_hash) != buf.st_ino) {
+                                       zend_alter_ini_entry("opcache.enable", sizeof("opcache.enable"), "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME);
+                                       zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode");
+                                       return;
+                               }
+                       }
                }
        } else {
                ZCG(root_hash) = 0;