83d6cc
Backported for 5.4 from:
83d6cc
83d6cc
83d6cc
83d6cc
From c69bcb212b37900fd61daaf38762e4974cb4dcc9 Mon Sep 17 00:00:00 2001
83d6cc
From: Jakub Zelenka <bukka@php.net>
83d6cc
Date: Sat, 12 Oct 2019 15:56:16 +0100
83d6cc
Subject: [PATCH 1/2] Fix bug #78599 (env_path_info underflow can lead to RCE)
83d6cc
 (CVE-2019-11043)
83d6cc
83d6cc
cheery-picked from ab061f95ca966731b1c84cf5b7b20155c0a1c06a
83d6cc
without the test as tester not available
83d6cc
---
83d6cc
 sapi/fpm/fpm/fpm_main.c | 4 ++--
83d6cc
 1 file changed, 2 insertions(+), 2 deletions(-)
83d6cc
83d6cc
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
83d6cc
index d12ac01859..22b889c167 100644
83d6cc
--- a/sapi/fpm/fpm/fpm_main.c
83d6cc
+++ b/sapi/fpm/fpm/fpm_main.c
83d6cc
@@ -1210,8 +1210,8 @@ static void init_request_info(TSRMLS_D)
83d6cc
 								path_info = script_path_translated + ptlen;
83d6cc
 								tflag = (slen != 0 && (!orig_path_info || strcmp(orig_path_info, path_info) != 0));
83d6cc
 							} else {
83d6cc
-								path_info = env_path_info ? env_path_info + pilen - slen : NULL;
83d6cc
-								tflag = (orig_path_info != path_info);
83d6cc
+								path_info = (env_path_info && pilen > slen) ? env_path_info + pilen - slen : NULL;
83d6cc
+								tflag = path_info && (orig_path_info != path_info);
83d6cc
 							}
83d6cc
 
83d6cc
 							if (tflag) {
83d6cc
83d6cc