Subset (4)

realistic · 23.5k rows

Split (2)

train · 21.2k rows

messages listlengths 3 3	metadata dict
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-7981\n\nThe png_convert_to_rfc1123 function in png.c in libpng 1.0.x before 1.0.64, 1.2.x before 1.2.54, and 1.4.x before 1.4.17 allows remote attackers to obtain sensitive process memory information via crafted tIME chunk data in an image file, which triggers an out-of-bounds read.\n\n## Package\nlibpng12\n\n## Files to modify\n- pngset.c\n\n## Upstream Fix\n```diff\n--- pngset.c\n+++ pngset.c\n@@ -837,6 +837,15 @@\n (png_ptr->mode & PNG_WROTE_tIME))\n return;\n \n+ if (mod_time->month == 0 \|\| mod_time->month > 12 \|\|\n+ mod_time->day == 0 \|\| mod_time->day > 31 \|\|\n+ mod_time->hour > 23 \|\| mod_time->minute > 59 \|\|\n+ mod_time->second > 60)\n+ {\n+ png_warning(png_ptr, \"Ignoring invalid time value\");\n+ return;\n+ }\n+\n png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));\n info_ptr->valid \|= PNG_INFO_tIME;\n }\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "--- pngset.c\n+++ pngset.c\n@@ -837,6 +837,15 @@\n (png_ptr->mode & PNG_WROTE_tIME))\n return;\n \n+ if (mod_time->month == 0 \|\| mod_time->month > 12 \|\|\n+ mod_time->day == 0 \|\| mod_time->day > 31 \|\|\n+ mod_time->hour > 23 \|\| mod_time->minute > 59 \|\|\n+ mod_time->second > 60)\n+ {\n+ png_warning(png_ptr, \"Ignoring invalid time value\");\n+ return;\n+ }\n+\n png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));\n info_ptr->valid \|= PNG_INFO_tIME;\n }" } ]	{ "id": "libpng12-4248-libpng12-CVE-2015-7981.patch", "cves": [], "package": "libpng12", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 9, "patch_files_count": 0, "total_tokens_est": 437, "has_source_context": false, "upstream_enriched": false, "suse_license": "Zlib", "upstream_license": "NOASSERTION", "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-11043\n\n===================================================================\n\n## Package\nphp7\n\n## Files to modify\n- ext/standard/info.c\n- sapi/cli/php_cli.c\n- sapi/cgi/cgi_main.c\n- configure.ac\n- sapi/fpm/fpm/fpm_main.c\n\n## Target Source Code\n\n### ext/standard/info.c\n\n#### php_print_info() [lines 786-1063]\n```c\n\n/* {{{ php_print_info\n /\nPHPAPI void php_print_info(int flag)\n{\n\tchar env, tmp1, tmp2;\n\tzend_string php_uname;\n\n\tif (!sapi_module.phpinfo_as_text) {\n\t\tphp_print_info_htmlhead();\n\t} else {\n\t\tphp_info_print(\"phpinfo()\\n\");\n\t}\n\n\tif (flag & PHP_INFO_GENERAL) {\n\t\tchar zend_version = get_zend_version();\n\t\tchar temp_api[10];\n\n\t\tphp_uname = php_get_uname('a');\n\n\t\tif (!sapi_module.phpinfo_as_text) {\n\t\t\tphp_info_print_box_start(1);\n\t\t}\n\n\t\tif (!sapi_module.phpinfo_as_text) {\n\t time_t the_time;\n\t struct tm ta, tmbuf;\n\n\t the_time = time(NULL);\n\t ta = php_localtime_r(&the_time, &tmbuf);\n\n php_info_print(\"<a href=\\\"http://www.php.net/\\\"><img border=\\\"0\\\" src=\\\"\");\n\t if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {\n\t\t php_info_print(PHP_EGG_LOGO_DATA_URI \"\\\" alt=\\\"PHP logo\\\" /></a>\");\n\t } else {\n\t\t php_info_print(PHP_LOGO_DATA_URI \"\\\" alt=\\\"PHP logo\\\" /></a>\");\n\t\t\t}\n\t\t}\n\n\t\tif (!sapi_module.phpinfo_as_text) {\n\t\t\tphp_info_printf(\"<h1 class=\\\"p\\\">PHP Version %s</h1>\\n\", PHP_VERSION);\n\t\t} else {\n\t\t\tphp_info_print_table_row(2, \"PHP Version\", PHP_VERSION);\n\t\t}\n\t\tphp_info_print_box_end();\n\t\tphp_info_print_table_start();\n\t\tphp_info_print_table_row(2, \"System\", ZSTR_VAL(php_uname));\n\t\tphp_info_print_table_row(2, \"Build Date\", __DATE__ \" \" __TIME__);\n#ifdef COMPILER\n\t\tphp_info_print_table_row(2, \"Compiler\", COMPILER);\n#endif\n#ifdef ARCHITECTURE\n\t\tphp_info_print_table_row(2, \"Architecture\", ARCHITECTURE);\n#endif\n#ifdef CONFIGURE_COMMAND\n\t\tphp_info_print_table_row(2, \"Configure Command\", CONFIGURE_COMMAND );\n#endif\n\n\t\tif (sapi_module.pretty_name) {\n\t\t\tphp_info_print_table_row(2, \"Server API\", sapi_module.pretty_name );\n\t\t}\n\n/* ... 196 lines omitted ... /\n\t\t\tphp_info_print(\"\\nPHP License\\n\");\n\t\t\tphp_info_print(\"This program is free software; you can redistribute it and/or modify\\n\");\n\t\t\tphp_info_print(\"it under the terms of the PHP License as published by the PHP Group\\n\");\n\t\t\tphp_info_print(\"and included in the distribution in the file: LICENSE\\n\");\n\t\t\tphp_info_print(\"\\n\");\n\t\t\tphp_info_print(\"This program is distributed in the hope that it will be useful,\\n\");\n\t\t\tphp_info_print(\"but WITHOUT ANY WARRANTY; without even the implied warranty of\\n\");\n\t\t\tphp_info_print(\"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\\n\");\n\t\t\tphp_info_print(\"\\n\");\n\t\t\tphp_info_print(\"If you did not receive a copy of the PHP license, or have any\\n\");\n\t\t\tphp_info_print(\"questions about PHP licensing, please contact license@php.net.\\n\");\n\t\t}\n\t}\n\n\tif (!sapi_module.phpinfo_as_text) {\n\t\tphp_info_print(\"</div></body></html>\");\n\t}\n}\n/ }}} /\n\n```\n\n### sapi/cli/php_cli.c\n\n#### do_cli() [lines 661-1195]\n```c\n#endif\n/}}}/\n\nstatic int do_cli(int argc, char argv) / {{{ /\n{\n\tint c;\n\tzend_file_handle file_handle;\n\tint behavior = PHP_MODE_STANDARD;\n\tchar reflection_what = NULL;\n\tvolatile int request_started = 0;\n\tvolatile int exit_status = 0;\n\tchar php_optarg = NULL, orig_optarg = NULL;\n\tint php_optind = 1, orig_optind = 1;\n\tchar exec_direct=NULL, exec_run=NULL, exec_begin=NULL, exec_end=NULL;\n\tchar arg_free=NULL, arg_excp=&arg_free;\n\tchar script_file=NULL, translated_path = NULL;\n\tint interactive=0;\n\tint lineno = 0;\n\tconst char param_error=NULL;\n\tint hide_argv = 0;\n\n\tzend_try {\n\n\t\tCG(in_compilation) = 0; /* not initialized but needed for several options /\n\n\t\twhile ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {\n\t\t\tswitch (c) {\n\n\t\t\tcase 'i': / php info & quit /\n\t\t\t\tif (php_request_startup()==FAILURE) {\n\t\t\t\t\tgoto err;\n\t\t\t\t}\n\t\t\t\trequest_started = 1;\n\t\t\t\tphp_print_info(0xFFFFFFFF);\n\t\t\t\tphp_output_end_all();\n\t\t\t\texit_status = (c == '?' && argc > 1 && !strchr(argv[1], c));\n\t\t\t\tgoto out;\n\n\t\t\tcase 'v': / show php version & quit /\n\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) ( %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\",\n\t\t\t\t\tPHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,\n#if ZTS\n\t\t\t\t\t\"ZTS \"\n#else\n\t\t\t\t\t\"NTS \"\n#endif\n#ifdef COMPILER\n\t\t\t\t\tCOMPILER\n\t\t\t\t\t\" \"\n#endif\n#ifdef ARCHITECTURE\n\t\t\t\t\tARCHITECTURE\n\t\t\t\t\t\" \"\n#endif\n#if ZEND_DEBUG\n/ ... 460 lines omitted ... /\nout:\n\tif (request_started) {\n\t\tphp_request_shutdown((void ) 0);\n\t}\n\tif (translated_path) {\n\t\tfree(translated_path);\n\t}\n\tif (exit_status == 0) {\n\t\texit_status = EG(exit_status);\n\t}\n\treturn exit_status;\nerr:\n\tsapi_deactivate();\n\tzend_ini_deactivate();\n\texit_status = 1;\n\tgoto out;\n}\n/* }}} /\n\n/ {{{ main\n```\n\n### sapi/cgi/cgi_main.c\n\n#### region() [lines 2422-2430]\n```c\n\t\t\t\t\t\t\t\tphp_module_shutdown();\n\t\t\t\t\t\t\t\treturn FAILURE;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (no_headers) {\n\t\t\t\t\t\t\t\tSG(headers_sent) = 1;\n\t\t\t\t\t\t\t\tSG(request_info).no_headers = 1;\n\t\t\t\t\t\t\t}\n#if ZEND_DEBUG\n\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n```\n\n### configure.ac\n\n#### region() [lines 1220-36]\n```\n\n```\n\n### sapi/fpm/fpm/fpm_main.c\n\n#### main() [lines 1567-2037]\n```c\n\n/* {{{ main\n /\nint main(int argc, char argv[])\n{\n\tint exit_status = FPM_EXIT_OK;\n\tint cgi = 0, c, use_extended_info = 0;\n\tzend_file_handle file_handle;\n\n\t/* temporary locals /\n\tint orig_optind = php_optind;\n\tchar orig_optarg = php_optarg;\n\tint ini_entries_len = 0;\n\t/* end of temporary locals /\n\n#ifdef ZTS\n\tvoid *tsrm_ls;\n#endif\n\n\tint max_requests = 500;\n\tint requests = 0;\n\tint fcgi_fd = 0;\n\tfcgi_request request;\n\tchar fpm_config = NULL;\n\tchar fpm_prefix = NULL;\n\tchar fpm_pid = NULL;\n\tint test_conf = 0;\n\tint force_daemon = -1;\n\tint force_stderr = 0;\n\tint php_information = 0;\n\tint php_allow_to_run_as_root = 0;\n\n#ifdef HAVE_SIGNAL_H\n#if defined(SIGPIPE) && defined(SIG_IGN)\n\tsignal(SIGPIPE, SIG_IGN); / ignore SIGPIPE in standalone mode so\n\t\t\t\t\t\t\t\tthat sockets created via fsockopen()\n\t\t\t\t\t\t\t\tdon't kill PHP if the remote site\n\t\t\t\t\t\t\t\tcloses it. in apache\|apxs mode apache\n\t\t\t\t\t\t\t\tdoes that for us! thies@thieso.net\n\t\t\t\t\t\t\t\t20000419 /\n/ ... 139 lines omitted ... /\n\n\t\t\tcase 'v': / show php version & quit /\n\t\t\t\tcgi_sapi_module.startup(&cgi_sapi_module);\n\t\t\t\tif (php_request_startup() == FAILURE) {\n\t\t\t\t\tSG(server_context) = NULL;\n\t\t\t\t\tphp_module_shutdown();\n\t\t\t\t\treturn FPM_EXIT_SOFTWARE;\n\t\t\t\t}\n\t\t\t\tSG(headers_sent) = 1;\n\t\t\t\tSG(request_info).no_headers = 1;\n\n#if ZEND_DEBUG\n\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n#else\n\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n#endif\n\t\t\t\tphp_request_shutdown((void ) 0);\n\t\t\t\tfcgi_shutdown();\n\t\t\t\texit_status = FPM_EXIT_OK;\n\t\t\t\tgoto out;\n\t\t}\n\t}\n\n\tif (php_information) {\n\t\tcgi_sapi_module.phpinfo_as_text = 1;\n\t\tcgi_sapi_module.startup(&cgi_sapi_module);\n\t\tif (php_request_startup() == FAILURE) {\n\t\t\tSG(server_context) = NULL;\n\t\t\tphp_module_shutdown();\n/* ... 243 lines omitted ... /\n\n\tSG(server_context) = NULL;\n\tphp_module_shutdown();\n\n\tif (parent) {\n\t\tsapi_shutdown();\n\t}\n\n#ifdef ZTS\n\ttsrm_shutdown();\n#endif\n\n#if defined(PHP_WIN32) && ZEND_DEBUG && 0\n\t_CrtDumpMemoryLeaks();\n#endif\n\n\treturn exit_status;\n}\n/ }}} /\n\n```\n\n\n## Upstream Fix\n```diff\nIndex: php-7.2.4/ext/standard/info.c\n===================================================================\n--- php-7.2.4.orig/ext/standard/info.c\t2018-03-27 15:10:52.000000000 +0200\n+++ php-7.2.4/ext/standard/info.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -830,7 +830,7 @@ PHPAPI void php_print_info(int flag)\n \t\tphp_info_print_box_end();\n \t\tphp_info_print_table_start();\n \t\tphp_info_print_table_row(2, \"System\", ZSTR_VAL(php_uname));\n-\t\tphp_info_print_table_row(2, \"Build Date\", __DATE__ \" \" __TIME__);\n+\t\t/php_info_print_table_row(2, \"Build Date\", __DATE__ \" \" __TIME__);/\n #ifdef COMPILER\n \t\tphp_info_print_table_row(2, \"Compiler\", COMPILER);\n #endif\n@@ -838,7 +838,7 @@ PHPAPI void php_print_info(int flag)\n \t\tphp_info_print_table_row(2, \"Architecture\", ARCHITECTURE);\n #endif\n #ifdef CONFIGURE_COMMAND\n-\t\tphp_info_print_table_row(2, \"Configure Command\", CONFIGURE_COMMAND );\n+\t\t/ php_info_print_table_row(2, \"Configure Command\", CONFIGURE_COMMAND ); /\n #endif\n \n \t\tif (sapi_module.pretty_name) {\nIndex: php-7.2.4/sapi/cli/php_cli.c\n===================================================================\n--- php-7.2.4.orig/sapi/cli/php_cli.c\t2018-03-27 15:10:57.000000000 +0200\n+++ php-7.2.4/sapi/cli/php_cli.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -697,8 +697,8 @@ static int do_cli(int argc, char argv)\n \t\t\t\tgoto out;\n \n \t\t\tcase 'v': / show php version & quit /\n-\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) ( %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\",\n-\t\t\t\t\tPHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,\n+\t\t\t\tphp_printf(\"PHP %s (%s) ( %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\",\n+\t\t\t\t\tPHP_VERSION, cli_sapi_module.name,\n #if ZTS\n \t\t\t\t\t\"ZTS \"\n #else\nIndex: php-7.2.4/sapi/cgi/cgi_main.c\n===================================================================\n--- php-7.2.4.orig/sapi/cgi/cgi_main.c\t2018-03-27 15:10:57.000000000 +0200\n+++ php-7.2.4/sapi/cgi/cgi_main.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -2427,9 +2427,9 @@ consult the installation file that came\n \t\t\t\t\t\t\t\tSG(request_info).no_headers = 1;\n \t\t\t\t\t\t\t}\n #if ZEND_DEBUG\n-\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #else\n-\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) \\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #endif\n \t\t\t\t\t\t\tphp_request_shutdown((void ) 0);\n \t\t\t\t\t\t\tfcgi_shutdown();\nIndex: php-7.2.4/configure.ac\n===================================================================\n--- php-7.2.4.orig/configure.ac\t2018-04-04 13:05:25.675487878 +0200\n+++ php-7.2.4/configure.ac\t2018-04-04 13:10:53.817149061 +0200\n@@ -1269,13 +1269,12 @@ EXTRA_LDFLAGS=\"$EXTRA_LDFLAGS $PHP_LDFLA\n EXTRA_LDFLAGS_PROGRAM=\"$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS\"\n \n # SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/\n-PHP_BUILD_DATE=`date --utc --date=\"@${SOURCE_DATE_EPOCH:-$(date +%s)}\" +%Y-%m-%d 2>/dev/null`\n-if test $? -ne 0 ; then\n-PHP_BUILD_DATE=`date -u +%Y-%m-%d`\n-fi\n+#totally fake, not used anywhere in userspace\n+PHP_BUILD_DATE=\"1970-01-01\"\n AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,\"$PHP_BUILD_DATE\",[PHP build date])\n \n-PHP_UNAME=`uname -a \| xargs`\n+dnl Totally fake, it wasnt and will never be reliable anyway.\n+PHP_UNAME=\"Linux suse 2.6.36 #1 SMP 2011-02-21 10:34:10 +0100 x86_64 x86_64 x86_64 GNU/Linux\"\n AC_DEFINE_UNQUOTED(PHP_UNAME,\"$PHP_UNAME\",[uname -a output])\n PHP_OS=`uname \| xargs`\n AC_DEFINE_UNQUOTED(PHP_OS,\"$PHP_OS\",[uname output])\nIndex: php-7.2.4/sapi/fpm/fpm/fpm_main.c\n===================================================================\n--- php-7.2.4.orig/sapi/fpm/fpm/fpm_main.c\t2018-03-27 15:10:57.000000000 +0200\n+++ php-7.2.4/sapi/fpm/fpm/fpm_main.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -1755,9 +1755,9 @@ int main(int argc, char argv[])\n \t\t\t\tSG(request_info).no_headers = 1;\n \n #if ZEND_DEBUG\n-\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\tphp_printf(\"PHP %s (%s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #else\n-\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\tphp_printf(\"PHP %s (%s) \\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #endif\n \t\t\t\tphp_request_shutdown((void ) 0);\n \t\t\t\tfcgi_shutdown();\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: php-7.2.4/ext/standard/info.c\n===================================================================\n--- php-7.2.4.orig/ext/standard/info.c\t2018-03-27 15:10:52.000000000 +0200\n+++ php-7.2.4/ext/standard/info.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -830,7 +830,7 @@ PHPAPI void php_print_info(int flag)\n \t\tphp_info_print_box_end();\n \t\tphp_info_print_table_start();\n \t\tphp_info_print_table_row(2, \"System\", ZSTR_VAL(php_uname));\n-\t\tphp_info_print_table_row(2, \"Build Date\", __DATE__ \" \" __TIME__);\n+\t\t/php_info_print_table_row(2, \"Build Date\", __DATE__ \" \" __TIME__);/\n #ifdef COMPILER\n \t\tphp_info_print_table_row(2, \"Compiler\", COMPILER);\n #endif\n@@ -838,7 +838,7 @@ PHPAPI void php_print_info(int flag)\n \t\tphp_info_print_table_row(2, \"Architecture\", ARCHITECTURE);\n #endif\n #ifdef CONFIGURE_COMMAND\n-\t\tphp_info_print_table_row(2, \"Configure Command\", CONFIGURE_COMMAND );\n+\t\t/* php_info_print_table_row(2, \"Configure Command\", CONFIGURE_COMMAND ); /\n #endif\n \n \t\tif (sapi_module.pretty_name) {\nIndex: php-7.2.4/sapi/cli/php_cli.c\n===================================================================\n--- php-7.2.4.orig/sapi/cli/php_cli.c\t2018-03-27 15:10:57.000000000 +0200\n+++ php-7.2.4/sapi/cli/php_cli.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -697,8 +697,8 @@ static int do_cli(int argc, char argv)\n \t\t\t\tgoto out;\n \n \t\t\tcase 'v': / show php version & quit /\n-\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) ( %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\",\n-\t\t\t\t\tPHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,\n+\t\t\t\tphp_printf(\"PHP %s (%s) ( %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\",\n+\t\t\t\t\tPHP_VERSION, cli_sapi_module.name,\n #if ZTS\n \t\t\t\t\t\"ZTS \"\n #else\nIndex: php-7.2.4/sapi/cgi/cgi_main.c\n===================================================================\n--- php-7.2.4.orig/sapi/cgi/cgi_main.c\t2018-03-27 15:10:57.000000000 +0200\n+++ php-7.2.4/sapi/cgi/cgi_main.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -2427,9 +2427,9 @@ consult the installation file that came\n \t\t\t\t\t\t\t\tSG(request_info).no_headers = 1;\n \t\t\t\t\t\t\t}\n #if ZEND_DEBUG\n-\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #else\n-\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\t\t\t\tphp_printf(\"PHP %s (%s) \\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #endif\n \t\t\t\t\t\t\tphp_request_shutdown((void ) 0);\n \t\t\t\t\t\t\tfcgi_shutdown();\nIndex: php-7.2.4/configure.ac\n===================================================================\n--- php-7.2.4.orig/configure.ac\t2018-04-04 13:05:25.675487878 +0200\n+++ php-7.2.4/configure.ac\t2018-04-04 13:10:53.817149061 +0200\n@@ -1269,13 +1269,12 @@ EXTRA_LDFLAGS=\"$EXTRA_LDFLAGS $PHP_LDFLA\n EXTRA_LDFLAGS_PROGRAM=\"$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS\"\n \n # SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/\n-PHP_BUILD_DATE=`date --utc --date=\"@${SOURCE_DATE_EPOCH:-$(date +%s)}\" +%Y-%m-%d 2>/dev/null`\n-if test $? -ne 0 ; then\n-PHP_BUILD_DATE=`date -u +%Y-%m-%d`\n-fi\n+#totally fake, not used anywhere in userspace\n+PHP_BUILD_DATE=\"1970-01-01\"\n AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,\"$PHP_BUILD_DATE\",[PHP build date])\n \n-PHP_UNAME=`uname -a \| xargs`\n+dnl Totally fake, it wasnt and will never be reliable anyway.\n+PHP_UNAME=\"Linux suse 2.6.36 #1 SMP 2011-02-21 10:34:10 +0100 x86_64 x86_64 x86_64 GNU/Linux\"\n AC_DEFINE_UNQUOTED(PHP_UNAME,\"$PHP_UNAME\",[uname -a output])\n PHP_OS=`uname \| xargs`\n AC_DEFINE_UNQUOTED(PHP_OS,\"$PHP_OS\",[uname output])\nIndex: php-7.2.4/sapi/fpm/fpm/fpm_main.c\n===================================================================\n--- php-7.2.4.orig/sapi/fpm/fpm/fpm_main.c\t2018-03-27 15:10:57.000000000 +0200\n+++ php-7.2.4/sapi/fpm/fpm/fpm_main.c\t2018-04-04 13:05:25.675487878 +0200\n@@ -1755,9 +1755,9 @@ int main(int argc, char argv[])\n \t\t\t\tSG(request_info).no_headers = 1;\n \n #if ZEND_DEBUG\n-\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\tphp_printf(\"PHP %s (%s) (DEBUG)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #else\n-\t\t\t\tphp_printf(\"PHP %s (%s) (built: %s %s)\\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());\n+\t\t\t\tphp_printf(\"PHP %s (%s) \\nCopyright (c) 1997-2018 The PHP Group\\n%s\", PHP_VERSION, sapi_module.name, get_zend_version());\n #endif\n \t\t\t\tphp_request_shutdown((void ) 0);\n \t\t\t\tfcgi_shutdown();\n" } ]	{ "id": "php7-11377-php7-no-build-date.patch", "cves": [ "CVE-2019-11043" ], "package": "php7", "incident_id": 11377, "patch_name": "php7-no-build-date.patch", "tier": "identical", "language": "c", "patch_lines_changed": 25, "patch_files_count": 5, "total_tokens_est": 2596, "has_source_context": true, "upstream_enriched": false, "suse_license": "PHP-3.01", "upstream_license": "NOASSERTION", "cve_id": "CVE-2019-11043", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-11043\n\nX-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fexif%2Fexif.c;h=cad29b729548e4206f0697710cc9e177f26fdff3;hp=1147980f7730de0dfd13904a2ea6461bbf4eded8;hb=3462efa386f26d34306\n\n## Package\nphp7\n\n## Files to modify\n- ext/exif/exif.c\n\n## Target Source Code\n\n### ext/exif/exif.c\n\n#### region() [lines 3116-3226]\n```c\n\n/* {{{ exif_process_IFD_in_MAKERNOTE\n * Process nested IFDs directories in Maker Note. /\nstatic int exif_process_IFD_in_MAKERNOTE(image_info_type ImageInfo, char * value_ptr, int value_len, char offset_base, size_t IFDlength, size_t displacement)\n{\n\tsize_t i;\n\tint de, section_index = SECTION_MAKERNOTE;\n\tint NumDirEntries, old_motorola_intel;\n#ifdef KALLE_0\n\tint offset_diff;\n#endif\n\tconst maker_note_type maker_note;\n\tchar dir_start;\n\t\n\tfor (i=0; i<=sizeof(maker_note_array)/sizeof(maker_note_type); i++) {\n\t\tif (i==sizeof(maker_note_array)/sizeof(maker_note_type)) {\n#ifdef EXIF_DEBUG\n\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"No maker note data found. Detected maker: %s (length = %d)\", ImageInfo->make, strlen(ImageInfo->make));\n#endif\n\t\t\t/ unknown manufacturer, not an error, use it as a string /\n\t\t\treturn TRUE;\n\t\t}\n\n\t\tmaker_note = maker_note_array+i;\n\n\t\t/exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"check (%s,%s)\", maker_note->make?maker_note->make:\"\", maker_note->model?maker_note->model:\"\");/\n\t\tif (maker_note->make && (!ImageInfo->make \|\| strcmp(maker_note->make, ImageInfo->make)))\n\t\t\tcontinue;\n\t\tif (maker_note->model && (!ImageInfo->model \|\| strcmp(maker_note->model, ImageInfo->model)))\n\t\t\tcontinue;\n\t\tif (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))\n\t\t\tcontinue;\n\t\tbreak;\n\t}\n\t\n\tif (maker_note->offset >= value_len) {\n\t\t/ Do not go past the value end /\n\t\texif_error_docref(\"exif_read_data#error_ifd\" EXIFERR_CC, ImageInfo, E_WARNING, \"IFD data too short: 0x%04X offset 0x%04X\", value_len, maker_note->offset);\n\t\treturn FALSE;\n\t}\n\n\tdir_start = value_ptr + maker_note->offset;\n\n#ifdef EXIF_DEBUG\n\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Process %s @x%04X + 0x%04X=%d: %s\", exif_get_sectionname(section_index), (int)dir_start-(int)offset_base+maker_note->offset+displacement, value_len, value_len, exif_char_dump(value_ptr, value_len, (int)dir_start-(int)offset_base+maker_note->offset+displacement));\n#endif\n\n\tImageInfo->sections_found \|= FOUND_MAKERNOTE;\n\n\told_motorola_intel = ImageInfo->motorola_intel;\n\tswitch (maker_note->byte_order) {\n\t\tcase MN_ORDER_INTEL:\n\t\t\tImageInfo->motorola_intel = 0;\n\t\t\tbreak;\n\t\tcase MN_ORDER_MOTOROLA:\n\t\t\tImageInfo->motorola_intel = 1;\n\t\t\tbreak;\n\t\tdefault:\n\t\tcase MN_ORDER_NORMAL:\n\t\t\tbreak;\n\t}\n\n\tNumDirEntries = php_ifd_get16u(dir_start, ImageInfo->motorola_intel);\n\n\tswitch (maker_note->offset_mode) {\n\t\tcase MN_OFFSET_MAKER:\n\t\t\toffset_base = value_ptr;\n\t\t\tbreak;\n#ifdef KALLE_0\n\t\tcase MN_OFFSET_GUESS:\n\t\t\tif (maker_note->offset + 10 + 4 >= value_len) {\n\t\t\t\t/ Can not read dir_start+10 since it's beyond value end /\n\t\t\t\texif_error_docref(\"exif_read_data#error_ifd\" EXIFERR_CC, ImageInfo, E_WARNING, \"IFD data too short: 0x%04X\", value_len);\n\t\t\t\treturn FALSE;\n\t\t\t}\n\t\t\toffset_diff = 2 + NumDirEntries12 + 4 - php_ifd_get32u(dir_start+10, ImageInfo->motorola_intel);\n#ifdef EXIF_DEBUG\n\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Using automatic offset correction: 0x%04X\", ((int)dir_start-(int)offset_base+maker_note->offset+displacement) + offset_diff);\n#endif\n\t\t\tif (offset_diff < 0 \|\| offset_diff >= value_len ) {\n\t\t\t\texif_error_docref(\"exif_read_data#error_ifd\" EXIFERR_CC, ImageInfo, E_WARNING, \"IFD data bad offset: 0x%04X length 0x%04X\", offset_diff, value_len);\n\t\t\t\treturn FALSE;\n\t\t\t}\n\t\t\toffset_base = value_ptr + offset_diff;\n\t\t\tbreak;\n#endif\n\t\tdefault:\n\t\tcase MN_OFFSET_NORMAL:\n\t\t\tbreak;\n\t}\n\n\tif ((2+NumDirEntries12) > value_len) {\n\t\texif_error_docref(\"exif_read_data#error_ifd\" EXIFERR_CC, ImageInfo, E_WARNING, \"Illegal IFD size: 2 + 0x%04X12 = 0x%04X > 0x%04X\", NumDirEntries, 2+NumDirEntries12, value_len);\n\t\treturn FALSE;\n\t}\n\n\tfor (de=0;de<NumDirEntries;de++) {\n\t\tif (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 de,\n\t\t\t\t\t\t\t\t offset_base, IFDlength, displacement, section_index, 0, maker_note->tag_table)) {\n\t\t\treturn FALSE;\n\t\t}\n\t}\n\tImageInfo->motorola_intel = old_motorola_intel;\n/\tNextDirOffset (must be NULL) = php_ifd_get32u(dir_start+2+12de, ImageInfo->motorola_intel);/\n#ifdef EXIF_DEBUG\n\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Subsection %s done\", exif_get_sectionname(SECTION_MAKERNOTE));\n#endif\n\treturn TRUE;\n}\n/ }}} /\n\n```\n\n#### region() [lines 3192-3200]\n```c\n#ifdef EXIF_DEBUG\n\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Using automatic offset correction: 0x%04X\", ((int)dir_start-(int)offset_base+maker_note->offset+displacement) + offset_diff);\n#endif\n\t\t\tif (offset_diff < 0 \|\| offset_diff >= value_len ) {\n\t\t\t\texif_error_docref(\"exif_read_data#error_ifd\" EXIFERR_CC, ImageInfo, E_WARNING, \"IFD data bad offset: 0x%04X length 0x%04X\", offset_diff, value_len);\n\t\t\t\treturn FALSE;\n\t\t\t}\n\t\t\toffset_base = value_ptr + offset_diff;\n\t\t\tbreak;\n```\n\n\n## Upstream Fix\n```diff\nX-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fexif%2Fexif.c;h=cad29b729548e4206f0697710cc9e177f26fdff3;hp=1147980f7730de0dfd13904a2ea6461bbf4eded8;hb=3462efa386f26d343062094514af604c29e3edce;hpb=1baeae42703f9b2ec21fff787146eeca08d45535\n\nIndex: php-7.2.5/ext/exif/exif.c\n===================================================================\n--- php-7.2.5.orig/ext/exif/exif.c\t2018-08-04 09:18:43.566167854 +0200\n+++ php-7.2.5/ext/exif/exif.c\t2018-08-04 09:25:27.280266346 +0200\n@@ -3126,6 +3126,7 @@ static int exif_process_IFD_in_MAKERNOTE\n #endif\n \tconst maker_note_type maker_note;\n \tchar dir_start;\n+ int data_len;\n \t\n \tfor (i=0; i<=sizeof(maker_note_array)/sizeof(maker_note_type); i++) {\n \t\tif (i==sizeof(maker_note_array)/sizeof(maker_note_type)) {\n@@ -3180,6 +3181,7 @@ static int exif_process_IFD_in_MAKERNOTE\n \tswitch (maker_note->offset_mode) {\n \t\tcase MN_OFFSET_MAKER:\n \t\t\toffset_base = value_ptr;\n+\t\t\tdata_len = value_len;\n \t\t\tbreak;\n #ifdef KALLE_0\n \t\tcase MN_OFFSET_GUESS:\n@@ -3197,6 +3199,7 @@ static int exif_process_IFD_in_MAKERNOTE\n \t\t\t\treturn FALSE;\n \t\t\t}\n \t\t\toffset_base = value_ptr + offset_diff;\n+\t\t\tdata_len = value_len - offset_diff;\n \t\t\tbreak;\n #endif\n \t\tdefault:\n@@ -3211,7 +3214,7 @@ static int exif_process_IFD_in_MAKERNOTE\n \n \tfor (de=0;de<NumDirEntries;de++) {\n \t\tif (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 de,\n-\t\t\t\t\t\t\t\t offset_base, IFDlength, displacement, section_index, 0, maker_note->tag_table)) {\n+\t\t\t\t\t\t\t\t offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {\n \t\t\treturn FALSE;\n \t\t}\n \t}\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "X-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fexif%2Fexif.c;h=cad29b729548e4206f0697710cc9e177f26fdff3;hp=1147980f7730de0dfd13904a2ea6461bbf4eded8;hb=3462efa386f26d343062094514af604c29e3edce;hpb=1baeae42703f9b2ec21fff787146eeca08d45535\n\nIndex: php-7.2.5/ext/exif/exif.c\n===================================================================\n--- php-7.2.5.orig/ext/exif/exif.c\t2018-08-04 09:18:43.566167854 +0200\n+++ php-7.2.5/ext/exif/exif.c\t2018-08-04 09:25:27.280266346 +0200\n@@ -3126,6 +3126,7 @@ static int exif_process_IFD_in_MAKERNOTE\n #endif\n \tconst maker_note_type maker_note;\n \tchar dir_start;\n+ int data_len;\n \t\n \tfor (i=0; i<=sizeof(maker_note_array)/sizeof(maker_note_type); i++) {\n \t\tif (i==sizeof(maker_note_array)/sizeof(maker_note_type)) {\n@@ -3180,6 +3181,7 @@ static int exif_process_IFD_in_MAKERNOTE\n \tswitch (maker_note->offset_mode) {\n \t\tcase MN_OFFSET_MAKER:\n \t\t\toffset_base = value_ptr;\n+\t\t\tdata_len = value_len;\n \t\t\tbreak;\n #ifdef KALLE_0\n \t\tcase MN_OFFSET_GUESS:\n@@ -3197,6 +3199,7 @@ static int exif_process_IFD_in_MAKERNOTE\n \t\t\t\treturn FALSE;\n \t\t\t}\n \t\t\toffset_base = value_ptr + offset_diff;\n+\t\t\tdata_len = value_len - offset_diff;\n \t\t\tbreak;\n #endif\n \t\tdefault:\n@@ -3211,7 +3214,7 @@ static int exif_process_IFD_in_MAKERNOTE\n \n \tfor (de=0;de<NumDirEntries;de++) {\n \t\tif (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,\n-\t\t\t\t\t\t\t\t offset_base, IFDlength, displacement, section_index, 0, maker_note->tag_table)) {\n+\t\t\t\t\t\t\t\t offset_base, data_len, displacement, section_index, 0, maker_note->tag_table)) {\n \t\t\treturn FALSE;\n \t\t}\n \t}\n" } ]	{ "id": "php7-11377-php-CVE-2018-14851.patch", "cves": [ "CVE-2019-11043" ], "package": "php7", "incident_id": 11377, "patch_name": "php-CVE-2018-14851.patch", "tier": "identical", "language": "c", "patch_lines_changed": 5, "patch_files_count": 1, "total_tokens_est": 965, "has_source_context": true, "upstream_enriched": false, "suse_license": "PHP-3.01", "upstream_license": "NOASSERTION", "cve_id": "CVE-2019-11043", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-11043\n\n===================================================================\n\n## Package\nphp7\n\n## Files to modify\n- main/streams/plain_wrapper.c\n\n## Target Source Code\n\n### main/streams/plain_wrapper.c\n\n#### php_plain_files_rename() [lines 1130-1217]\n```c\n\treturn 1;\n}\n\nstatic int php_plain_files_rename(php_stream_wrapper wrapper, const char url_from, const char url_to, int options, php_stream_context context)\n{\n\tint ret;\n\n\tif (!url_from \|\| !url_to) {\n\t\treturn 0;\n\t}\n\n#ifdef PHP_WIN32\n\tif (!php_win32_check_trailing_space(url_from, strlen(url_from))) {\n\t\tphp_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to);\n\t\treturn 0;\n\t}\n\tif (!php_win32_check_trailing_space(url_to, strlen(url_to))) {\n\t\tphp_win32_docref2_from_error(ERROR_INVALID_NAME, url_from, url_to);\n\t\treturn 0;\n\t}\n#endif\n\n\tif (strncasecmp(url_from, \"file://\", sizeof(\"file://\") - 1) == 0) {\n\t\turl_from += sizeof(\"file://\") - 1;\n\t}\n\n\tif (strncasecmp(url_to, \"file://\", sizeof(\"file://\") - 1) == 0) {\n\t\turl_to += sizeof(\"file://\") - 1;\n\t}\n\n\tif (php_check_open_basedir(url_from) \|\| php_check_open_basedir(url_to)) {\n\t\treturn 0;\n\t}\n\n\tret = VCWD_RENAME(url_from, url_to);\n\n\tif (ret == -1) {\n#ifndef PHP_WIN32\n# ifdef EXDEV\n\t\tif (errno == EXDEV) {\n\t\t\tzend_stat_t sb;\n\t\t\tif (php_copy_file(url_from, url_to) == SUCCESS) {\n\t\t\t\tif (VCWD_STAT(url_from, &sb) == 0) {\n# ifndef TSRM_WIN32\n\t\t\t\t\tif (VCWD_CHMOD(url_to, sb.st_mode)) {\n\t\t\t\t\t\tif (errno == EPERM) {\n\t\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n\t\t\t\t\t\t\tVCWD_UNLINK(url_from);\n\t\t\t\t\t\t\treturn 1;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n\t\t\t\t\t\treturn 0;\n\t\t\t\t\t}\n\t\t\t\t\tif (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) {\n\t\t\t\t\t\tif (errno == EPERM) {\n\t\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n\t\t\t\t\t\t\tVCWD_UNLINK(url_from);\n\t\t\t\t\t\t\treturn 1;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n\t\t\t\t\t\treturn 0;\n\t\t\t\t\t}\n# endif\n\t\t\t\t\tVCWD_UNLINK(url_from);\n\t\t\t\t\treturn 1;\n\t\t\t\t}\n\t\t\t}\n\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n\t\t\treturn 0;\n\t\t}\n# endif\n#endif\n\n#ifdef PHP_WIN32\n\t\tphp_win32_docref2_from_error(GetLastError(), url_from, url_to);\n#else\n\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n#endif\n\t\treturn 0;\n\t}\n\n\t/* Clear stat cache (and realpath cache) /\n\tphp_clear_stat_cache(1, NULL, 0);\n\n\treturn 1;\n}\n\nstatic int php_plain_files_mkdir(php_stream_wrapper wrapper, const char dir, int mode, int options, php_stream_context context)\n```\n\n\n## Upstream Fix\n```diff\nIndex: php-7.2.5/main/streams/plain_wrapper.c\n===================================================================\n--- php-7.2.5.orig/main/streams/plain_wrapper.c\t2019-03-20 11:59:59.515315899 +0100\n+++ php-7.2.5/main/streams/plain_wrapper.c\t2019-03-20 12:00:44.107570303 +0100\n@@ -1168,34 +1168,51 @@ static int php_plain_files_rename(php_st\n # ifdef EXDEV\n \t\tif (errno == EXDEV) {\n \t\t\tzend_stat_t sb;\n+# if !defined(ZTS) && !defined(TSRM_WIN32) && !defined(NETWARE)\n+\t\t\t/* not sure what to do in ZTS case, umask is not thread-safe /\n+\t\t\tint oldmask = umask(077);\n+# endif\n+\t\t\tint success = 0;\n \t\t\tif (php_copy_file(url_from, url_to) == SUCCESS) {\n \t\t\t\tif (VCWD_STAT(url_from, &sb) == 0) {\n+\t\t\t\t\tsuccess = 1;\n # ifndef TSRM_WIN32\n-\t\t\t\t\tif (VCWD_CHMOD(url_to, sb.st_mode)) {\n-\t\t\t\t\t\tif (errno == EPERM) {\n-\t\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\t\tVCWD_UNLINK(url_from);\n-\t\t\t\t\t\t\treturn 1;\n-\t\t\t\t\t\t}\n+\t\t\t\t\t/\n+\t\t\t\t\t * Try to set user and permission info on the target.\n+\t\t\t\t\t * If we're not root, then some of these may fail.\n+\t\t\t\t\t * We try chown first, to set proper group info, relying\n+\t\t\t\t\t * on the system environment to have proper umask to not allow\n+\t\t\t\t\t * access to the file in the meantime.\n+\t\t\t\t\t /\n+\t\t\t\t\tif (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) {\n \t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\treturn 0;\n+\t\t\t\t\t\tif (errno != EPERM) {\n+\t\t\t\t\t\t\tsuccess = 0;\n+\t\t\t\t\t\t}\n \t\t\t\t\t}\n-\t\t\t\t\tif (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) {\n-\t\t\t\t\t\tif (errno == EPERM) {\n+\n+\t\t\t\t\tif (success) {\n+\t\t\t\t\t\tif (VCWD_CHMOD(url_to, sb.st_mode)) {\n \t\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\t\tVCWD_UNLINK(url_from);\n-\t\t\t\t\t\t\treturn 1;\n+\t\t\t\t\t\t\tif (errno != EPERM) {\n+\t\t\t\t\t\t\t\tsuccess = 0;\n+\t\t\t\t\t\t\t}\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\treturn 0;\n \t\t\t\t\t}\n # endif\n-\t\t\t\t\tVCWD_UNLINK(url_from);\n-\t\t\t\t\treturn 1;\n+\t\t\t\t\tif (success) {\n+\t\t\t\t\t\tVCWD_UNLINK(url_from);\n+\t\t\t\t\t}\n+\t\t\t\t} else {\n+\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n \t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n \t\t\t}\n-\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\treturn 0;\n+# if !defined(ZTS) && !defined(TSRM_WIN32) && !defined(NETWARE)\n+\t\t\tumask(oldmask);\n+# endif\n+\t\t\treturn success;\n \t\t}\n # endif\n #endif\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: php-7.2.5/main/streams/plain_wrapper.c\n===================================================================\n--- php-7.2.5.orig/main/streams/plain_wrapper.c\t2019-03-20 11:59:59.515315899 +0100\n+++ php-7.2.5/main/streams/plain_wrapper.c\t2019-03-20 12:00:44.107570303 +0100\n@@ -1168,34 +1168,51 @@ static int php_plain_files_rename(php_st\n # ifdef EXDEV\n \t\tif (errno == EXDEV) {\n \t\t\tzend_stat_t sb;\n+# if !defined(ZTS) && !defined(TSRM_WIN32) && !defined(NETWARE)\n+\t\t\t/ not sure what to do in ZTS case, umask is not thread-safe /\n+\t\t\tint oldmask = umask(077);\n+# endif\n+\t\t\tint success = 0;\n \t\t\tif (php_copy_file(url_from, url_to) == SUCCESS) {\n \t\t\t\tif (VCWD_STAT(url_from, &sb) == 0) {\n+\t\t\t\t\tsuccess = 1;\n # ifndef TSRM_WIN32\n-\t\t\t\t\tif (VCWD_CHMOD(url_to, sb.st_mode)) {\n-\t\t\t\t\t\tif (errno == EPERM) {\n-\t\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\t\tVCWD_UNLINK(url_from);\n-\t\t\t\t\t\t\treturn 1;\n-\t\t\t\t\t\t}\n+\t\t\t\t\t/\n+\t\t\t\t\t * Try to set user and permission info on the target.\n+\t\t\t\t\t * If we're not root, then some of these may fail.\n+\t\t\t\t\t * We try chown first, to set proper group info, relying\n+\t\t\t\t\t * on the system environment to have proper umask to not allow\n+\t\t\t\t\t * access to the file in the meantime.\n+\t\t\t\t\t */\n+\t\t\t\t\tif (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) {\n \t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\treturn 0;\n+\t\t\t\t\t\tif (errno != EPERM) {\n+\t\t\t\t\t\t\tsuccess = 0;\n+\t\t\t\t\t\t}\n \t\t\t\t\t}\n-\t\t\t\t\tif (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) {\n-\t\t\t\t\t\tif (errno == EPERM) {\n+\n+\t\t\t\t\tif (success) {\n+\t\t\t\t\t\tif (VCWD_CHMOD(url_to, sb.st_mode)) {\n \t\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\t\tVCWD_UNLINK(url_from);\n-\t\t\t\t\t\t\treturn 1;\n+\t\t\t\t\t\t\tif (errno != EPERM) {\n+\t\t\t\t\t\t\t\tsuccess = 0;\n+\t\t\t\t\t\t\t}\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\t\t\t\treturn 0;\n \t\t\t\t\t}\n # endif\n-\t\t\t\t\tVCWD_UNLINK(url_from);\n-\t\t\t\t\treturn 1;\n+\t\t\t\t\tif (success) {\n+\t\t\t\t\t\tVCWD_UNLINK(url_from);\n+\t\t\t\t\t}\n+\t\t\t\t} else {\n+\t\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n \t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n \t\t\t}\n-\t\t\tphp_error_docref2(NULL, url_from, url_to, E_WARNING, \"%s\", strerror(errno));\n-\t\t\treturn 0;\n+# if !defined(ZTS) && !defined(TSRM_WIN32) && !defined(NETWARE)\n+\t\t\tumask(oldmask);\n+# endif\n+\t\t\treturn success;\n \t\t}\n # endif\n #endif\n" } ]	{ "id": "php7-11377-php-CVE-2019-9637.patch", "cves": [ "CVE-2019-11043" ], "package": "php7", "incident_id": 11377, "patch_name": "php-CVE-2019-9637.patch", "tier": "identical", "language": "c", "patch_lines_changed": 51, "patch_files_count": 1, "total_tokens_est": 1382, "has_source_context": true, "upstream_enriched": false, "suse_license": "PHP-3.01", "upstream_license": "NOASSERTION", "cve_id": "CVE-2019-11043", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-11043\n\n===================================================================\n\n## Package\nphp7\n\n## Files to modify\n- ext/gd/libgd/gd_bmp.c\n\n## Target Source Code\n\n### ext/gd/libgd/gd_bmp.c\n\n#### bmp_read_4bit() [lines 854-944]\n```c\n\treturn 0;\n}\n\nstatic int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t info, bmp_hdr_t header)\n{\n\tint ypos = 0, xpos = 0, row = 0, index = 0;\n\tint padding = 0, current_byte = 0;\n\n\tif (info->enctype != BMP_BI_RGB && info->enctype != BMP_BI_RLE4) {\n\t\treturn 1;\n\t}\n\n\tif (!info->numcolors) {\n\t\tinfo->numcolors = 16;\n\t} else if (info->numcolors < 0 \|\| info->numcolors > 16) {\n\t\treturn 1;\n\t}\n\n\tif (bmp_read_palette(im, infile, info->numcolors, (info->type == BMP_PALETTE_4))) {\n\t\treturn 1;\n\t}\n\n\tim->colorsTotal = info->numcolors;\n\n\t/* There is a chance the data isn't until later, would be wierd but it is possible /\n\tif (gdTell(infile) != header->off) {\n\t\t/ Should make sure we don't seek past the file size /\n\t\tif (!gdSeek(infile, header->off)) {\n\t\t\treturn 1;\n\t\t}\n\t}\n\n\t/ The line must be divisible by 4, else its padded with NULLs /\n\tpadding = ((int)ceil(0.5 info->width)) % 4;\n\tif (padding) {\n\t\tpadding = 4 - padding;\n\t}\n\n\tswitch (info->enctype) {\n\tcase BMP_BI_RGB:\n\t\tfor (ypos = 0; ypos < info->height; ++ypos) {\n\t\t\tif (info->topdown) {\n\t\t\t\trow = ypos;\n\t\t\t} else {\n\t\t\t\trow = info->height - ypos - 1;\n\t\t\t}\n\n\t\t\tfor (xpos = 0; xpos < info->width; xpos += 2) {\n\t\t\t\tif (!gdGetByte(&current_byte, infile)) {\n\t\t\t\t\treturn 1;\n\t\t\t\t}\n\n\t\t\t\tindex = (current_byte >> 4) & 0x0f;\n\t\t\t\tif (im->open[index]) {\n\t\t\t\t\tim->open[index] = 0;\n\t\t\t\t}\n\t\t\t\tgdImageSetPixel(im, xpos, row, index);\n\n\t\t\t\t/* This condition may get called often, potential optimsations /\n\t\t\t\tif (xpos >= info->width) {\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\n\t\t\t\tindex = current_byte & 0x0f;\n\t\t\t\tif (im->open[index]) {\n\t\t\t\t\tim->open[index] = 0;\n\t\t\t\t}\n\t\t\t\tgdImageSetPixel(im, xpos + 1, row, index);\n\t\t\t}\n\n\t\t\tfor (xpos = padding; xpos > 0; --xpos) {\n\t\t\t\tif (!gdGetByte(&index, infile)) {\n\t\t\t\t\treturn 1;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tbreak;\n\n\tcase BMP_BI_RLE4:\n\t\tif (bmp_read_rle(im, infile, info)) {\n\t\t\treturn 1;\n\t\t}\n\t\tbreak;\n\n\tdefault:\n\t\treturn 1;\n\t}\n\treturn 0;\n}\n\nstatic int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t info, bmp_hdr_t header)\n```\n\n#### gdImageBmpPtr() [lines 63-77]\n```c\n/\n\tFunction: gdImageBmpPtr\n/\nvoid gdImageBmpPtr(gdImagePtr im, int size, int compression)\n{\n\tvoid rv;\n\tgdIOCtx out = gdNewDynamicCtx(2048, NULL);\n\tif (out == NULL) return NULL;\n\tgdImageBmpCtx(im, out, compression);\n\trv = gdDPExtractData(out, size);\n\tout->gd_free(out);\n\treturn rv;\n}\n\n/\n```\n\n#### gdImageBmp() [lines 77-88]\n```c\n/\n\tFunction: gdImageBmp\n/\nvoid gdImageBmp(gdImagePtr im, FILE outFile, int compression)\n{\n\tgdIOCtx out = gdNewFileCtx(outFile);\n\tif (out == NULL) return;\n\tgdImageBmpCtx(im, out, compression);\n\tout->gd_free(out);\n}\n\n/\n```\n\n#### gdImageBmpCtx() [lines 88-292]\n```c\n/\n\tFunction: gdImageBmpCtx\n/\nvoid gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)\n{\n\tint bitmap_size = 0, info_size, total_size, padding;\n\tint i, row, xpos, pixel;\n\tint error = 0;\n\tunsigned char uncompressed_row = NULL, uncompressed_row_start = NULL;\n\tFILE tmpfile_for_compression = NULL;\n\tgdIOCtxPtr out_original = NULL;\n\n\t/* No compression if its true colour or we don't support seek /\n\tif (im->trueColor) {\n\t\tcompression = 0;\n\t}\n\n\tif (compression == 1 && !out->seek) {\n\t\t/ Try to create a temp file where we can seek /\n\t\tif ((tmpfile_for_compression = tmpfile()) == NULL) {\n\t\t\tcompression = 0;\n\t\t} else {\n\t\t\tout_original = out;\n\t\t\tif ((out = (gdIOCtxPtr)gdNewFileCtx(tmpfile_for_compression)) == NULL) {\n\t\t\t\tout = out_original;\n\t\t\t\tout_original = NULL;\n\t\t\t\tcompression = 0;\n\t\t\t}\n\t\t}\n\t}\n\n\tbitmap_size = ((im->sx (im->trueColor ? 24 : 8)) / 8) * im->sy;\n\n\t/* 40 byte Windows v3 header /\n\tinfo_size = BMP_WINDOWS_V3;\n\n\t/ data for the palette /\n\tif (!im->trueColor) {\n\t\tinfo_size += im->colorsTotal 4;\n\t\tif (compression) {\n/* ... 136 lines omitted ... /\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tgdPutBuf(copy_buffer , buffer_size, out_original);\n\t\t}\n\t\tgdFree(copy_buffer);\n\n\t\t/ Replace the temp with the original which now has data /\n\t\tout->gd_free(out);\n\t\tout = out_original;\n\t\tout_original = NULL;\n\t}\n\ncleanup:\n\tif (tmpfile_for_compression) {\n#ifdef _WIN32\n\t\t_rmtmp();\n#else\n\t\tfclose(tmpfile_for_compression);\n#endif\n\t\ttmpfile_for_compression = NULL;\n\t}\n\n\tif (out_original) {\n\t\tout_original->gd_free(out_original);\n\t}\n\treturn;\n}\n\nstatic int compress_row(unsigned char row, int length)\n```\n\n\n## Upstream Fix\n```diff\nIndex: php-7.2.5/ext/gd/libgd/gd_bmp.c\n===================================================================\n--- php-7.2.5.orig/ext/gd/libgd/gd_bmp.c\t2018-04-24 17:09:54.000000000 +0200\n+++ php-7.2.5/ext/gd/libgd/gd_bmp.c\t2018-08-27 16:21:13.287949435 +0200\n@@ -40,6 +40,8 @@ static int bmp_read_4bit(gdImagePtr im,\n static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t info, bmp_hdr_t header);\n static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t info);\n \n+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);\n+\n #define BMP_DEBUG(s)\n \n static int gdBMPPutWord(gdIOCtx out, int w)\n@@ -68,8 +70,10 @@ void * gdImageBmpPtr(gdImagePtr im, int\n \tvoid rv;\n \tgdIOCtx out = gdNewDynamicCtx(2048, NULL);\n \tif (out == NULL) return NULL;\n-\tgdImageBmpCtx(im, out, compression);\n-\trv = gdDPExtractData(out, size);\n+\tif (!_gdImageBmpCtx(im, out, compression))\n+\t\trv = gdDPExtractData(out, size);\n+\telse\n+\t\trv = NULL;\n \tout->gd_free(out);\n \treturn rv;\n }\n@@ -90,12 +94,18 @@ void gdImageBmp(gdImagePtr im, FILE out\n /\n void gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)\n {\n+ _gdImageBmpCtx(im, out, compression);\n+}\n+\n+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)\n+{\n \tint bitmap_size = 0, info_size, total_size, padding;\n \tint i, row, xpos, pixel;\n \tint error = 0;\n \tunsigned char uncompressed_row = NULL, uncompressed_row_start = NULL;\n \tFILE tmpfile_for_compression = NULL;\n \tgdIOCtxPtr out_original = NULL;\n+\tint ret = 1;\n \n \t/ No compression if its true colour or we don't support seek /\n \tif (im->trueColor) {\n@@ -273,6 +283,7 @@ void gdImageBmpCtx(gdImagePtr im, gdIOCt\n \t\tout_original = NULL;\n \t}\n \n+\tret = 0;\n cleanup:\n \tif (tmpfile_for_compression) {\n #ifdef _WIN32\n@@ -286,7 +297,7 @@ cleanup:\n \tif (out_original) {\n \t\tout_original->gd_free(out_original);\n \t}\n-\treturn;\n+\treturn ret;\n }\n \n static int compress_row(unsigned char row, int length)\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: php-7.2.5/ext/gd/libgd/gd_bmp.c\n===================================================================\n--- php-7.2.5.orig/ext/gd/libgd/gd_bmp.c\t2018-04-24 17:09:54.000000000 +0200\n+++ php-7.2.5/ext/gd/libgd/gd_bmp.c\t2018-08-27 16:21:13.287949435 +0200\n@@ -40,6 +40,8 @@ static int bmp_read_4bit(gdImagePtr im,\n static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t info, bmp_hdr_t header);\n static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t info);\n \n+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);\n+\n #define BMP_DEBUG(s)\n \n static int gdBMPPutWord(gdIOCtx out, int w)\n@@ -68,8 +70,10 @@ void * gdImageBmpPtr(gdImagePtr im, int\n \tvoid rv;\n \tgdIOCtx out = gdNewDynamicCtx(2048, NULL);\n \tif (out == NULL) return NULL;\n-\tgdImageBmpCtx(im, out, compression);\n-\trv = gdDPExtractData(out, size);\n+\tif (!_gdImageBmpCtx(im, out, compression))\n+\t\trv = gdDPExtractData(out, size);\n+\telse\n+\t\trv = NULL;\n \tout->gd_free(out);\n \treturn rv;\n }\n@@ -90,12 +94,18 @@ void gdImageBmp(gdImagePtr im, FILE out\n /\n void gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)\n {\n+ _gdImageBmpCtx(im, out, compression);\n+}\n+\n+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)\n+{\n \tint bitmap_size = 0, info_size, total_size, padding;\n \tint i, row, xpos, pixel;\n \tint error = 0;\n \tunsigned char uncompressed_row = NULL, uncompressed_row_start = NULL;\n \tFILE tmpfile_for_compression = NULL;\n \tgdIOCtxPtr out_original = NULL;\n+\tint ret = 1;\n \n \t/ No compression if its true colour or we don't support seek /\n \tif (im->trueColor) {\n@@ -273,6 +283,7 @@ void gdImageBmpCtx(gdImagePtr im, gdIOCt\n \t\tout_original = NULL;\n \t}\n \n+\tret = 0;\n cleanup:\n \tif (tmpfile_for_compression) {\n #ifdef _WIN32\n@@ -286,7 +297,7 @@ cleanup:\n \tif (out_original) {\n \t\tout_original->gd_free(out_original);\n \t}\n-\treturn;\n+\treturn ret;\n }\n \n static int compress_row(unsigned char row, int length)\n" } ]	{ "id": "php7-11377-php-CVE-2018-1000222.patch", "cves": [ "CVE-2019-11043" ], "package": "php7", "incident_id": 11377, "patch_name": "php-CVE-2018-1000222.patch", "tier": "identical", "language": "c", "patch_lines_changed": 17, "patch_files_count": 1, "total_tokens_est": 1112, "has_source_context": true, "upstream_enriched": false, "suse_license": "PHP-3.01", "upstream_license": "NOASSERTION", "cve_id": "CVE-2019-11043", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-11043\n\ncommit 25aa5f434dfb3337a6617b46224f1b505053d8e9\n\n## Package\nphp7\n\n## Files to modify\n- ext/exif/exif.c\n\n## Upstream Fix\n```diff\ncommit 25aa5f434dfb3337a6617b46224f1b505053d8e9\nAuthor: Stanislav Malyshev <stas@php.net>\nDate: Fri Mar 1 23:25:45 2019 -0800\n\n Fix integer overflows on 32-bits\n\ndiff --git a/ext/exif/exif.c b/ext/exif/exif.c\nindex cbde3effed..b4563927a5 100644\n--- a/ext/exif/exif.c\n+++ b/ext/exif/exif.c\n@@ -3567,10 +3567,10 @@ static int exif_process_IFD_in_TIFF(image_info_type ImageInfo, size_t dir_offse\n \ttag_table_type tag_table = exif_get_tag_table(section_index);\n \n \tif (ImageInfo->ifd_nesting_level > MAX_IFD_NESTING_LEVEL) {\n- return FALSE;\n- }\n+\t\treturn FALSE;\n+\t}\n \n-\tif (ImageInfo->FileSize >= dir_offset+2) {\n+\tif (ImageInfo->FileSize >= 2 && ImageInfo->FileSize - 2 >= dir_offset) {\n \t\tsn = exif_file_sections_add(ImageInfo, M_PSEUDO, 2, NULL);\n #ifdef EXIF_DEBUG\n \t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X)\", ImageInfo->FileSize, dir_offset, 2);\n@@ -3578,8 +3578,8 @@ static int exif_process_IFD_in_TIFF(image_info_type ImageInfo, size_t dir_offse\n \t\tphp_stream_seek(ImageInfo->infile, dir_offset, SEEK_SET); /* we do not know the order of sections /\n \t\tphp_stream_read(ImageInfo->infile, (char)ImageInfo->file.list[sn].data, 2);\n \t\tnum_entries = php_ifd_get16u(ImageInfo->file.list[sn].data, ImageInfo->motorola_intel);\n-\t\tdir_size = 2/num dir entries/ +12/length of entry/num_entries +4/ offset to next ifd (points to thumbnail or NULL)/;\n-\t\tif (ImageInfo->FileSize >= dir_offset+dir_size) {\n+\t\tdir_size = 2/num dir entries/ +12/length of entry/(size_t)num_entries +4/* offset to next ifd (points to thumbnail or NULL)/;\n+\t\tif (ImageInfo->FileSize >= dir_size && ImageInfo->FileSize - dir_size >= dir_offset) {\n #ifdef EXIF_DEBUG\n \t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X), IFD entries(%d)\", ImageInfo->FileSize, dir_offset+2, dir_size-2, num_entries);\n #endif\n@@ -3662,9 +3662,9 @@ static int exif_process_IFD_in_TIFF(image_info_type ImageInfo, size_t dir_offse\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n-\t\t\tif (ImageInfo->FileSize >= dir_offset + ImageInfo->file.list[sn].size) {\n+\t\t\tif (ImageInfo->FileSize >= ImageInfo->file.list[sn].size && ImageInfo->FileSize - ImageInfo->file.list[sn].size >= dir_offset) {\n \t\t\t\tif (ifd_size > dir_size) {\n-\t\t\t\t\tif (dir_offset + ifd_size > ImageInfo->FileSize) {\n+\t\t\t\t\tif (ImageInfo->FileSize < ifd_size \|\| dir_offset > ImageInfo->FileSize - ifd_size) {\n \t\t\t\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, \"Error in TIFF: filesize(x%04X) less than size of IFD(x%04X + x%04X)\", ImageInfo->FileSize, dir_offset, ifd_size);\n \t\t\t\t\t\treturn FALSE;\n \t\t\t\t\t}\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "commit 25aa5f434dfb3337a6617b46224f1b505053d8e9\nAuthor: Stanislav Malyshev <stas@php.net>\nDate: Fri Mar 1 23:25:45 2019 -0800\n\n Fix integer overflows on 32-bits\n\ndiff --git a/ext/exif/exif.c b/ext/exif/exif.c\nindex cbde3effed..b4563927a5 100644\n--- a/ext/exif/exif.c\n+++ b/ext/exif/exif.c\n@@ -3567,10 +3567,10 @@ static int exif_process_IFD_in_TIFF(image_info_type ImageInfo, size_t dir_offse\n \ttag_table_type tag_table = exif_get_tag_table(section_index);\n \n \tif (ImageInfo->ifd_nesting_level > MAX_IFD_NESTING_LEVEL) {\n- return FALSE;\n- }\n+\t\treturn FALSE;\n+\t}\n \n-\tif (ImageInfo->FileSize >= dir_offset+2) {\n+\tif (ImageInfo->FileSize >= 2 && ImageInfo->FileSize - 2 >= dir_offset) {\n \t\tsn = exif_file_sections_add(ImageInfo, M_PSEUDO, 2, NULL);\n #ifdef EXIF_DEBUG\n \t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X)\", ImageInfo->FileSize, dir_offset, 2);\n@@ -3578,8 +3578,8 @@ static int exif_process_IFD_in_TIFF(image_info_type ImageInfo, size_t dir_offse\n \t\tphp_stream_seek(ImageInfo->infile, dir_offset, SEEK_SET); /* we do not know the order of sections /\n \t\tphp_stream_read(ImageInfo->infile, (char)ImageInfo->file.list[sn].data, 2);\n \t\tnum_entries = php_ifd_get16u(ImageInfo->file.list[sn].data, ImageInfo->motorola_intel);\n-\t\tdir_size = 2/num dir entries/ +12/length of entry/num_entries +4/ offset to next ifd (points to thumbnail or NULL)/;\n-\t\tif (ImageInfo->FileSize >= dir_offset+dir_size) {\n+\t\tdir_size = 2/num dir entries/ +12/length of entry/(size_t)num_entries +4/* offset to next ifd (points to thumbnail or NULL)/;\n+\t\tif (ImageInfo->FileSize >= dir_size && ImageInfo->FileSize - dir_size >= dir_offset) {\n #ifdef EXIF_DEBUG\n \t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X), IFD entries(%d)\", ImageInfo->FileSize, dir_offset+2, dir_size-2, num_entries);\n #endif\n@@ -3662,9 +3662,9 @@ static int exif_process_IFD_in_TIFF(image_info_type ImageInfo, size_t dir_offse\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n-\t\t\tif (ImageInfo->FileSize >= dir_offset + ImageInfo->file.list[sn].size) {\n+\t\t\tif (ImageInfo->FileSize >= ImageInfo->file.list[sn].size && ImageInfo->FileSize - ImageInfo->file.list[sn].size >= dir_offset) {\n \t\t\t\tif (ifd_size > dir_size) {\n-\t\t\t\t\tif (dir_offset + ifd_size > ImageInfo->FileSize) {\n+\t\t\t\t\tif (ImageInfo->FileSize < ifd_size \|\| dir_offset > ImageInfo->FileSize - ifd_size) {\n \t\t\t\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, \"Error in TIFF: filesize(x%04X) less than size of IFD(x%04X + x%04X)\", ImageInfo->FileSize, dir_offset, ifd_size);\n \t\t\t\t\t\treturn FALSE;\n \t\t\t\t\t}\n\n" } ]	{ "id": "php7-11377-php-CVE-2019-9641.patch", "cves": [ "CVE-2019-11043" ], "package": "php7", "incident_id": 11377, "patch_name": "php-CVE-2019-9641.patch", "tier": "identical", "language": "c", "patch_lines_changed": 14, "patch_files_count": 1, "total_tokens_est": 1463, "has_source_context": false, "upstream_enriched": false, "suse_license": "PHP-3.01", "upstream_license": "NOASSERTION", "cve_id": "CVE-2019-11043", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-11043\n\n===================================================================\n\n## Package\nphp7\n\n## Files to modify\n- ext/exif/exif.c\n\n## Target Source Code\n\n### ext/exif/exif.c\n\n#### exif_scan_thumbnail() [lines 3884-3968]\n```c\n\n/* {{{ exif_scan_thumbnail\n * scan JPEG in thumbnail (memory) /\nstatic int exif_scan_thumbnail(image_info_type ImageInfo)\n{\n\tuchar c, data = (uchar)ImageInfo->Thumbnail.data;\n\tint n, marker;\n\tsize_t length=2, pos=0;\n\tjpeg_sof_info sof_info;\n\n\tif (!data) {\n\t\treturn FALSE; /* nothing to do here /\n\t}\n\tif (memcmp(data, \"\\xFF\\xD8\\xFF\", 3)) {\n\t\tif (!ImageInfo->Thumbnail.width && !ImageInfo->Thumbnail.height) {\n\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, \"Thumbnail is not a JPEG image\");\n\t\t}\n\t\treturn FALSE;\n\t}\n\tfor (;;) {\n\t\tpos += length;\n\t\tif (pos>=ImageInfo->Thumbnail.size)\n\t\t\treturn FALSE;\n\t\tc = data[pos++];\n\t\tif (pos>=ImageInfo->Thumbnail.size)\n\t\t\treturn FALSE;\n\t\tif (c != 0xFF) {\n\t\t\treturn FALSE;\n\t\t}\n\t\tn = 8;\n\t\twhile ((c = data[pos++]) == 0xFF && n--) {\n\t\t\tif (pos+3>=ImageInfo->Thumbnail.size)\n\t\t\t\treturn FALSE;\n\t\t\t/ +3 = pos++ of next check when reaching marker + 2 bytes for length /\n\t\t}\n\t\tif (c == 0xFF)\n\t\t\treturn FALSE;\n\t\tmarker = c;\n\t\tlength = php_jpg_get16(data+pos);\n\t\tif (pos+length>=ImageInfo->Thumbnail.size) {\n\t\t\treturn FALSE;\n\t\t}\n#ifdef EXIF_DEBUG\n\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Thumbnail: process section(x%02X=%s) @ x%04X + x%04X\", marker, exif_get_markername(marker), pos, length);\n#endif\n\t\tswitch (marker) {\n\t\t\tcase M_SOF0:\n\t\t\tcase M_SOF1:\n\t\t\tcase M_SOF2:\n\t\t\tcase M_SOF3:\n\t\t\tcase M_SOF5:\n\t\t\tcase M_SOF6:\n\t\t\tcase M_SOF7:\n\t\t\tcase M_SOF9:\n\t\t\tcase M_SOF10:\n\t\t\tcase M_SOF11:\n\t\t\tcase M_SOF13:\n\t\t\tcase M_SOF14:\n\t\t\tcase M_SOF15:\n\t\t\t\t/ handle SOFn block /\n\t\t\t\texif_process_SOFn(data+pos, marker, &sof_info);\n\t\t\t\tImageInfo->Thumbnail.height = sof_info.height;\n\t\t\t\tImageInfo->Thumbnail.width = sof_info.width;\n#ifdef EXIF_DEBUG\n\t\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, \"Thumbnail: size: %d %d\", sof_info.width, sof_info.height);\n#endif\n\t\t\t\treturn TRUE;\n\n\t\t\tcase M_SOS:\n\t\t\tcase M_EOI:\n\t\t\t\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, \"Could not compute size of thumbnail\");\n\t\t\t\treturn FALSE;\n\t\t\t\tbreak;\n\n\t\t\tdefault:\n\t\t\t\t/* just skip /\n\t\t\t\tbreak;\n\t\t}\n\t}\n\n\texif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, \"Could not compute size of thumbnail\");\n\treturn FALSE;\n}\n/ }}} /\n\n```\n\n#### PHP_FUNCTION() [lines 2738-2759]\n```c\n\n/ {{{ proto string exif_tagname(int index)\n\tGet headername for index or false if not defined /\nPHP_FUNCTION(exif_tagname)\n{\n\tzend_long tag;\n\tchar szTemp;\n\n\tif (zend_parse_parameters(ZEND_NUM_ARGS(), \"l\", &tag) == FAILURE) {\n\t\treturn;\n\t}\n\n\tszTemp = exif_get_tagname(tag, NULL, 0, tag_table_IFD);\n\n\tif (tag < 0 \|\| !szTemp \|\| !szTemp[0]) {\n\t\tRETURN_FALSE;\n\t}\n\n\tRETURN_STRING(szTemp)\n}\n/* }}} /\n\n```\n\n\n## Upstream Fix\n```diff\nIndex: php-7.2.5/ext/exif/exif.c\n===================================================================\n--- php-7.2.5.orig/ext/exif/exif.c\t2019-03-19 15:47:49.703923660 +0100\n+++ php-7.2.5/ext/exif/exif.c\t2019-03-19 15:49:57.408673458 +0100\n@@ -3924,7 +3924,7 @@ static int exif_scan_thumbnail(image_inf\n \t\t\treturn FALSE;\n \t\tmarker = c;\n \t\tlength = php_jpg_get16(data+pos);\n-\t\tif (pos+length>=ImageInfo->Thumbnail.size) {\n+\t\tif (length > ImageInfo->Thumbnail.size \|\| pos >= ImageInfo->Thumbnail.size - length) {\n \t\t\treturn FALSE;\n \t\t}\n #ifdef EXIF_DEBUG\n@@ -3945,6 +3945,10 @@ static int exif_scan_thumbnail(image_inf\n \t\t\tcase M_SOF14:\n \t\t\tcase M_SOF15:\n \t\t\t\t/ handle SOFn block /\n+\t\t\t\tif (length < 8 \|\| ImageInfo->Thumbnail.size - 8 < pos) {\n+\t\t\t\t\t/ exif_process_SOFn needs 8 bytes /\n+\t\t\t\t\treturn FALSE;\n+\t\t\t\t}\n \t\t\t\texif_process_SOFn(data+pos, marker, &sof_info);\n \t\t\t\tImageInfo->Thumbnail.height = sof_info.height;\n \t\t\t\tImageInfo->Thumbnail.width = sof_info.width;\n@@ -4678,7 +4682,9 @@ PHP_FUNCTION(exif_thumbnail)\n \tZVAL_STRINGL(return_value, ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size);\n \tif (arg_c >= 3) {\n \t\tif (!ImageInfo.Thumbnail.width \|\| !ImageInfo.Thumbnail.height) {\n-\t\t\texif_scan_thumbnail(&ImageInfo);\n+\t\t\tif (!exif_scan_thumbnail(&ImageInfo)) {\n+\t\t\t\tImageInfo.Thumbnail.width = ImageInfo.Thumbnail.height = 0;\n+\t\t\t}\n \t\t}\n \t\tzval_dtor(z_width);\n \t\tzval_dtor(z_height);\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: php-7.2.5/ext/exif/exif.c\n===================================================================\n--- php-7.2.5.orig/ext/exif/exif.c\t2019-03-19 15:47:49.703923660 +0100\n+++ php-7.2.5/ext/exif/exif.c\t2019-03-19 15:49:57.408673458 +0100\n@@ -3924,7 +3924,7 @@ static int exif_scan_thumbnail(image_inf\n \t\t\treturn FALSE;\n \t\tmarker = c;\n \t\tlength = php_jpg_get16(data+pos);\n-\t\tif (pos+length>=ImageInfo->Thumbnail.size) {\n+\t\tif (length > ImageInfo->Thumbnail.size \|\| pos >= ImageInfo->Thumbnail.size - length) {\n \t\t\treturn FALSE;\n \t\t}\n #ifdef EXIF_DEBUG\n@@ -3945,6 +3945,10 @@ static int exif_scan_thumbnail(image_inf\n \t\t\tcase M_SOF14:\n \t\t\tcase M_SOF15:\n \t\t\t\t/ handle SOFn block /\n+\t\t\t\tif (length < 8 \|\| ImageInfo->Thumbnail.size - 8 < pos) {\n+\t\t\t\t\t/ exif_process_SOFn needs 8 bytes */\n+\t\t\t\t\treturn FALSE;\n+\t\t\t\t}\n \t\t\t\texif_process_SOFn(data+pos, marker, &sof_info);\n \t\t\t\tImageInfo->Thumbnail.height = sof_info.height;\n \t\t\t\tImageInfo->Thumbnail.width = sof_info.width;\n@@ -4678,7 +4682,9 @@ PHP_FUNCTION(exif_thumbnail)\n \tZVAL_STRINGL(return_value, ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size);\n \tif (arg_c >= 3) {\n \t\tif (!ImageInfo.Thumbnail.width \|\| !ImageInfo.Thumbnail.height) {\n-\t\t\texif_scan_thumbnail(&ImageInfo);\n+\t\t\tif (!exif_scan_thumbnail(&ImageInfo)) {\n+\t\t\t\tImageInfo.Thumbnail.width = ImageInfo.Thumbnail.height = 0;\n+\t\t\t}\n \t\t}\n \t\tzval_dtor(z_width);\n \t\tzval_dtor(z_height);\n" } ]	{ "id": "php7-11377-php-CVE-2019-9640.patch", "cves": [ "CVE-2019-11043" ], "package": "php7", "incident_id": 11377, "patch_name": "php-CVE-2019-9640.patch", "tier": "identical", "language": "c", "patch_lines_changed": 10, "patch_files_count": 1, "total_tokens_est": 828, "has_source_context": true, "upstream_enriched": false, "suse_license": "PHP-3.01", "upstream_license": "NOASSERTION", "cve_id": "CVE-2019-11043", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-1730\n\nCVE-2020-1730: Fix a possible segfault when zeroing AES-CTR\n\n## Package\nlibssh\n\n## Files to modify\n- src/libcrypto.c\n\n## Target Source Code\n\n### src/libcrypto.c\n\n#### aes_ctr_encrypt() [lines 618-638]\n```c\n return SSH_OK;\n}\n\nstatic void aes_ctr_encrypt(struct ssh_cipher_struct cipher, void in, void out,\n unsigned long len) {\n unsigned char tmp_buffer[AES_BLOCK_SIZE];\n unsigned int num=0;\n / Some things are special with ctr128 :\n * In this case, tmp_buffer is not being used, because it is used to store temporary data\n * when an encryption is made on lengths that are not multiple of blocksize.\n * Same for num, which is being used to store the current offset in blocksize in CTR\n * function.\n /\n#ifdef HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT\n CRYPTO_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num, (block128_f)AES_encrypt);\n#else\n AES_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num);\n#endif / HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT /\n}\n\nstatic void aes_ctr_cleanup(struct ssh_cipher_struct cipher){\n```\n\n\n### Type definitions\n\n```c\n/* from libssh/crypto.h /\nstruct ssh_cipher_struct {\n const char name; /* ssh name of the algorithm /\n unsigned int blocksize; / blocksize of the algo /\n enum ssh_cipher_e ciphertype;\n uint32_t lenfield_blocksize; / blocksize of the packet length field /\n size_t keylen; / length of the key structure /\n#ifdef HAVE_LIBGCRYPT\n gcry_cipher_hd_t key;\n#elif defined HAVE_LIBCRYPTO\n struct ssh_3des_key_schedule des3_key;\n struct ssh_aes_key_schedule aes_key;\n const EVP_CIPHER cipher;\n EVP_CIPHER_CTX ctx;\n#elif defined HAVE_LIBMBEDCRYPTO\n mbedtls_cipher_context_t encrypt_ctx;\n mbedtls_cipher_context_t decrypt_ctx;\n mbedtls_cipher_type_t type;\n#endif\n struct chacha20_poly1305_keysched chacha20_schedule;\n unsigned int keysize; / bytes of key used. != keylen /\n size_t tag_size; / overhead required for tag /\n / sets the new key for immediate use /\n int (set_encrypt_key)(struct ssh_cipher_struct cipher, void key, void IV);\n int (set_decrypt_key)(struct ssh_cipher_struct cipher, void key, void IV);\n void (encrypt)(struct ssh_cipher_struct cipher, void in, void out,\n unsigned long len);\n void (decrypt)(struct ssh_cipher_struct cipher, void in, void out,\n unsigned long len);\n void (aead_encrypt)(struct ssh_cipher_struct cipher, void in, void out,\n size_t len, uint8_t mac, uint64_t seq);\n int (aead_decrypt_length)(struct ssh_cipher_struct cipher, void in,\n uint8_t out, size_t len, uint64_t seq);\n int (aead_decrypt)(struct ssh_cipher_struct cipher, void complete_packet, uint8_t out,\n size_t encrypted_size, uint64_t seq);\n void (cleanup)(struct ssh_cipher_struct cipher);\n};\n```\n\n\n## Upstream Fix\n```diff\nFrom fa772dbe48f6c716f130e80562840d47dda5a1b7 Mon Sep 17 00:00:00 2001\nFrom: Andreas Schneider <asn@cryptomilk.org>\nDate: Tue, 11 Feb 2020 11:52:33 +0100\nSubject: [PATCH] CVE-2020-1730: Fix a possible segfault when zeroing AES-CTR\n key\n\nFixes T213\n\nSigned-off-by: Andreas Schneider <asn@cryptomilk.org>\nReviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>\n---\n src/libcrypto.c \| 8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/src/libcrypto.c b/src/libcrypto.c\nindex b3792264..e9f519ec 100644\n--- a/src/libcrypto.c\n+++ b/src/libcrypto.c\n@@ -713,8 +713,12 @@ aes_ctr_encrypt(struct ssh_cipher_struct cipher,\n }\n \n static void aes_ctr_cleanup(struct ssh_cipher_struct cipher){\n- explicit_bzero(cipher->aes_key, sizeof(cipher->aes_key));\n- SAFE_FREE(cipher->aes_key);\n+ if (cipher != NULL) {\n+ if (cipher->aes_key != NULL) {\n+ explicit_bzero(cipher->aes_key, sizeof(cipher->aes_key));\n+ }\n+ SAFE_FREE(cipher->aes_key);\n+ }\n }\n \n #endif /* HAVE_OPENSSL_EVP_AES_CTR /\n-- \n2.26.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From fa772dbe48f6c716f130e80562840d47dda5a1b7 Mon Sep 17 00:00:00 2001\nFrom: Andreas Schneider <asn@cryptomilk.org>\nDate: Tue, 11 Feb 2020 11:52:33 +0100\nSubject: [PATCH] CVE-2020-1730: Fix a possible segfault when zeroing AES-CTR\n key\n\nFixes T213\n\nSigned-off-by: Andreas Schneider <asn@cryptomilk.org>\nReviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>\n---\n src/libcrypto.c \| 8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/src/libcrypto.c b/src/libcrypto.c\nindex b3792264..e9f519ec 100644\n--- a/src/libcrypto.c\n+++ b/src/libcrypto.c\n@@ -713,8 +713,12 @@ aes_ctr_encrypt(struct ssh_cipher_struct cipher,\n }\n \n static void aes_ctr_cleanup(struct ssh_cipher_struct cipher){\n- explicit_bzero(cipher->aes_key, sizeof(cipher->aes_key));\n- SAFE_FREE(cipher->aes_key);\n+ if (cipher != NULL) {\n+ if (cipher->aes_key != NULL) {\n+ explicit_bzero(cipher->aes_key, sizeof(cipher->aes_key));\n+ }\n+ SAFE_FREE(cipher->aes_key);\n+ }\n }\n \n #endif / HAVE_OPENSSL_EVP_AES_CTR */\n-- \n2.26.0\n\n" } ]	{ "id": "libssh-12292-0001-CVE-2020-1730-Fix-a-possible-segfault-when-zeroing-A.patch", "cves": [ "CVE-2020-1730" ], "package": "libssh", "incident_id": 12292, "patch_name": "0001-CVE-2020-1730-Fix-a-possible-segfault-when-zeroing-A.patch", "tier": "identical", "language": "c", "patch_lines_changed": 9, "patch_files_count": 1, "total_tokens_est": 656, "has_source_context": true, "upstream_enriched": false, "suse_license": "LGPL-2.1-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2020-1730", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-1730\n\ntests: Add aes-gcm ciphers tests\n\n## Package\nlibssh\n\n## Files to modify\n- tests/client/torture_algorithms.c\n- tests/pkd/pkd_hello.c\n\n## Upstream Fix\n```diff\nFrom 42bd7cdf6c6e50786155c904821fc62d6d8e5acb Mon Sep 17 00:00:00 2001\nFrom: Jakub Jelen <jjelen@redhat.com>\nDate: Mon, 8 Oct 2018 13:31:12 +0200\nSubject: [PATCH] tests: Add aes-gcm ciphers tests\n\nSigned-off-by: Jakub Jelen <jjelen@redhat.com>\nReviewed-by: Andreas Schneider <asn@cryptomilk.org>\n---\n tests/client/torture_algorithms.c \| 20 ++++++++++++++++++++\n tests/pkd/pkd_hello.c \| 29 +++++++++++++++++++++++++++--\n 2 files changed, 47 insertions(+), 2 deletions(-)\n\ndiff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c\nindex c216c99b..9bb67410 100644\n--- a/tests/client/torture_algorithms.c\n+++ b/tests/client/torture_algorithms.c\n@@ -240,6 +240,20 @@ static void torture_algorithms_aes256_ctr_hmac_sha2_512(void *state) {\n test_algorithm(s->ssh.session, NULL/kex/, \"aes256-ctr\", \"hmac-sha2-512\");\n }\n \n+static void torture_algorithms_aes128_gcm(void state)\n+{\n+ struct torture_state s = state;\n+\n+ test_algorithm(s->ssh.session, NULL/kex/, \"aes128-gcm@openssh.com\", NULL);\n+}\n+\n+static void torture_algorithms_aes256_gcm(void state)\n+{\n+ struct torture_state s = state;\n+\n+ test_algorithm(s->ssh.session, NULL/kex/, \"aes256-gcm@openssh.com\", NULL);\n+}\n+\n static void torture_algorithms_3des_cbc_hmac_sha1(void state) {\n struct torture_state s = state;\n \n@@ -464,6 +478,12 @@ int torture_run_tests(void) {\n cmocka_unit_test_setup_teardown(torture_algorithms_aes256_ctr_hmac_sha2_512,\n session_setup,\n session_teardown),\n+ cmocka_unit_test_setup_teardown(torture_algorithms_aes128_gcm,\n+ session_setup,\n+ session_teardown),\n+ cmocka_unit_test_setup_teardown(torture_algorithms_aes256_gcm,\n+ session_setup,\n+ session_teardown),\n cmocka_unit_test_setup_teardown(torture_algorithms_3des_cbc_hmac_sha1,\n session_setup,\n session_teardown),\ndiff --git a/tests/pkd/pkd_hello.c b/tests/pkd/pkd_hello.c\nindex e14316ec..0fa72d04 100644\n--- a/tests/pkd/pkd_hello.c\n+++ b/tests/pkd/pkd_hello.c\n@@ -383,6 +383,8 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n #endif\n \n #define CHACHA20 \"chacha20-poly1305@openssh.com\"\n+#define AES128_GCM \"aes128-gcm@openssh.com\"\n+#define AES256_GCM \"aes256-gcm@openssh.com\"\n \n #ifdef HAVE_DSA\n #define PKDTESTS_CIPHER_OPENSSHONLY(f, client, ciphercmd) \\\n@@ -390,9 +392,13 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n f(client, rsa_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_rsa, teardown) \\\n f(client, rsa_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_rsa, teardown) \\\n f(client, rsa_chacha20, ciphercmd(CHACHA20), setup_rsa, teardown) \\\n+ f(client, rsa_aes128_gcm, ciphercmd(AES128_GCM), setup_rsa, teardown) \\\n+ f(client, rsa_aes256_gcm, ciphercmd(AES256_GCM), setup_rsa, teardown) \\\n f(client, dsa_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_dsa, teardown) \\\n f(client, dsa_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_dsa, teardown) \\\n f(client, dsa_chacha20, ciphercmd(CHACHA20), setup_dsa, teardown) \\\n+ f(client, dsa_aes128_gcm, ciphercmd(AES128_GCM), setup_dsa, teardown) \\\n+ f(client, dsa_aes256_gcm, ciphercmd(AES256_GCM), setup_dsa, teardown) \\\n f(client, ed25519_3des_cbc, ciphercmd(\"3des-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_cbc, ciphercmd(\"aes128-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_ctr, ciphercmd(\"aes128-ctr\"), setup_ed25519, teardown) \\\n@@ -401,21 +407,31 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n f(client, ed25519_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ed25519, teardown) \\\n f(client, ed25519_chacha20, ciphercmd(CHACHA20), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes128_gcm, ciphercmd(AES128_GCM), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes256_gcm, ciphercmd(AES256_GCM), setup_ed25519, teardown) \\\n f(client, ecdsa_256_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_chacha20, ciphercmd(CHACHA20), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_384_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_chacha20, ciphercmd(CHACHA20), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_521_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_521, teardown) \\\n f(client, ecdsa_521_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_521, teardown) \\\n- f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown)\n+ f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_521, teardown)\n #else\n #define PKDTESTS_CIPHER_OPENSSHONLY(f, client, ciphercmd) \\\n / Ciphers. / \\\n f(client, rsa_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_rsa, teardown) \\\n f(client, rsa_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_rsa, teardown) \\\n f(client, rsa_chacha20, ciphercmd(CHACHA20), setup_rsa, teardown) \\\n+ f(client, rsa_aes128_gcm, ciphercmd(AES128_GCM), setup_rsa, teardown) \\\n+ f(client, rsa_aes256_gcm, ciphercmd(AES256_GCM), setup_rsa, teardown) \\\n f(client, ed25519_3des_cbc, ciphercmd(\"3des-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_cbc, ciphercmd(\"aes128-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_ctr, ciphercmd(\"aes128-ctr\"), setup_ed25519, teardown) \\\n@@ -424,17 +440,26 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n f(client, ed25519_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ed25519, teardown) \\\n f(client, ed25519_chacha20, ciphercmd(CHACHA20), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes128_gcm, ciphercmd(AES128_GCM), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes256_gcm, ciphercmd(AES256_GCM), setup_ed25519, teardown) \\\n f(client, ecdsa_256_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_chacha20, ciphercmd(CHACHA20), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_384_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_chacha20, ciphercmd(CHACHA20), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_521_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_521, teardown) \\\n f(client, ecdsa_521_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_521, teardown) \\\n- f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown)\n+ f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_521, teardown)\n #endif\n \n+\n #ifdef HAVE_DSA\n #define PKDTESTS_MAC(f, client, maccmd) \\\n / MACs. / \\\n-- \n2.21.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 42bd7cdf6c6e50786155c904821fc62d6d8e5acb Mon Sep 17 00:00:00 2001\nFrom: Jakub Jelen <jjelen@redhat.com>\nDate: Mon, 8 Oct 2018 13:31:12 +0200\nSubject: [PATCH] tests: Add aes-gcm ciphers tests\n\nSigned-off-by: Jakub Jelen <jjelen@redhat.com>\nReviewed-by: Andreas Schneider <asn@cryptomilk.org>\n---\n tests/client/torture_algorithms.c \| 20 ++++++++++++++++++++\n tests/pkd/pkd_hello.c \| 29 +++++++++++++++++++++++++++--\n 2 files changed, 47 insertions(+), 2 deletions(-)\n\ndiff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c\nindex c216c99b..9bb67410 100644\n--- a/tests/client/torture_algorithms.c\n+++ b/tests/client/torture_algorithms.c\n@@ -240,6 +240,20 @@ static void torture_algorithms_aes256_ctr_hmac_sha2_512(void state) {\n test_algorithm(s->ssh.session, NULL/kex/, \"aes256-ctr\", \"hmac-sha2-512\");\n }\n \n+static void torture_algorithms_aes128_gcm(void state)\n+{\n+ struct torture_state s = state;\n+\n+ test_algorithm(s->ssh.session, NULL/kex/, \"aes128-gcm@openssh.com\", NULL);\n+}\n+\n+static void torture_algorithms_aes256_gcm(void state)\n+{\n+ struct torture_state s = state;\n+\n+ test_algorithm(s->ssh.session, NULL/kex/, \"aes256-gcm@openssh.com\", NULL);\n+}\n+\n static void torture_algorithms_3des_cbc_hmac_sha1(void state) {\n struct torture_state s = state;\n \n@@ -464,6 +478,12 @@ int torture_run_tests(void) {\n cmocka_unit_test_setup_teardown(torture_algorithms_aes256_ctr_hmac_sha2_512,\n session_setup,\n session_teardown),\n+ cmocka_unit_test_setup_teardown(torture_algorithms_aes128_gcm,\n+ session_setup,\n+ session_teardown),\n+ cmocka_unit_test_setup_teardown(torture_algorithms_aes256_gcm,\n+ session_setup,\n+ session_teardown),\n cmocka_unit_test_setup_teardown(torture_algorithms_3des_cbc_hmac_sha1,\n session_setup,\n session_teardown),\ndiff --git a/tests/pkd/pkd_hello.c b/tests/pkd/pkd_hello.c\nindex e14316ec..0fa72d04 100644\n--- a/tests/pkd/pkd_hello.c\n+++ b/tests/pkd/pkd_hello.c\n@@ -383,6 +383,8 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n #endif\n \n #define CHACHA20 \"chacha20-poly1305@openssh.com\"\n+#define AES128_GCM \"aes128-gcm@openssh.com\"\n+#define AES256_GCM \"aes256-gcm@openssh.com\"\n \n #ifdef HAVE_DSA\n #define PKDTESTS_CIPHER_OPENSSHONLY(f, client, ciphercmd) \\\n@@ -390,9 +392,13 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n f(client, rsa_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_rsa, teardown) \\\n f(client, rsa_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_rsa, teardown) \\\n f(client, rsa_chacha20, ciphercmd(CHACHA20), setup_rsa, teardown) \\\n+ f(client, rsa_aes128_gcm, ciphercmd(AES128_GCM), setup_rsa, teardown) \\\n+ f(client, rsa_aes256_gcm, ciphercmd(AES256_GCM), setup_rsa, teardown) \\\n f(client, dsa_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_dsa, teardown) \\\n f(client, dsa_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_dsa, teardown) \\\n f(client, dsa_chacha20, ciphercmd(CHACHA20), setup_dsa, teardown) \\\n+ f(client, dsa_aes128_gcm, ciphercmd(AES128_GCM), setup_dsa, teardown) \\\n+ f(client, dsa_aes256_gcm, ciphercmd(AES256_GCM), setup_dsa, teardown) \\\n f(client, ed25519_3des_cbc, ciphercmd(\"3des-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_cbc, ciphercmd(\"aes128-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_ctr, ciphercmd(\"aes128-ctr\"), setup_ed25519, teardown) \\\n@@ -401,21 +407,31 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n f(client, ed25519_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ed25519, teardown) \\\n f(client, ed25519_chacha20, ciphercmd(CHACHA20), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes128_gcm, ciphercmd(AES128_GCM), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes256_gcm, ciphercmd(AES256_GCM), setup_ed25519, teardown) \\\n f(client, ecdsa_256_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_chacha20, ciphercmd(CHACHA20), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_384_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_chacha20, ciphercmd(CHACHA20), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_521_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_521, teardown) \\\n f(client, ecdsa_521_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_521, teardown) \\\n- f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown)\n+ f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_521, teardown)\n #else\n #define PKDTESTS_CIPHER_OPENSSHONLY(f, client, ciphercmd) \\\n / Ciphers. / \\\n f(client, rsa_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_rsa, teardown) \\\n f(client, rsa_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_rsa, teardown) \\\n f(client, rsa_chacha20, ciphercmd(CHACHA20), setup_rsa, teardown) \\\n+ f(client, rsa_aes128_gcm, ciphercmd(AES128_GCM), setup_rsa, teardown) \\\n+ f(client, rsa_aes256_gcm, ciphercmd(AES256_GCM), setup_rsa, teardown) \\\n f(client, ed25519_3des_cbc, ciphercmd(\"3des-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_cbc, ciphercmd(\"aes128-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes128_ctr, ciphercmd(\"aes128-ctr\"), setup_ed25519, teardown) \\\n@@ -424,17 +440,26 @@ static int torture_pkd_setup_ecdsa_521(void state) {\n f(client, ed25519_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ed25519, teardown) \\\n f(client, ed25519_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ed25519, teardown) \\\n f(client, ed25519_chacha20, ciphercmd(CHACHA20), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes128_gcm, ciphercmd(AES128_GCM), setup_ed25519, teardown) \\\n+ f(client, ed25519_aes256_gcm, ciphercmd(AES256_GCM), setup_ed25519, teardown) \\\n f(client, ecdsa_256_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_256_chacha20, ciphercmd(CHACHA20), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_256, teardown) \\\n+ f(client, ecdsa_256_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_256, teardown) \\\n f(client, ecdsa_384_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_384_chacha20, ciphercmd(CHACHA20), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_384, teardown) \\\n+ f(client, ecdsa_384_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_384, teardown) \\\n f(client, ecdsa_521_aes192_cbc, ciphercmd(\"aes192-cbc\"), setup_ecdsa_521, teardown) \\\n f(client, ecdsa_521_aes192_ctr, ciphercmd(\"aes192-ctr\"), setup_ecdsa_521, teardown) \\\n- f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown)\n+ f(client, ecdsa_521_chacha20, ciphercmd(CHACHA20), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes128_gcm, ciphercmd(AES128_GCM), setup_ecdsa_521, teardown) \\\n+ f(client, ecdsa_521_aes256_gcm, ciphercmd(AES256_GCM), setup_ecdsa_521, teardown)\n #endif\n \n+\n #ifdef HAVE_DSA\n #define PKDTESTS_MAC(f, client, maccmd) \\\n / MACs. */ \\\n-- \n2.21.0\n\n" } ]	{ "id": "libssh-12292-0001-tests-Add-aes-gcm-ciphers-tests.patch", "cves": [ "CVE-2020-1730" ], "package": "libssh", "incident_id": 12292, "patch_name": "0001-tests-Add-aes-gcm-ciphers-tests.patch", "tier": "identical", "language": "c", "patch_lines_changed": 50, "patch_files_count": 2, "total_tokens_est": 4735, "has_source_context": false, "upstream_enriched": false, "suse_license": "LGPL-2.1-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2020-1730", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-1730\n\nlibgcrypt: Implement OpenSSH-compatible AES-GCM ciphers using\n\n## Package\nlibssh\n\n## Files to modify\n- include/libssh/crypto.h\n- src/kex.c\n- src/libgcrypt.c\n\n## Target Source Code\n\n### include/libssh/crypto.h\n\n#### region() [lines 93-171]\n```c\n#endif\n ssh_string ecdh_client_pubkey;\n ssh_string ecdh_server_pubkey;\n#endif\n#ifdef HAVE_CURVE25519\n ssh_curve25519_privkey curve25519_privkey;\n ssh_curve25519_pubkey curve25519_client_pubkey;\n ssh_curve25519_pubkey curve25519_server_pubkey;\n#endif\n ssh_string dh_server_signature; /* information used by dh_handshake. /\n size_t digest_len; / len of all the fields below /\n unsigned char session_id;\n unsigned char secret_hash; / Secret hash is same as session id until re-kex /\n unsigned char encryptIV;\n unsigned char decryptIV;\n unsigned char decryptkey;\n unsigned char encryptkey;\n unsigned char encryptMAC;\n unsigned char decryptMAC;\n unsigned char hmacbuf[DIGEST_MAX_LEN];\n struct ssh_cipher_struct in_cipher, out_cipher; / the cipher structures/objects /\n enum ssh_hmac_e in_hmac, out_hmac; / the MAC algorithms used /\n\n ssh_key server_pubkey;\n int do_compress_out; / idem /\n int do_compress_in; / don't set them, set the option instead /\n int delayed_compress_in; / Use of zlib@openssh.org /\n int delayed_compress_out;\n void compress_out_ctx; /* don't touch it /\n void compress_in_ctx; /* really, don't /\n / kex sent by server, client, and mutually elected methods /\n struct ssh_kex_struct server_kex;\n struct ssh_kex_struct client_kex;\n char kex_methods[SSH_KEX_METHODS];\n enum ssh_key_exchange_e kex_type;\n enum ssh_mac_e mac_type; /* Mac operations to use for key gen /\n};\n\nstruct ssh_cipher_struct {\n const char name; /* ssh name of the algorithm /\n unsigned int blocksize; / blocksize of the algo /\n enum ssh_cipher_e ciphertype;\n uint32_t lenfield_blocksize; / blocksize of the packet length field /\n size_t keylen; / length of the key structure /\n#ifdef HAVE_LIBGCRYPT\n gcry_cipher_hd_t key;\n#elif defined HAVE_LIBCRYPTO\n struct ssh_3des_key_schedule des3_key;\n struct ssh_aes_key_schedule aes_key;\n const EVP_CIPHER cipher;\n EVP_CIPHER_CTX ctx;\n#elif defined HAVE_LIBMBEDCRYPTO\n mbedtls_cipher_context_t encrypt_ctx;\n mbedtls_cipher_context_t decrypt_ctx;\n mbedtls_cipher_type_t type;\n#endif\n struct chacha20_poly1305_keysched chacha20_schedule;\n unsigned int keysize; / bytes of key used. != keylen /\n size_t tag_size; / overhead required for tag /\n / sets the new key for immediate use /\n int (set_encrypt_key)(struct ssh_cipher_struct cipher, void key, void IV);\n int (set_decrypt_key)(struct ssh_cipher_struct cipher, void key, void IV);\n void (encrypt)(struct ssh_cipher_struct cipher, void in, void out,\n unsigned long len);\n void (decrypt)(struct ssh_cipher_struct cipher, void in, void out,\n unsigned long len);\n void (aead_encrypt)(struct ssh_cipher_struct cipher, void in, void out,\n size_t len, uint8_t mac, uint64_t seq);\n int (aead_decrypt_length)(struct ssh_cipher_struct cipher, void in,\n uint8_t out, size_t len, uint64_t seq);\n int (aead_decrypt)(struct ssh_cipher_struct cipher, void complete_packet, uint8_t out,\n size_t encrypted_size, uint64_t seq);\n void (cleanup)(struct ssh_cipher_struct cipher);\n};\n\nconst struct ssh_cipher_struct ssh_get_chacha20poly1305_cipher(void);\n\n#endif / _CRYPTO_H_ /\n\n```\n\n### src/kex.c\n\n#### region() [lines 1-98]\n```c\n/\n * kex.c - key exchange\n \n This file is part of the SSH Library\n \n Copyright (c) 2003-2008 by Aris Adamantiadis\n \n The SSH Library is free software; you can redistribute it and/or modify\n * it under the terms of the GNU Lesser General Public License as published by\n * the Free Software Foundation; either version 2.1 of the License, or (at your\n * option) any later version.\n \n The SSH Library is distributed in the hope that it will be useful, but\n * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public\n * License for more details.\n \n You should have received a copy of the GNU Lesser General Public License\n * along with the SSH Library; see the file COPYING. If not, write to\n * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n * MA 02111-1307, USA.\n /\n\n#include \"config.h\"\n\n#include <string.h>\n#include <stdlib.h>\n#include <stdio.h>\n#include <stdbool.h>\n\n#include \"libssh/priv.h\"\n#include \"libssh/buffer.h\"\n#include \"libssh/dh.h\"\n#include \"libssh/kex.h\"\n#include \"libssh/session.h\"\n#include \"libssh/ssh2.h\"\n#include \"libssh/string.h\"\n#include \"libssh/curve25519.h\"\n#include \"libssh/knownhosts.h\"\n#include \"libssh/misc.h\"\n#include \"libssh/pki.h\"\n\n#ifdef HAVE_LIBGCRYPT\n# define BLOWFISH \"blowfish-cbc,\"\n# define AES \"aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,\"\n# define DES \"3des-cbc\"\n# define DES_SUPPORTED \"3des-cbc\"\n\n#elif defined HAVE_LIBMBEDCRYPTO\n# define BLOWFISH \"blowfish-cbc,\"\n# define AES \"aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,\"\n# define DES \"3des-cbc\"\n# define DES_SUPPORTED \"3des-cbc\"\n\n#elif defined(HAVE_LIBCRYPTO)\n\n# ifdef HAVE_OPENSSL_BLOWFISH_H\n# define BLOWFISH \"blowfish-cbc,\"\n# else / HAVE_OPENSSL_BLOWFISH_H /\n# define BLOWFISH \"\"\n# endif / HAVE_OPENSSL_BLOWFISH_H /\n\n# ifdef HAVE_OPENSSL_AES_H\n# ifdef BROKEN_AES_CTR\n# define AES \"aes256-cbc,aes192-cbc,aes128-cbc,\"\n# else / BROKEN_AES_CTR /\n# define AES \"aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,\"\n# endif / BROKEN_AES_CTR /\n# else / HAVE_OPENSSL_AES_H /\n# define AES \"\"\n# endif / HAVE_OPENSSL_AES_H /\n\n# define DES \"3des-cbc\"\n# define DES_SUPPORTED \"3des-cbc\"\n#endif / HAVE_LIBCRYPTO /\n\n#ifdef WITH_ZLIB\n#define ZLIB \"none,zlib,zlib@openssh.com\"\n#else\n#define ZLIB \"none\"\n#endif\n\n#ifdef HAVE_CURVE25519\n#define CURVE25519 \"curve25519-sha256,curve25519-sha256@libssh.org,\"\n#else\n#define CURVE25519 \"\"\n#endif\n\n#ifdef HAVE_ECDH\n#define ECDH \"ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,\"\n#define PUBLIC_KEY_ALGORITHMS \"ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-rsa,rsa-sha2-512,rsa-sha2-256,ssh-dss\"\n#else\n#ifdef HAVE_DSA\n#define PUBLIC_KEY_ALGORITHMS \"ssh-ed25519,ssh-rsa,rsa-sha2-512,rsa-sha2-256,ssh-dss\"\n#else\n#define PUBLIC_KEY_ALGORITHMS \"ssh-ed25519,ssh-rsa,rsa-sha2-512,rsa-sha2-256\"\n#endif\n#define ECDH \"\"\n```\n\n\n## Upstream Fix\n```diff\nFrom 5790036a2305d5610ac55adb5382ea55d043998f Mon Sep 17 00:00:00 2001\nFrom: Jakub Jelen <jjelen@redhat.com>\nDate: Mon, 1 Oct 2018 14:32:05 +0200\nSubject: [PATCH] libgcrypt: Implement OpenSSH-compatible AES-GCM ciphers using\n libgcrypt\n\nSigned-off-by: Jakub Jelen <jjelen@redhat.com>\nReviewed-by: Andreas Schneider <asn@cryptomilk.org>\n---\n include/libssh/crypto.h \| 1 +\n src/kex.c \| 4 +-\n src/libgcrypt.c \| 201 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 205 insertions(+), 1 deletion(-)\n\ndiff --git a/include/libssh/crypto.h b/include/libssh/crypto.h\nindex fc375a4f..8777f0c9 100644\n--- a/include/libssh/crypto.h\n+++ b/include/libssh/crypto.h\n@@ -142,6 +142,7 @@ struct ssh_cipher_struct {\n size_t keylen; / length of the key structure /\n #ifdef HAVE_LIBGCRYPT\n gcry_cipher_hd_t key;\n+ unsigned char last_iv[AES_GCM_IVLEN];\n #elif defined HAVE_LIBCRYPTO\n struct ssh_3des_key_schedule des3_key;\n struct ssh_aes_key_schedule aes_key;\ndiff --git a/src/kex.c b/src/kex.c\nindex e0fd5680..382d88fb 100644\n--- a/src/kex.c\n+++ b/src/kex.c\n@@ -40,7 +40,9 @@\n \n #ifdef HAVE_LIBGCRYPT\n # define BLOWFISH \"blowfish-cbc,\"\n-# define AES \"aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,\"\n+# define AES \"aes256-gcm@openssh.com,aes128-gcm@openssh.com,\" \\\n+ \"aes256-ctr,aes192-ctr,aes128-ctr,\" \\\n+ \"aes256-cbc,aes192-cbc,aes128-cbc,\"\n # define DES \"3des-cbc\"\n # define DES_SUPPORTED \"3des-cbc\"\n \ndiff --git a/src/libgcrypt.c b/src/libgcrypt.c\nindex f004ffe2..7160bb1c 100644\n--- a/src/libgcrypt.c\n+++ b/src/libgcrypt.c\n@@ -353,6 +353,8 @@ static int aes_set_key(struct ssh_cipher_struct cipher, void key, void IV) {\n }\n if(strstr(cipher->name,\"-ctr\"))\n mode=GCRY_CIPHER_MODE_CTR;\n+ if (strstr(cipher->name, \"-gcm\"))\n+ mode = GCRY_CIPHER_MODE_GCM;\n switch (cipher->keysize) {\n case 128:\n if (gcry_cipher_open(&cipher->key[0], GCRY_CIPHER_AES128,\n@@ -386,6 +388,11 @@ static int aes_set_key(struct ssh_cipher_struct cipher, void key, void IV) {\n SAFE_FREE(cipher->key);\n return -1;\n }\n+ } else if (mode == GCRY_CIPHER_MODE_GCM) {\n+ /* Store the IV so we can handle the packet counter increments later\n+ * The IV is passed to the cipher context later.\n+ /\n+ memcpy(cipher->last_iv, IV, AES_GCM_IVLEN);\n } else {\n if(gcry_cipher_setctr(cipher->key[0],IV,16)){\n SAFE_FREE(cipher->key);\n@@ -407,6 +414,172 @@ static void aes_decrypt(struct ssh_cipher_struct cipher, void in, void out,\n gcry_cipher_decrypt(cipher->key[0], out, len, in, len);\n }\n \n+static int\n+aes_aead_get_length(struct ssh_cipher_struct cipher,\n+ void in,\n+ uint8_t out,\n+ size_t len,\n+ uint64_t seq)\n+{\n+ (void)seq;\n+\n+ / The length is not encrypted: Copy it to the result buffer /\n+ memcpy(out, in, len);\n+\n+ return SSH_OK;\n+}\n+\n+/ Increment 64b integer in network byte order /\n+static void\n+uint64_inc(unsigned char counter)\n+{\n+ int i;\n+\n+ for (i = 7; i >= 0; i--) {\n+ counter[i]++;\n+ if (counter[i])\n+ return;\n+ }\n+}\n+\n+static void\n+aes_gcm_encrypt(struct ssh_cipher_struct cipher,\n+ void in,\n+ void out,\n+ size_t len,\n+ uint8_t tag,\n+ uint64_t seq)\n+{\n+ gpg_error_t err;\n+ size_t aadlen, authlen;\n+\n+ (void)seq;\n+\n+ aadlen = cipher->lenfield_blocksize;\n+ authlen = cipher->tag_size;\n+\n+ /* increment IV /\n+ err = gcry_cipher_setiv(cipher->key[0],\n+ cipher->last_iv,\n+ AES_GCM_IVLEN);\n+ / This actualy does not increment the packet counter for the\n+ * current encryption operation, but for the next one. The first\n+ * operation needs to be completed with the derived IV.\n+ \n+ The IV buffer has the following structure:\n+ * [ 4B static IV ][ 8B packet counter ][ 4B block counter ]\n+ /\n+ uint64_inc(cipher->last_iv + 4);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_setiv failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+\n+ / Pass the authenticated data (packet_length) /\n+ err = gcry_cipher_authenticate(cipher->key[0], in, aadlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_authenticate failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+ memcpy(out, in, aadlen);\n+\n+ / Encrypt the rest of the data /\n+ err = gcry_cipher_encrypt(cipher->key[0],\n+ (unsigned char )out + aadlen,\n+ len - aadlen,\n+ (unsigned char )in + aadlen,\n+ len - aadlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_encrypt failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+\n+ / Calculate the tag /\n+ err = gcry_cipher_gettag(cipher->key[0],\n+ (void )tag,\n+ authlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_gettag failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+}\n+\n+static int\n+aes_gcm_decrypt(struct ssh_cipher_struct cipher,\n+ void complete_packet,\n+ uint8_t out,\n+ size_t encrypted_size,\n+ uint64_t seq)\n+{\n+ gpg_error_t err;\n+ size_t aadlen, authlen;\n+\n+ (void)seq;\n+\n+ aadlen = cipher->lenfield_blocksize;\n+ authlen = cipher->tag_size;\n+\n+ / increment IV /\n+ err = gcry_cipher_setiv(cipher->key[0],\n+ cipher->last_iv,\n+ AES_GCM_IVLEN);\n+ / This actualy does not increment the packet counter for the\n+ * current encryption operation, but for the next one. The first\n+ * operation needs to be completed with the derived IV.\n+ \n+ The IV buffer has the following structure:\n+ * [ 4B static IV ][ 8B packet counter ][ 4B block counter ]\n+ /\n+ uint64_inc(cipher->last_iv + 4);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_setiv failed: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+\n+ / Pass the authenticated data (packet_length) /\n+ err = gcry_cipher_authenticate(cipher->key[0],\n+ complete_packet,\n+ aadlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_authenticate failed: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+ / Do not copy the length to the target buffer, because it is already processed /\n+ //memcpy(out, complete_packet, aadlen);\n+\n+ / Encrypt the rest of the data /\n+ err = gcry_cipher_decrypt(cipher->key[0],\n+ out,\n+ encrypted_size,\n+ (unsigned char )complete_packet + aadlen,\n+ encrypted_size);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_decrypt failed: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+\n+ /* Check the tag /\n+ err = gcry_cipher_checktag(cipher->key[0],\n+ (unsigned char )complete_packet + aadlen + encrypted_size,\n+ authlen);\n+ if (gpg_err_code(err) == GPG_ERR_CHECKSUM) {\n+ SSH_LOG(SSH_LOG_WARNING, \"The authentication tag does not match\");\n+ return SSH_ERROR;\n+ } else if (err != GPG_ERR_NO_ERROR) {\n+ SSH_LOG(SSH_LOG_WARNING, \"General error while decryption: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+ return SSH_OK;\n+}\n+\n static int des3_set_key(struct ssh_cipher_struct cipher, void key, void IV) {\n if (cipher->key == NULL) {\n if (alloc_key(cipher) < 0) {\n@@ -519,6 +692,34 @@ static struct ssh_cipher_struct ssh_ciphertab[] = {\n .encrypt = aes_encrypt,\n .decrypt = aes_decrypt\n },\n+ {\n+ .name = \"aes128-gcm@openssh.com\",\n+ .blocksize = 16,\n+ .lenfield_blocksize = 4, / not encrypted, but authenticated /\n+ .keylen = sizeof(gcry_cipher_hd_t),\n+ .key = NULL,\n+ .keysize = 128,\n+ .tag_size = AES_GCM_TAGLEN,\n+ .set_encrypt_key = aes_set_key,\n+ .set_decrypt_key = aes_set_key,\n+ .aead_encrypt = aes_gcm_encrypt,\n+ .aead_decrypt_length = aes_aead_get_length,\n+ .aead_decrypt = aes_gcm_decrypt,\n+ },\n+ {\n+ .name = \"aes256-gcm@openssh.com\",\n+ .blocksize = 16,\n+ .lenfield_blocksize = 4, / not encrypted, but authenticated /\n+ .keylen = sizeof(gcry_cipher_hd_t),\n+ .key = NULL,\n+ .keysize = 256,\n+ .tag_size = AES_GCM_TAGLEN,\n+ .set_encrypt_key = aes_set_key,\n+ .set_decrypt_key = aes_set_key,\n+ .aead_encrypt = aes_gcm_encrypt,\n+ .aead_decrypt_length = aes_aead_get_length,\n+ .aead_decrypt = aes_gcm_decrypt,\n+ },\n {\n .name = \"3des-cbc\",\n .blocksize = 8,\n-- \n2.21.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 5790036a2305d5610ac55adb5382ea55d043998f Mon Sep 17 00:00:00 2001\nFrom: Jakub Jelen <jjelen@redhat.com>\nDate: Mon, 1 Oct 2018 14:32:05 +0200\nSubject: [PATCH] libgcrypt: Implement OpenSSH-compatible AES-GCM ciphers using\n libgcrypt\n\nSigned-off-by: Jakub Jelen <jjelen@redhat.com>\nReviewed-by: Andreas Schneider <asn@cryptomilk.org>\n---\n include/libssh/crypto.h \| 1 +\n src/kex.c \| 4 +-\n src/libgcrypt.c \| 201 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 205 insertions(+), 1 deletion(-)\n\ndiff --git a/include/libssh/crypto.h b/include/libssh/crypto.h\nindex fc375a4f..8777f0c9 100644\n--- a/include/libssh/crypto.h\n+++ b/include/libssh/crypto.h\n@@ -142,6 +142,7 @@ struct ssh_cipher_struct {\n size_t keylen; / length of the key structure /\n #ifdef HAVE_LIBGCRYPT\n gcry_cipher_hd_t key;\n+ unsigned char last_iv[AES_GCM_IVLEN];\n #elif defined HAVE_LIBCRYPTO\n struct ssh_3des_key_schedule des3_key;\n struct ssh_aes_key_schedule aes_key;\ndiff --git a/src/kex.c b/src/kex.c\nindex e0fd5680..382d88fb 100644\n--- a/src/kex.c\n+++ b/src/kex.c\n@@ -40,7 +40,9 @@\n \n #ifdef HAVE_LIBGCRYPT\n # define BLOWFISH \"blowfish-cbc,\"\n-# define AES \"aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,\"\n+# define AES \"aes256-gcm@openssh.com,aes128-gcm@openssh.com,\" \\\n+ \"aes256-ctr,aes192-ctr,aes128-ctr,\" \\\n+ \"aes256-cbc,aes192-cbc,aes128-cbc,\"\n # define DES \"3des-cbc\"\n # define DES_SUPPORTED \"3des-cbc\"\n \ndiff --git a/src/libgcrypt.c b/src/libgcrypt.c\nindex f004ffe2..7160bb1c 100644\n--- a/src/libgcrypt.c\n+++ b/src/libgcrypt.c\n@@ -353,6 +353,8 @@ static int aes_set_key(struct ssh_cipher_struct cipher, void key, void IV) {\n }\n if(strstr(cipher->name,\"-ctr\"))\n mode=GCRY_CIPHER_MODE_CTR;\n+ if (strstr(cipher->name, \"-gcm\"))\n+ mode = GCRY_CIPHER_MODE_GCM;\n switch (cipher->keysize) {\n case 128:\n if (gcry_cipher_open(&cipher->key[0], GCRY_CIPHER_AES128,\n@@ -386,6 +388,11 @@ static int aes_set_key(struct ssh_cipher_struct cipher, void key, void IV) {\n SAFE_FREE(cipher->key);\n return -1;\n }\n+ } else if (mode == GCRY_CIPHER_MODE_GCM) {\n+ /* Store the IV so we can handle the packet counter increments later\n+ * The IV is passed to the cipher context later.\n+ /\n+ memcpy(cipher->last_iv, IV, AES_GCM_IVLEN);\n } else {\n if(gcry_cipher_setctr(cipher->key[0],IV,16)){\n SAFE_FREE(cipher->key);\n@@ -407,6 +414,172 @@ static void aes_decrypt(struct ssh_cipher_struct cipher, void in, void out,\n gcry_cipher_decrypt(cipher->key[0], out, len, in, len);\n }\n \n+static int\n+aes_aead_get_length(struct ssh_cipher_struct cipher,\n+ void in,\n+ uint8_t out,\n+ size_t len,\n+ uint64_t seq)\n+{\n+ (void)seq;\n+\n+ / The length is not encrypted: Copy it to the result buffer /\n+ memcpy(out, in, len);\n+\n+ return SSH_OK;\n+}\n+\n+/ Increment 64b integer in network byte order /\n+static void\n+uint64_inc(unsigned char counter)\n+{\n+ int i;\n+\n+ for (i = 7; i >= 0; i--) {\n+ counter[i]++;\n+ if (counter[i])\n+ return;\n+ }\n+}\n+\n+static void\n+aes_gcm_encrypt(struct ssh_cipher_struct cipher,\n+ void in,\n+ void out,\n+ size_t len,\n+ uint8_t tag,\n+ uint64_t seq)\n+{\n+ gpg_error_t err;\n+ size_t aadlen, authlen;\n+\n+ (void)seq;\n+\n+ aadlen = cipher->lenfield_blocksize;\n+ authlen = cipher->tag_size;\n+\n+ /* increment IV /\n+ err = gcry_cipher_setiv(cipher->key[0],\n+ cipher->last_iv,\n+ AES_GCM_IVLEN);\n+ / This actualy does not increment the packet counter for the\n+ * current encryption operation, but for the next one. The first\n+ * operation needs to be completed with the derived IV.\n+ \n+ The IV buffer has the following structure:\n+ * [ 4B static IV ][ 8B packet counter ][ 4B block counter ]\n+ /\n+ uint64_inc(cipher->last_iv + 4);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_setiv failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+\n+ / Pass the authenticated data (packet_length) /\n+ err = gcry_cipher_authenticate(cipher->key[0], in, aadlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_authenticate failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+ memcpy(out, in, aadlen);\n+\n+ / Encrypt the rest of the data /\n+ err = gcry_cipher_encrypt(cipher->key[0],\n+ (unsigned char )out + aadlen,\n+ len - aadlen,\n+ (unsigned char )in + aadlen,\n+ len - aadlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_encrypt failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+\n+ / Calculate the tag /\n+ err = gcry_cipher_gettag(cipher->key[0],\n+ (void )tag,\n+ authlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_gettag failed: %s\",\n+ gpg_strerror(err));\n+ return;\n+ }\n+}\n+\n+static int\n+aes_gcm_decrypt(struct ssh_cipher_struct cipher,\n+ void complete_packet,\n+ uint8_t out,\n+ size_t encrypted_size,\n+ uint64_t seq)\n+{\n+ gpg_error_t err;\n+ size_t aadlen, authlen;\n+\n+ (void)seq;\n+\n+ aadlen = cipher->lenfield_blocksize;\n+ authlen = cipher->tag_size;\n+\n+ / increment IV /\n+ err = gcry_cipher_setiv(cipher->key[0],\n+ cipher->last_iv,\n+ AES_GCM_IVLEN);\n+ / This actualy does not increment the packet counter for the\n+ * current encryption operation, but for the next one. The first\n+ * operation needs to be completed with the derived IV.\n+ \n+ The IV buffer has the following structure:\n+ * [ 4B static IV ][ 8B packet counter ][ 4B block counter ]\n+ /\n+ uint64_inc(cipher->last_iv + 4);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_setiv failed: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+\n+ / Pass the authenticated data (packet_length) /\n+ err = gcry_cipher_authenticate(cipher->key[0],\n+ complete_packet,\n+ aadlen);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_authenticate failed: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+ / Do not copy the length to the target buffer, because it is already processed /\n+ //memcpy(out, complete_packet, aadlen);\n+\n+ / Encrypt the rest of the data /\n+ err = gcry_cipher_decrypt(cipher->key[0],\n+ out,\n+ encrypted_size,\n+ (unsigned char )complete_packet + aadlen,\n+ encrypted_size);\n+ if (err) {\n+ SSH_LOG(SSH_LOG_WARNING, \"gcry_cipher_decrypt failed: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+\n+ /* Check the tag /\n+ err = gcry_cipher_checktag(cipher->key[0],\n+ (unsigned char )complete_packet + aadlen + encrypted_size,\n+ authlen);\n+ if (gpg_err_code(err) == GPG_ERR_CHECKSUM) {\n+ SSH_LOG(SSH_LOG_WARNING, \"The authentication tag does not match\");\n+ return SSH_ERROR;\n+ } else if (err != GPG_ERR_NO_ERROR) {\n+ SSH_LOG(SSH_LOG_WARNING, \"General error while decryption: %s\",\n+ gpg_strerror(err));\n+ return SSH_ERROR;\n+ }\n+ return SSH_OK;\n+}\n+\n static int des3_set_key(struct ssh_cipher_struct cipher, void key, void IV) {\n if (cipher->key == NULL) {\n if (alloc_key(cipher) < 0) {\n@@ -519,6 +692,34 @@ static struct ssh_cipher_struct ssh_ciphertab[] = {\n .encrypt = aes_encrypt,\n .decrypt = aes_decrypt\n },\n+ {\n+ .name = \"aes128-gcm@openssh.com\",\n+ .blocksize = 16,\n+ .lenfield_blocksize = 4, / not encrypted, but authenticated /\n+ .keylen = sizeof(gcry_cipher_hd_t),\n+ .key = NULL,\n+ .keysize = 128,\n+ .tag_size = AES_GCM_TAGLEN,\n+ .set_encrypt_key = aes_set_key,\n+ .set_decrypt_key = aes_set_key,\n+ .aead_encrypt = aes_gcm_encrypt,\n+ .aead_decrypt_length = aes_aead_get_length,\n+ .aead_decrypt = aes_gcm_decrypt,\n+ },\n+ {\n+ .name = \"aes256-gcm@openssh.com\",\n+ .blocksize = 16,\n+ .lenfield_blocksize = 4, / not encrypted, but authenticated */\n+ .keylen = sizeof(gcry_cipher_hd_t),\n+ .key = NULL,\n+ .keysize = 256,\n+ .tag_size = AES_GCM_TAGLEN,\n+ .set_encrypt_key = aes_set_key,\n+ .set_decrypt_key = aes_set_key,\n+ .aead_encrypt = aes_gcm_encrypt,\n+ .aead_decrypt_length = aes_aead_get_length,\n+ .aead_decrypt = aes_gcm_decrypt,\n+ },\n {\n .name = \"3des-cbc\",\n .blocksize = 8,\n-- \n2.21.0\n\n" } ]	{ "id": "libssh-12292-0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch", "cves": [ "CVE-2020-1730" ], "package": "libssh", "incident_id": 12292, "patch_name": "0001-libgcrypt-Implement-OpenSSH-compatible-AES-GCM-ciphe.patch", "tier": "identical", "language": "c", "patch_lines_changed": 207, "patch_files_count": 3, "total_tokens_est": 4773, "has_source_context": true, "upstream_enriched": false, "suse_license": "LGPL-2.1-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2020-1730", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-1730\n\n===================================================================\n\n## Package\nlibssh\n\n## Files to modify\n- tests/unittests/torture_misc.c\n- DefineOptions.cmake\n\n## Target Source Code\n\n### tests/unittests/torture_misc.c\n\n#### torture_timeout_elapsed() [lines 192-207]\n```c\n free(tmp);\n}\n\nstatic void torture_timeout_elapsed(void state){\n struct ssh_timestamp ts;\n (void) state;\n ssh_timestamp_init(&ts);\n usleep(50000);\n assert_true(ssh_timeout_elapsed(&ts,25));\n assert_false(ssh_timeout_elapsed(&ts,30000));\n assert_false(ssh_timeout_elapsed(&ts,75));\n assert_true(ssh_timeout_elapsed(&ts,0));\n assert_false(ssh_timeout_elapsed(&ts,-1));\n}\n\nstatic void torture_timeout_update(void state){\n```\n\n#### torture_timeout_update() [lines 204-219]\n```c\n assert_false(ssh_timeout_elapsed(&ts,-1));\n}\n\nstatic void torture_timeout_update(void state){\n struct ssh_timestamp ts;\n (void) state;\n ssh_timestamp_init(&ts);\n usleep(50000);\n assert_int_equal(ssh_timeout_update(&ts,25), 0);\n assert_in_range(ssh_timeout_update(&ts,30000),29000,29960);\n assert_in_range(ssh_timeout_update(&ts,75),1,40);\n assert_int_equal(ssh_timeout_update(&ts,0),0);\n assert_int_equal(ssh_timeout_update(&ts,-1),-1);\n}\n\nstatic void torture_ssh_analyze_banner(void state) {\n```\n\n### DefineOptions.cmake\n\n#### option() [lines 1-49]\n```\noption(WITH_GSSAPI \"Build with GSSAPI support\" ON)\noption(WITH_ZLIB \"Build with ZLIB support\" ON)\noption(WITH_SFTP \"Build with SFTP support\" ON)\noption(WITH_SERVER \"Build with SSH server support\" ON)\noption(WITH_STATIC_LIB \"Build with a static library\" OFF)\noption(WITH_DEBUG_CRYPTO \"Build with cryto debug output\" OFF)\noption(WITH_DEBUG_PACKET \"Build with packet debug output\" OFF)\noption(WITH_DEBUG_CALLTRACE \"Build with calltrace debug output\" ON)\noption(WITH_GCRYPT \"Compile against libgcrypt\" OFF)\noption(WITH_MBEDTLS \"Compile against libmbedtls\" OFF)\noption(WITH_PCAP \"Compile with Pcap generation support\" ON)\noption(WITH_INTERNAL_DOC \"Compile doxygen internal documentation\" OFF)\noption(UNIT_TESTING \"Build with unit tests\" OFF)\noption(CLIENT_TESTING \"Build with client tests; requires openssh\" OFF)\noption(SERVER_TESTING \"Build with server tests; requires openssh and dropbear\" OFF)\noption(WITH_BENCHMARKS \"Build benchmarks tools\" OFF)\noption(WITH_EXAMPLES \"Build examples\" ON)\noption(WITH_NACL \"Build with libnacl (curve25519)\" ON)\noption(WITH_SYMBOL_VERSIONING \"Build with symbol versioning\" ON)\noption(WITH_ABI_BREAK \"Allow ABI break\" OFF)\noption(FUZZ_TESTING \"Build with fuzzer for the server\" OFF)\noption(PICKY_DEVELOPER \"Build with picky developer flags\" OFF)\n\nif (WITH_ZLIB)\n set(WITH_LIBZ ON)\nelse (WITH_ZLIB)\n set(WITH_LIBZ OFF)\nendif (WITH_ZLIB)\n\nif(WITH_BENCHMARKS)\n set(UNIT_TESTING ON)\nendif(WITH_BENCHMARKS)\n\nif (WITH_STATIC_LIB)\n set(BUILD_STATIC_LIB ON)\nendif (WITH_STATIC_LIB)\n\nif (UNIT_TESTING)\n set(BUILD_STATIC_LIB ON)\nendif (UNIT_TESTING)\n\nif (WITH_NACL)\n set(WITH_NACL ON)\nendif (WITH_NACL)\n\nif (WITH_ABI_BREAK)\n set(WITH_SYMBOL_VERSIONING ON)\nendif (WITH_ABI_BREAK)\n\n```\n\n\n## Upstream Fix\n```diff\nIndex: libssh-0.8.2/tests/unittests/torture_misc.c\n===================================================================\n--- libssh-0.8.2.orig/tests/unittests/torture_misc.c\t2018-08-30 08:12:50.355846083 +0200\n+++ libssh-0.8.2/tests/unittests/torture_misc.c\t2018-08-30 08:12:54.831889573 +0200\n@@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void\n (void) state;\n ssh_timestamp_init(&ts);\n usleep(50000);\n+#ifndef SLOW_TEST_SYSTEM\n assert_true(ssh_timeout_elapsed(&ts,25));\n assert_false(ssh_timeout_elapsed(&ts,30000));\n assert_false(ssh_timeout_elapsed(&ts,75));\n assert_true(ssh_timeout_elapsed(&ts,0));\n assert_false(ssh_timeout_elapsed(&ts,-1));\n+#endif /* SLOW_TEST_SYSTEM /\n }\n \n static void torture_timeout_update(void state){\n@@ -209,11 +211,13 @@ static void torture_timeout_update(void\n (void) state;\n ssh_timestamp_init(&ts);\n usleep(50000);\n+#ifndef SLOW_TEST_SYSTEM\n assert_int_equal(ssh_timeout_update(&ts,25), 0);\n assert_in_range(ssh_timeout_update(&ts,30000),29000,29960);\n assert_in_range(ssh_timeout_update(&ts,75),1,40);\n assert_int_equal(ssh_timeout_update(&ts,0),0);\n assert_int_equal(ssh_timeout_update(&ts,-1),-1);\n+#endif / SLOW_TEST_SYSTEM /\n }\n \n static void torture_ssh_analyze_banner(void state) {\nIndex: libssh-0.8.2/DefineOptions.cmake\n===================================================================\n--- libssh-0.8.2.orig/DefineOptions.cmake\t2018-08-30 08:12:50.355846083 +0200\n+++ libssh-0.8.2/DefineOptions.cmake\t2018-08-30 08:13:25.020182668 +0200\n@@ -20,6 +20,7 @@ option(WITH_SYMBOL_VERSIONING \"Build wit\n option(WITH_ABI_BREAK \"Allow ABI break\" OFF)\n option(FUZZ_TESTING \"Build with fuzzer for the server\" OFF)\n option(PICKY_DEVELOPER \"Build with picky developer flags\" OFF)\n+option(SLOW_TEST_SYSTEM \"Disable tests that fail on slow systems\" OFF)\n \n if (WITH_ZLIB)\n set(WITH_LIBZ ON)\n@@ -46,3 +47,8 @@ endif (WITH_NACL)\n if (WITH_ABI_BREAK)\n set(WITH_SYMBOL_VERSIONING ON)\n endif (WITH_ABI_BREAK)\n+\n+if (SLOW_TEST_SYSTEM)\n+ set (SLOW_TEST_SYSTEM ON)\n+ add_definitions(-DSLOW_TEST_SYSTEM)\n+endif (SLOW_TEST_SYSTEM)\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: libssh-0.8.2/tests/unittests/torture_misc.c\n===================================================================\n--- libssh-0.8.2.orig/tests/unittests/torture_misc.c\t2018-08-30 08:12:50.355846083 +0200\n+++ libssh-0.8.2/tests/unittests/torture_misc.c\t2018-08-30 08:12:54.831889573 +0200\n@@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void\n (void) state;\n ssh_timestamp_init(&ts);\n usleep(50000);\n+#ifndef SLOW_TEST_SYSTEM\n assert_true(ssh_timeout_elapsed(&ts,25));\n assert_false(ssh_timeout_elapsed(&ts,30000));\n assert_false(ssh_timeout_elapsed(&ts,75));\n assert_true(ssh_timeout_elapsed(&ts,0));\n assert_false(ssh_timeout_elapsed(&ts,-1));\n+#endif / SLOW_TEST_SYSTEM /\n }\n \n static void torture_timeout_update(void state){\n@@ -209,11 +211,13 @@ static void torture_timeout_update(void\n (void) state;\n ssh_timestamp_init(&ts);\n usleep(50000);\n+#ifndef SLOW_TEST_SYSTEM\n assert_int_equal(ssh_timeout_update(&ts,25), 0);\n assert_in_range(ssh_timeout_update(&ts,30000),29000,29960);\n assert_in_range(ssh_timeout_update(&ts,75),1,40);\n assert_int_equal(ssh_timeout_update(&ts,0),0);\n assert_int_equal(ssh_timeout_update(&ts,-1),-1);\n+#endif / SLOW_TEST_SYSTEM /\n }\n \n static void torture_ssh_analyze_banner(void *state) {\nIndex: libssh-0.8.2/DefineOptions.cmake\n===================================================================\n--- libssh-0.8.2.orig/DefineOptions.cmake\t2018-08-30 08:12:50.355846083 +0200\n+++ libssh-0.8.2/DefineOptions.cmake\t2018-08-30 08:13:25.020182668 +0200\n@@ -20,6 +20,7 @@ option(WITH_SYMBOL_VERSIONING \"Build wit\n option(WITH_ABI_BREAK \"Allow ABI break\" OFF)\n option(FUZZ_TESTING \"Build with fuzzer for the server\" OFF)\n option(PICKY_DEVELOPER \"Build with picky developer flags\" OFF)\n+option(SLOW_TEST_SYSTEM \"Disable tests that fail on slow systems\" OFF)\n \n if (WITH_ZLIB)\n set(WITH_LIBZ ON)\n@@ -46,3 +47,8 @@ endif (WITH_NACL)\n if (WITH_ABI_BREAK)\n set(WITH_SYMBOL_VERSIONING ON)\n endif (WITH_ABI_BREAK)\n+\n+if (SLOW_TEST_SYSTEM)\n+ set (SLOW_TEST_SYSTEM ON)\n+ add_definitions(-DSLOW_TEST_SYSTEM)\n+endif (SLOW_TEST_SYSTEM)\n" } ]	{ "id": "libssh-12292-0001-disable-timeout-test-on-slow-buildsystems.patch", "cves": [ "CVE-2020-1730" ], "package": "libssh", "incident_id": 12292, "patch_name": "0001-disable-timeout-test-on-slow-buildsystems.patch", "tier": "identical", "language": "c", "patch_lines_changed": 10, "patch_files_count": 2, "total_tokens_est": 1210, "has_source_context": true, "upstream_enriched": false, "suse_license": "LGPL-2.1-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2020-1730", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\n===================================================================\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n- grub-2.04~rc1/grub-core/normal/main.c\n- grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n\n## Target Source Code\n\n### grub-core/kern/ieee1275/openfw.c\n\n#### grub_ieee1275_canonicalise_devname() [lines 522-567]\n```c\n\n/* Resolve aliases. /\nchar \ngrub_ieee1275_canonicalise_devname (const char path)\n{\n struct canon_args\n {\n struct grub_ieee1275_common_hdr common;\n grub_ieee1275_cell_t path;\n grub_ieee1275_cell_t buf;\n grub_ieee1275_cell_t inlen;\n grub_ieee1275_cell_t outlen;\n }\n args;\n char buf = NULL;\n grub_size_t bufsize = 64;\n int i;\n\n for (i = 0; i < 2; i++)\n {\n grub_free (buf);\n\n buf = grub_malloc (bufsize);\n if (!buf)\n\treturn NULL;\n\n INIT_IEEE1275_COMMON (&args.common, \"canon\", 3, 1);\n args.path = (grub_ieee1275_cell_t) path;\n args.buf = (grub_ieee1275_cell_t) buf;\n args.inlen = (grub_ieee1275_cell_t) (bufsize - 1);\n\n if (IEEE1275_CALL_ENTRY_FN (&args) == -1)\n\treturn 0;\n if (args.outlen > bufsize - 1)\n\t{\n\t bufsize = args.outlen + 2;\n\t continue;\n\t}\n return buf;\n }\n /* Shouldn't reach here. /\n grub_free (buf);\n return NULL;\n}\n\nchar \n```\n\n#### grub_ieee1275_cas_reboot() [lines 579-594]\n```c\n return NULL;\n }\n\n bootpath = (char ) grub_malloc ((grub_size_t) bootpath_size + 64);\n if (! bootpath)\n {\n grub_print_error ();\n return NULL;\n }\n grub_ieee1275_get_property (grub_ieee1275_chosen, \"bootpath\", bootpath,\n (grub_size_t) bootpath_size + 1, 0);\n bootpath[bootpath_size] = '\\0';\n\n return bootpath;\n}\n\n```\n\n#### grub_ieee1275_set_boot_last_label() [lines 602-594]\n```c\n\n```\n\n### grub-core/normal/main.c\n\n#### grub_normal_execute() [lines 257-297]\n```c\n/ Read the config file CONFIG and execute the menu interface or\n the command line interface if BATCH is false. /\nvoid\ngrub_normal_execute (const char config, int nested, int batch)\n{\n grub_menu_t menu = 0;\n const char prefix;\n\n if (! nested)\n {\n prefix = grub_env_get (\"prefix\");\n read_lists (prefix);\n grub_register_variable_hook (\"prefix\", NULL, read_lists_hook);\n }\n\n grub_boot_time (\"Executing config file\");\n\n if (config)\n {\n menu = read_config_file (config);\n\n / Ignore any error. /\n grub_errno = GRUB_ERR_NONE;\n }\n\n grub_boot_time (\"Executed config file\");\n\n if (! batch)\n {\n if (menu && menu->size)\n\t{\n\n\t grub_boot_time (\"Entering menu\");\n\t grub_show_menu (menu, nested, 0);\n\t if (nested)\n\t grub_normal_free_menu (menu);\n\t}\n }\n}\n\n/ This starts the normal mode. /\n```\n\n### include/grub/ieee1275/ieee1275.h\n\n#### EXPORT_FUNC() [lines 214-267]\n```c\nint EXPORT_FUNC(grub_ieee1275_milliseconds) (grub_uint32_t msecs);\nint EXPORT_FUNC(grub_ieee1275_set_address) (grub_ieee1275_ihandle_t ihandle,\n grub_uint32_t target,\n grub_uint32_t lun);\nint EXPORT_FUNC(grub_ieee1275_no_data_command) (grub_ieee1275_ihandle_t ihandle,\n const void cmd_addr,\n grub_ssize_t result);\nint EXPORT_FUNC(grub_ieee1275_decode_unit4) (grub_ieee1275_ihandle_t ihandle,\n void addr, grub_size_t size,\n grub_uint32_t phy_lo,\n grub_uint32_t phy_hi,\n grub_uint32_t lun_lo,\n grub_uint32_t lun_hi);\nchar EXPORT_FUNC(grub_ieee1275_encode_uint4) (grub_ieee1275_ihandle_t ihandle,\n grub_uint32_t phy_lo,\n grub_uint32_t phy_hi,\n grub_uint32_t lun_lo,\n grub_uint32_t lun_hi,\n grub_size_t size);\nint EXPORT_FUNC(grub_ieee1275_get_block_size) (grub_ieee1275_ihandle_t ihandle);\n\ngrub_err_t EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);\n\nint\nEXPORT_FUNC(grub_ieee1275_map) (grub_addr_t phys, grub_addr_t virt,\n\t\t\t\tgrub_size_t size, grub_uint32_t mode);\n\nchar EXPORT_FUNC(grub_ieee1275_encode_devname) (const char path);\nchar EXPORT_FUNC(grub_ieee1275_get_filename) (const char path);\nint EXPORT_FUNC(grub_ieee1275_devices_iterate) (int (hook)\n\t\t\t\t\t\t(struct grub_ieee1275_devalias \n\t\t\t\t\t\t alias));\nchar EXPORT_FUNC(grub_ieee1275_get_aliasdevname) (const char path);\nchar EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char path);\nchar EXPORT_FUNC(grub_ieee1275_get_device_type) (const char path);\nchar EXPORT_FUNC(grub_ieee1275_get_devname) (const char path);\n\nvoid EXPORT_FUNC(grub_ieee1275_devalias_init_iterator) (struct grub_ieee1275_devalias alias);\nvoid EXPORT_FUNC(grub_ieee1275_devalias_free) (struct grub_ieee1275_devalias alias);\nint EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias alias);\nvoid EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias alias);\nvoid EXPORT_FUNC(grub_ieee1275_children_first) (const char devpath,\n\t\t\t\t\t\tstruct grub_ieee1275_devalias alias);\n\nchar EXPORT_FUNC(grub_ieee1275_get_boot_dev) (void);\n\n#define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)\n\n#define FOR_IEEE1275_DEVCHILDREN(devpath, alias) for (grub_ieee1275_children_first ((devpath), &(alias)); \\\n\t\t\t\t\t\t (alias).name;\t\\\n\t\t\t\t\t\t grub_ieee1275_children_peer (&(alias)))\n\n#endif /* ! GRUB_IEEE1275_HEADER /\n\n```\n\n\n## Upstream Fix\n```diff\nIndex: grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/openfw.c\n+++ grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n@@ -595,7 +595,7 @@ grub_ieee1275_canonicalise_devname (cons\n \n / Check if it's a CAS reboot. If so, set the script to be executed. /\n int\n-grub_ieee1275_cas_reboot (char script)\n+grub_ieee1275_cas_reboot (char *script)\n {\n grub_uint32_t ibm_ca_support_reboot;\n grub_uint32_t ibm_fw_nbr_reboots;\n@@ -628,16 +628,37 @@ grub_ieee1275_cas_reboot (char script)\n \n if (ibm_ca_support_reboot \|\| ibm_fw_nbr_reboots)\n {\n- if (! grub_ieee1275_get_property_length (options, \"boot-last-label\", &actual))\n- {\n- if (actual > 1024)\n- script = grub_realloc (script, actual + 1);\n- grub_ieee1275_get_property (options, \"boot-last-label\", script, actual,\n- &actual);\n- return 0;\n- }\n+ grub_ssize_t len;\n+ char buf;\n+\n+ if (grub_ieee1275_get_property_length (options, \"boot-last-label\", &len)\n+\t\t\|\| len <= 0)\n+\t{\n+\t grub_dprintf (\"ieee1275\", \"boot-last-label missing or invalid\\n\");\n+\t goto out;\n+\t}\n+ / The returned property string length may not include terminating null byte, and in\n+ a bid to avoid out of bound access we allocate one more byte to add it back /\n+ buf = grub_malloc ((grub_size_t)len + 1);\n+ if (!buf)\n+\t{\n+\t grub_print_error ();\n+\t goto out;\n+\t}\n+ if (grub_ieee1275_get_property (options, \"boot-last-label\", buf, (grub_size_t)len + 1, &actual)\n+\t\t\|\| actual < 0)\n+\t{\n+\t grub_dprintf (\"ieee1275\", \"error while get boot-last-label property\\n\");\n+\t grub_free (buf);\n+\t goto out;\n+\t}\n+ / Add terminating null byte /\n+ buf[len] = '\\0';\n+ script = buf;\n+ return 0;\n }\n \n+out:\n grub_ieee1275_set_boot_last_label (\"\");\n \n return -1;\n@@ -651,8 +672,9 @@ int grub_ieee1275_set_boot_last_label (c\n grub_dprintf(\"ieee1275\", \"set boot_last_label (size: %\" PRIxGRUB_SIZE \")\\n\", grub_strlen(text));\n if (! grub_ieee1275_finddevice (\"/options\", &options) &&\n options != (grub_ieee1275_ihandle_t) -1)\n+ /* To be on the safe side, set the property string with terminating null byte /\n grub_ieee1275_set_property (options, \"boot-last-label\", text,\n- grub_strlen (text), &actual);\n+ grub_strlen (text) + 1, &actual);\n return 0;\n }\n \nIndex: grub-2.04~rc1/grub-core/normal/main.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/normal/main.c\n+++ grub-2.04~rc1/grub-core/normal/main.c\n@@ -281,10 +281,9 @@ grub_normal_execute (const char config,\n #ifdef GRUB_MACHINE_IEEE1275\n int boot;\n boot = 0;\n- char script;\n+ char script = NULL;\n char dummy[1] = { NULL };\n- script = grub_malloc (1024);\n- if (! grub_ieee1275_cas_reboot (script))\n+ if (! grub_ieee1275_cas_reboot (&script) && script)\n {\n if (! grub_script_execute_new_scope (script, 0, dummy))\n boot = 1;\nIndex: grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n===================================================================\n--- grub-2.04~rc1.orig/include/grub/ieee1275/ieee1275.h\n+++ grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n@@ -263,7 +263,7 @@ int EXPORT_FUNC(grub_ieee1275_devalias_n\n void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias alias);\n void EXPORT_FUNC(grub_ieee1275_children_first) (const char devpath,\n \t\t\t\t\t\tstruct grub_ieee1275_devalias alias);\n-int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char script);\n+int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char script);\n int EXPORT_FUNC(grub_ieee1275_set_boot_last_label) (const char text);\n \n char EXPORT_FUNC(grub_ieee1275_get_boot_dev) (void);\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/openfw.c\n+++ grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n@@ -595,7 +595,7 @@ grub_ieee1275_canonicalise_devname (cons\n \n / Check if it's a CAS reboot. If so, set the script to be executed. /\n int\n-grub_ieee1275_cas_reboot (char script)\n+grub_ieee1275_cas_reboot (char *script)\n {\n grub_uint32_t ibm_ca_support_reboot;\n grub_uint32_t ibm_fw_nbr_reboots;\n@@ -628,16 +628,37 @@ grub_ieee1275_cas_reboot (char script)\n \n if (ibm_ca_support_reboot \|\| ibm_fw_nbr_reboots)\n {\n- if (! grub_ieee1275_get_property_length (options, \"boot-last-label\", &actual))\n- {\n- if (actual > 1024)\n- script = grub_realloc (script, actual + 1);\n- grub_ieee1275_get_property (options, \"boot-last-label\", script, actual,\n- &actual);\n- return 0;\n- }\n+ grub_ssize_t len;\n+ char buf;\n+\n+ if (grub_ieee1275_get_property_length (options, \"boot-last-label\", &len)\n+\t\t\|\| len <= 0)\n+\t{\n+\t grub_dprintf (\"ieee1275\", \"boot-last-label missing or invalid\\n\");\n+\t goto out;\n+\t}\n+ / The returned property string length may not include terminating null byte, and in\n+ a bid to avoid out of bound access we allocate one more byte to add it back /\n+ buf = grub_malloc ((grub_size_t)len + 1);\n+ if (!buf)\n+\t{\n+\t grub_print_error ();\n+\t goto out;\n+\t}\n+ if (grub_ieee1275_get_property (options, \"boot-last-label\", buf, (grub_size_t)len + 1, &actual)\n+\t\t\|\| actual < 0)\n+\t{\n+\t grub_dprintf (\"ieee1275\", \"error while get boot-last-label property\\n\");\n+\t grub_free (buf);\n+\t goto out;\n+\t}\n+ / Add terminating null byte /\n+ buf[len] = '\\0';\n+ script = buf;\n+ return 0;\n }\n \n+out:\n grub_ieee1275_set_boot_last_label (\"\");\n \n return -1;\n@@ -651,8 +672,9 @@ int grub_ieee1275_set_boot_last_label (c\n grub_dprintf(\"ieee1275\", \"set boot_last_label (size: %\" PRIxGRUB_SIZE \")\\n\", grub_strlen(text));\n if (! grub_ieee1275_finddevice (\"/options\", &options) &&\n options != (grub_ieee1275_ihandle_t) -1)\n+ /* To be on the safe side, set the property string with terminating null byte /\n grub_ieee1275_set_property (options, \"boot-last-label\", text,\n- grub_strlen (text), &actual);\n+ grub_strlen (text) + 1, &actual);\n return 0;\n }\n \nIndex: grub-2.04~rc1/grub-core/normal/main.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/normal/main.c\n+++ grub-2.04~rc1/grub-core/normal/main.c\n@@ -281,10 +281,9 @@ grub_normal_execute (const char config,\n #ifdef GRUB_MACHINE_IEEE1275\n int boot;\n boot = 0;\n- char script;\n+ char script = NULL;\n char dummy[1] = { NULL };\n- script = grub_malloc (1024);\n- if (! grub_ieee1275_cas_reboot (script))\n+ if (! grub_ieee1275_cas_reboot (&script) && script)\n {\n if (! grub_script_execute_new_scope (script, 0, dummy))\n boot = 1;\nIndex: grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n===================================================================\n--- grub-2.04~rc1.orig/include/grub/ieee1275/ieee1275.h\n+++ grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n@@ -263,7 +263,7 @@ int EXPORT_FUNC(grub_ieee1275_devalias_n\n void EXPORT_FUNC(grub_ieee1275_children_peer) (struct grub_ieee1275_devalias alias);\n void EXPORT_FUNC(grub_ieee1275_children_first) (const char devpath,\n \t\t\t\t\t\tstruct grub_ieee1275_devalias alias);\n-int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char script);\n+int EXPORT_FUNC(grub_ieee1275_cas_reboot) (char script);\n int EXPORT_FUNC(grub_ieee1275_set_boot_last_label) (const char text);\n \n char *EXPORT_FUNC(grub_ieee1275_get_boot_dev) (void);\n" } ]	{ "id": "grub2-15947-grub2-ppc64-cas-fix-double-free.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-ppc64-cas-fix-double-free.patch", "tier": "identical", "language": "c", "patch_lines_changed": 49, "patch_files_count": 3, "total_tokens_est": 2141, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nutil/mkimage: Improve data_size value calculation\n\n## Package\ngrub2\n\n## Files to modify\n- util/mkimage.c\n\n## Target Source Code\n\n### util/mkimage.c\n\n#### grub_install_generate_image() [lines 1160-1754]\n```c\n break;\n }\n\n switch (image_target->id)\n {\n case IMAGE_I386_PC:\n case IMAGE_I386_PC_PXE:\n case IMAGE_I386_PC_ELTORITO:\n {\n\tunsigned num;\n\tchar boot_path, boot_img;\n\tsize_t boot_size;\n\n\tnum = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);\n\tif (image_target->id == IMAGE_I386_PC_PXE)\n\t {\n\t char pxeboot_path, pxeboot_img;\n\t size_t pxeboot_size;\n\t grub_uint32_t ptr;\n\t \n\t pxeboot_path = grub_util_get_path (dir, \"pxeboot.img\");\n\t pxeboot_size = grub_util_get_image_size (pxeboot_path);\n\t pxeboot_img = grub_util_read_image (pxeboot_path);\n\t \n\t grub_util_write_image (pxeboot_img, pxeboot_size, out,\n\t\t\t\t outname);\n\t free (pxeboot_img);\n\t free (pxeboot_path);\n\n\t / Remove Multiboot header to avoid confusing ipxe. /\n\t for (ptr = (grub_uint32_t ) core_img;\n\t\t ptr < (grub_uint32_t ) (core_img + MULTIBOOT_SEARCH); ptr++)\n\t if (ptr == grub_host_to_target32 (MULTIBOOT_HEADER_MAGIC)\n\t\t && grub_target_to_host32 (ptr[0])\n\t\t + grub_target_to_host32 (ptr[1])\n\t\t + grub_target_to_host32 (ptr[2]) == 0)\n\t\t{\n\t\t ptr = 0;\n\t\t break;\n\t\t}\n/ ... 51 lines omitted ... /\n\tstruct grub_pe32_section_table mods_section, reloc_section;\n\tstatic const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;\n\tint header_size;\n\tint reloc_addr;\n\n\tif (image_target->voidp_sizeof == 4)\n\t header_size = EFI32_HEADER_SIZE;\n\telse\n\t header_size = EFI64_HEADER_SIZE;\n\n\treloc_addr = ALIGN_UP (header_size + core_size,\n\t\t\t GRUB_PE32_FILE_ALIGNMENT);\n\n\tpe_size = ALIGN_UP (reloc_addr + layout.reloc_size,\n\t\t\t GRUB_PE32_FILE_ALIGNMENT);\n\tpe_img = xmalloc (reloc_addr + layout.reloc_size);\n\tmemset (pe_img, 0, header_size);\n\tmemcpy ((char ) pe_img + header_size, core_img, core_size);\n\tmemset ((char ) pe_img + header_size + core_size, 0, reloc_addr - (header_size + core_size));\n\tmemcpy ((char ) pe_img + reloc_addr, layout.reloc_section, layout.reloc_size);\n\theader = pe_img;\n\n\t/* The magic. /\n\tmemcpy (header, stub, GRUB_PE32_MSDOS_STUB_SIZE);\n\tmemcpy (header + GRUB_PE32_MSDOS_STUB_SIZE, \"PE\\0\\0\",\n\t\tGRUB_PE32_SIGNATURE_SIZE);\n/ ... 458 lines omitted ... /\n\t {\n\t if (comp == GRUB_COMPRESSION_NONE)\n\t target_addr = (image_target->link_addr - decompress_size);\n\t else\n\t target_addr = ALIGN_UP (image_target->link_addr\n\t\t\t\t + layout.kernel_size + total_module_size, 32);\n\t }\n\telse\n\t target_addr = image_target->link_addr;\n\tif (image_target->voidp_sizeof == 4)\n\t grub_mkimage_generate_elf32 (image_target, note, &core_img, &core_size,\n\t\t\t\t target_addr, &layout);\n\telse\n\t grub_mkimage_generate_elf64 (image_target, note, &core_img, &core_size,\n\t\t\t\t target_addr, &layout);\n }\n break;\n }\n\n grub_util_write_image (core_img, core_size, out, outname);\n```\n\n\n## Upstream Fix\n```diff\nFrom f1baa6c380bea958b8004a0764a4464d798ee3aa Mon Sep 17 00:00:00 2001\nFrom: Peter Jones <pjones@redhat.com>\nDate: Thu, 11 Feb 2021 17:07:33 +0100\nSubject: [PATCH 36/45] util/mkimage: Improve data_size value calculation\n\nAccording to \"Microsoft Portable Executable and Common Object File Format\nSpecification\", the Optional Header SizeOfInitializedData field contains:\n\n Size of the initialized data section, or the sum of all such sections if\n there are multiple data sections.\n\nMake this explicit by adding the GRUB kernel data size to the sum of all\nthe modules sizes. The ALIGN_UP() is not required by the PE spec but do\nit to avoid alignment issues.\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n util/mkimage.c \| 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/util/mkimage.c b/util/mkimage.c\nindex deaef5666..853a52179 100644\n--- a/util/mkimage.c\n+++ b/util/mkimage.c\n@@ -1260,6 +1260,7 @@ grub_install_generate_image (const char dir, const char prefix,\n \tvoid pe_img;\n \tgrub_uint8_t header;\n \tvoid sections;\n+\tsize_t scn_size;\n \tsize_t pe_size;\n \tstruct grub_pe32_coff_header c;\n \tstruct grub_pe32_section_table text_section, data_section;\n@@ -1362,7 +1363,10 @@ grub_install_generate_image (const char dir, const char prefix,\n \t\t\t\t\t\t\| GRUB_PE32_SCN_MEM_EXECUTE\n \t\t\t\t\t\t\| GRUB_PE32_SCN_MEM_READ);\n \n-\tPE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size);\n+\tscn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT);\n+\tPE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size +\n+\t\t\t\t\t\t\t ALIGN_UP (total_module_size,\n+\t\t\t\t\t\t\t\t\t GRUB_PE32_FILE_ALIGNMENT));\n \n \tdata_section = text_section + 1;\n \tstrcpy (data_section->name, \".data\");\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From f1baa6c380bea958b8004a0764a4464d798ee3aa Mon Sep 17 00:00:00 2001\nFrom: Peter Jones <pjones@redhat.com>\nDate: Thu, 11 Feb 2021 17:07:33 +0100\nSubject: [PATCH 36/45] util/mkimage: Improve data_size value calculation\n\nAccording to \"Microsoft Portable Executable and Common Object File Format\nSpecification\", the Optional Header SizeOfInitializedData field contains:\n\n Size of the initialized data section, or the sum of all such sections if\n there are multiple data sections.\n\nMake this explicit by adding the GRUB kernel data size to the sum of all\nthe modules sizes. The ALIGN_UP() is not required by the PE spec but do\nit to avoid alignment issues.\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n util/mkimage.c \| 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/util/mkimage.c b/util/mkimage.c\nindex deaef5666..853a52179 100644\n--- a/util/mkimage.c\n+++ b/util/mkimage.c\n@@ -1260,6 +1260,7 @@ grub_install_generate_image (const char dir, const char prefix,\n \tvoid pe_img;\n \tgrub_uint8_t header;\n \tvoid sections;\n+\tsize_t scn_size;\n \tsize_t pe_size;\n \tstruct grub_pe32_coff_header c;\n \tstruct grub_pe32_section_table text_section, data_section;\n@@ -1362,7 +1363,10 @@ grub_install_generate_image (const char dir, const char *prefix,\n \t\t\t\t\t\t\| GRUB_PE32_SCN_MEM_EXECUTE\n \t\t\t\t\t\t\| GRUB_PE32_SCN_MEM_READ);\n \n-\tPE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size);\n+\tscn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT);\n+\tPE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size +\n+\t\t\t\t\t\t\t ALIGN_UP (total_module_size,\n+\t\t\t\t\t\t\t\t\t GRUB_PE32_FILE_ALIGNMENT));\n \n \tdata_section = text_section + 1;\n \tstrcpy (data_section->name, \".data\");\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0036-util-mkimage-Improve-data_size-value-calculation.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0036-util-mkimage-Improve-data_size-value-calculation.patch", "tier": "identical", "language": "c", "patch_lines_changed": 7, "patch_files_count": 1, "total_tokens_est": 1095, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nsquash! Don't allow insmod when secure boot is enabled.\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/kern/dl.c\n- grub-core/kern/efi/efi.c\n- include/grub/efi/efi.h\n\n## Target Source Code\n\n### grub-core/kern/dl.c\n\n#### region() [lines 1-97]\n```c\n/* dl.c - loadable module support /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2002,2003,2004,2005,2007,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n/ Force native word size /\n#define GRUB_TARGET_WORDSIZE (8 GRUB_CPU_SIZEOF_VOID_P)\n\n#include <config.h>\n#include <grub/elf.h>\n#include <grub/dl.h>\n#include <grub/misc.h>\n#include <grub/mm.h>\n#include <grub/err.h>\n#include <grub/types.h>\n#include <grub/symbol.h>\n#include <grub/file.h>\n#include <grub/env.h>\n#include <grub/cache.h>\n#include <grub/i18n.h>\n\n/* Platforms where modules are in a readonly area of memory. /\n#if defined(GRUB_MACHINE_QEMU)\n#define GRUB_MODULES_MACHINE_READONLY\n#endif\n\n\f\n\n#pragma GCC diagnostic ignored \"-Wcast-align\"\n\ngrub_dl_t grub_dl_head = 0;\n\ngrub_err_t\ngrub_dl_add (grub_dl_t mod);\n\n/ Keep global so that GDB scripts work. /\ngrub_err_t\ngrub_dl_add (grub_dl_t mod)\n{\n if (grub_dl_get (mod->name))\n return grub_error (GRUB_ERR_BAD_MODULE,\n\t\t \"`%s' is already loaded\", mod->name);\n\n return GRUB_ERR_NONE;\n}\n\nstatic void\ngrub_dl_remove (grub_dl_t mod)\n{\n grub_dl_t p, q;\n\n for (p = &grub_dl_head, q = p; q; p = &q->next, q = p)\n if (q == mod)\n {\n\tp = q->next;\n\treturn;\n }\n}\n\n\f\n\nstruct grub_symbol\n{\n struct grub_symbol next;\n const char name;\n void addr;\n int isfunc;\n grub_dl_t mod;\t/* The module to which this symbol belongs. /\n};\ntypedef struct grub_symbol grub_symbol_t;\n\n/* The size of the symbol table. /\n#define GRUB_SYMTAB_SIZE\t509\n\n/ The symbol table (using an open-hash). /\nstatic struct grub_symbol grub_symtab[GRUB_SYMTAB_SIZE];\n\n/* Simple hash function. /\nstatic unsigned\ngrub_symbol_hash (const char s)\n{\n unsigned key = 0;\n\n```\n\n#### grub_dl_load_file() [lines 679-724]\n```c\n\n/* Load a module from the file FILENAME. /\ngrub_dl_t\ngrub_dl_load_file (const char filename)\n{\n grub_file_t file = NULL;\n grub_ssize_t size;\n void core = 0;\n grub_dl_t mod = 0;\n\n grub_boot_time (\"Loading module %s\", filename);\n\n file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);\n if (! file)\n return 0;\n\n size = grub_file_size (file);\n core = grub_malloc (size);\n if (! core)\n {\n grub_file_close (file);\n return 0;\n }\n\n if (grub_file_read (file, core, size) != (int) size)\n {\n grub_file_close (file);\n grub_free (core);\n return 0;\n }\n\n / We must close this before we try to process dependencies.\n Some disk backends do not handle gracefully multiple concurrent\n opens of the same device. /\n grub_file_close (file);\n\n mod = grub_dl_load_core (core, size);\n grub_free (core);\n if (! mod)\n return 0;\n\n mod->ref_count--;\n return mod;\n}\n\n/ Load a module using a symbolic name. /\n```\n\n### grub-core/kern/efi/efi.c\n\n#### grub_efi_get_variable_with_attributes() [lines 229-363]\n```c\n grub_efi_status_t status;\n grub_efi_uintn_t datasize = 0;\n grub_efi_runtime_services_t r;\n grub_efi_char16_t var16;\n void data;\n grub_size_t len, len16;\n\n datasize_out = 0;\n\n len = grub_strlen (var);\n len16 = len GRUB_MAX_UTF16_PER_UTF8;\n var16 = grub_malloc ((len16 + 1) * sizeof (var16[0]));\n if (!var16)\n return NULL;\n len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t ) var, len, NULL);\n var16[len16] = 0;\n\n r = grub_efi_system_table->runtime_services;\n\n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, NULL);\n\n if (status != GRUB_EFI_BUFFER_TOO_SMALL \|\| !datasize)\n {\n grub_free (var16);\n return NULL;\n }\n\n data = grub_malloc (datasize);\n if (!data)\n {\n grub_free (var16);\n return NULL;\n }\n\n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);\n grub_free (var16);\n\n if (status == GRUB_EFI_SUCCESS)\n {\n datasize_out = datasize;\n return data;\n }\n\n grub_free (data);\n return NULL;\n}\n\n#pragma GCC diagnostic ignored \"-Wcast-align\"\n\n/* Search the mods section from the PE32/PE32+ image. This code uses\n a PE32 header, but should work with PE32+ as well. /\ngrub_addr_t\ngrub_efi_modules_addr (void)\n{\n grub_efi_loaded_image_t image;\n struct grub_pe32_header header;\n struct grub_pe32_coff_header coff_header;\n struct grub_pe32_section_table sections;\n struct grub_pe32_section_table section;\n struct grub_module_info info;\n grub_uint16_t i;\n\n image = grub_efi_get_loaded_image (grub_efi_image_handle);\n if (! image)\n return 0;\n\n header = image->image_base;\n coff_header = &(header->coff_header);\n sections\n = (struct grub_pe32_section_table ) ((char ) coff_header\n\t\t\t\t\t + sizeof (coff_header)\n\t\t\t\t\t + coff_header->optional_header_size);\n\n for (i = 0, section = sections;\n i < coff_header->num_sections;\n i++, section++)\n {\n if (grub_strcmp (section->name, \"mods\") == 0)\n\tbreak;\n }\n\n if (i == coff_header->num_sections)\n return 0;\n\n info = (struct grub_module_info ) ((char ) image->image_base\n\t\t\t\t + section->virtual_address);\n if (info->magic != GRUB_MODULE_MAGIC)\n return 0;\n\n return (grub_addr_t) info;\n}\n\n#pragma GCC diagnostic error \"-Wcast-align\"\n\n/* ... 21 lines omitted ... /\n\t{\n\t grub_efi_uint16_t len;\n\t len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4)\n\t\t / sizeof (grub_efi_char16_t));\n\t filesize += GRUB_MAX_UTF8_PER_UTF16 len + 2;\n\t}\n\n dp = GRUB_EFI_NEXT_DEVICE_PATH (dp);\n }\n\n if (!filesize)\n return NULL;\n\n dp = dp0;\n\n p = name = grub_malloc (filesize);\n if (!name)\n return NULL;\n\n while (1)\n```\n\n### include/grub/efi/efi.h\n\n#### EXPORT_FUNC() [lines 42-122]\n```c\n\t\t\t\t grub_efi_uintn_t pages,\n\t\t\t\t\t grub_efi_allocate_type_t alloctype,\n\t\t\t\t\t grub_efi_memory_type_t memtype);\nvoid \nEXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages);\nvoid \nEXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);\nvoid EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages);\ngrub_efi_uintn_t EXPORT_FUNC(grub_efi_find_mmap_size) (void);\nint\nEXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t memory_map_size,\n\t\t\t\t grub_efi_memory_descriptor_t memory_map,\n\t\t\t\t grub_efi_uintn_t map_key,\n\t\t\t\t grub_efi_uintn_t descriptor_size,\n\t\t\t\t grub_efi_uint32_t descriptor_version);\nvoid grub_efi_memory_fini (void);\ngrub_efi_loaded_image_t EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);\nvoid EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t dp);\nchar EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t dp);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_get_device_path) (grub_efi_handle_t handle);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_find_last_device_path) (const grub_efi_device_path_t dp);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_duplicate_device_path) (const grub_efi_device_path_t dp);\ngrub_err_t EXPORT_FUNC (grub_efi_finish_boot_services) (grub_efi_uintn_t outbuf_size, void outbuf,\n\t\t\t\t\t\t\tgrub_efi_uintn_t map_key,\n\t\t\t\t\t\t\tgrub_efi_uintn_t efi_desc_size,\n\t\t\t\t\t\t\tgrub_efi_uint32_t efi_desc_version);\ngrub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memory_map_size,\n\t\t\t\t\t\t\t grub_efi_uintn_t descriptor_size,\n\t\t\t\t\t\t\t grub_efi_uint32_t descriptor_version,\n\t\t\t\t\t\t\t grub_efi_memory_descriptor_t virtual_map);\nvoid EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n\t\t\t\t\t const grub_efi_guid_t guid,\n\t\t\t\t\t grub_size_t datasize_out);\ngrub_err_t\nEXPORT_FUNC (grub_efi_set_variable) (const char var,\n\t\t\t\t const grub_efi_guid_t guid,\n\t\t\t\t void data,\n\t\t\t\t grub_size_t datasize);\nint\nEXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n\t\t\t\t\t const grub_efi_device_path_t dp2);\n\nextern void (EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, \n\t\t\t\t\t\tchar device,\n\t\t\t\t\t\tchar path);\n\n#if defined(__arm__) \|\| defined(__aarch64__) \|\| defined(__riscv)\nvoid EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);\ngrub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t );\n#include <grub/cpu/linux.h>\ngrub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header lh);\ngrub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,\n char args);\n#endif\n\ngrub_addr_t grub_efi_modules_addr (void);\n\nvoid grub_efi_mm_init (void);\nvoid grub_efi_mm_fini (void);\nvoid grub_efi_init (void);\nvoid grub_efi_fini (void);\nvoid grub_efi_set_prefix (void);\n\n/* Variables. /\nextern grub_efi_system_table_t EXPORT_VAR(grub_efi_system_table);\nextern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);\n\nextern int EXPORT_VAR(grub_efi_is_finished);\n\nstruct grub_net_card;\n\ngrub_efi_handle_t\ngrub_efinet_get_device_handle (struct grub_net_card card);\n\n#endif / ! GRUB_EFI_EFI_HEADER /\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 8dd3206f43e17e6aa7d5ce98c453c9ee471f830f Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Fri, 11 Dec 2020 23:01:59 +0800\nSubject: [PATCH 43/45] squash! Don't allow insmod when secure boot is enabled.\n\nUse grub_efi_get_secureboot to get secure boot status\n---\n grub-core/kern/dl.c \| 4 ++--\n grub-core/kern/efi/efi.c \| 28 ----------------------------\n include/grub/efi/efi.h \| 1 -\n 3 files changed, 2 insertions(+), 31 deletions(-)\n\ndiff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c\nindex e02f2afc5..93f08dfce 100644\n--- a/grub-core/kern/dl.c\n+++ b/grub-core/kern/dl.c\n@@ -39,7 +39,7 @@\n #endif\n \n #ifdef GRUB_MACHINE_EFI\n-#include <grub/efi/efi.h>\n+#include <grub/efi/sb.h>\n #endif\n \n \f\n@@ -702,7 +702,7 @@ grub_dl_load_file (const char filename)\n grub_boot_time (\"Loading module %s\", filename);\n \n #ifdef GRUB_MACHINE_EFI\n- if (grub_efi_secure_boot ())\n+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)\n {\n #if 0\n /* This is an error, but grub2-mkconfig still generates a pile of\ndiff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c\nindex 92e99b441..32f1b2ec7 100644\n--- a/grub-core/kern/efi/efi.c\n+++ b/grub-core/kern/efi/efi.c\n@@ -278,34 +278,6 @@ grub_efi_get_variable_with_attributes (const char var,\n return status;\n }\n \n-grub_efi_boolean_t\n-grub_efi_secure_boot (void)\n-{\n- grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n- grub_size_t datasize;\n- char secure_boot = NULL;\n- char setup_mode = NULL;\n- grub_efi_boolean_t ret = 0;\n-\n- secure_boot = grub_efi_get_variable(\"SecureBoot\", &efi_var_guid, &datasize);\n-\n- if (datasize != 1 \|\| !secure_boot)\n- goto out;\n-\n- setup_mode = grub_efi_get_variable(\"SetupMode\", &efi_var_guid, &datasize);\n-\n- if (datasize != 1 \|\| !setup_mode)\n- goto out;\n-\n- if (secure_boot && !setup_mode)\n- ret = 1;\n-\n- out:\n- grub_free (secure_boot);\n- grub_free (setup_mode);\n- return ret;\n-}\n-\n grub_efi_status_t\n grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n \t\t grub_size_t datasize_out, void *data_out)\ndiff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h\nindex 568d80030..08f6ee00a 100644\n--- a/include/grub/efi/efi.h\n+++ b/include/grub/efi/efi.h\n@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char var,\n \t\t\t\t const grub_efi_guid_t guid,\n \t\t\t\t void data,\n \t\t\t\t grub_size_t datasize);\n-grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);\n int\n EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n \t\t\t\t\t const grub_efi_device_path_t dp2);\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 8dd3206f43e17e6aa7d5ce98c453c9ee471f830f Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Fri, 11 Dec 2020 23:01:59 +0800\nSubject: [PATCH 43/45] squash! Don't allow insmod when secure boot is enabled.\n\nUse grub_efi_get_secureboot to get secure boot status\n---\n grub-core/kern/dl.c \| 4 ++--\n grub-core/kern/efi/efi.c \| 28 ----------------------------\n include/grub/efi/efi.h \| 1 -\n 3 files changed, 2 insertions(+), 31 deletions(-)\n\ndiff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c\nindex e02f2afc5..93f08dfce 100644\n--- a/grub-core/kern/dl.c\n+++ b/grub-core/kern/dl.c\n@@ -39,7 +39,7 @@\n #endif\n \n #ifdef GRUB_MACHINE_EFI\n-#include <grub/efi/efi.h>\n+#include <grub/efi/sb.h>\n #endif\n \n \f\n@@ -702,7 +702,7 @@ grub_dl_load_file (const char filename)\n grub_boot_time (\"Loading module %s\", filename);\n \n #ifdef GRUB_MACHINE_EFI\n- if (grub_efi_secure_boot ())\n+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED)\n {\n #if 0\n / This is an error, but grub2-mkconfig still generates a pile of\ndiff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c\nindex 92e99b441..32f1b2ec7 100644\n--- a/grub-core/kern/efi/efi.c\n+++ b/grub-core/kern/efi/efi.c\n@@ -278,34 +278,6 @@ grub_efi_get_variable_with_attributes (const char var,\n return status;\n }\n \n-grub_efi_boolean_t\n-grub_efi_secure_boot (void)\n-{\n- grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n- grub_size_t datasize;\n- char secure_boot = NULL;\n- char setup_mode = NULL;\n- grub_efi_boolean_t ret = 0;\n-\n- secure_boot = grub_efi_get_variable(\"SecureBoot\", &efi_var_guid, &datasize);\n-\n- if (datasize != 1 \|\| !secure_boot)\n- goto out;\n-\n- setup_mode = grub_efi_get_variable(\"SetupMode\", &efi_var_guid, &datasize);\n-\n- if (datasize != 1 \|\| !setup_mode)\n- goto out;\n-\n- if (secure_boot && !setup_mode)\n- ret = 1;\n-\n- out:\n- grub_free (secure_boot);\n- grub_free (setup_mode);\n- return ret;\n-}\n-\n grub_efi_status_t\n grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n \t\t grub_size_t datasize_out, void *data_out)\ndiff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h\nindex 568d80030..08f6ee00a 100644\n--- a/include/grub/efi/efi.h\n+++ b/include/grub/efi/efi.h\n@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char var,\n \t\t\t\t const grub_efi_guid_t guid,\n \t\t\t\t void data,\n \t\t\t\t grub_size_t datasize);\n-grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);\n int\n EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n \t\t\t\t\t const grub_efi_device_path_t dp2);\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0043-squash-Don-t-allow-insmod-when-secure-boot-is-enable.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0043-squash-Don-t-allow-insmod-when-secure-boot-is-enable.patch", "tier": "identical", "language": "c", "patch_lines_changed": 34, "patch_files_count": 3, "total_tokens_est": 1476, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nscript: Avoid a use-after-free when redefining a\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/script/execute.c\n- grub-core/script/function.c\n- grub-core/script/parser.y\n- include/grub/script_sh.h\n\n## Target Source Code\n\n### grub-core/script/execute.c\n\n#### grub_script_function_call() [lines 822-849]\n```c\n\n/* Execute a function call. /\ngrub_err_t\ngrub_script_function_call (grub_script_function_t func, int argc, char args)\n{\n grub_err_t ret = 0;\n unsigned long loops = active_loops;\n struct grub_script_scope old_scope;\n struct grub_script_scope new_scope;\n\n active_loops = 0;\n new_scope.flags = 0;\n new_scope.shifts = 0;\n new_scope.argv.argc = argc;\n new_scope.argv.args = args;\n\n old_scope = scope;\n scope = &new_scope;\n\n ret = grub_script_execute (func->func);\n\n function_return = 0;\n active_loops = loops;\n replace_scope (old_scope); /* free any scopes by setparams /\n return ret;\n}\n\n/ Helper for grub_script_execute_sourcecode. /\n```\n\n### grub-core/script/function.c\n\n#### grub_script_function_create() [lines 25-77]\n```c\ngrub_script_function_t grub_script_function_list;\n\ngrub_script_function_t\ngrub_script_function_create (struct grub_script_arg functionname_arg,\n\t\t\t struct grub_script cmd)\n{\n grub_script_function_t func;\n grub_script_function_t p;\n\n func = (grub_script_function_t) grub_malloc (sizeof (func));\n if (! func)\n return 0;\n\n func->name = grub_strdup (functionname_arg->str);\n if (! func->name)\n {\n grub_free (func);\n return 0;\n }\n\n func->func = cmd;\n\n / Keep the list sorted for simplicity. /\n p = &grub_script_function_list;\n while (p)\n {\n if (grub_strcmp ((p)->name, func->name) >= 0)\n\tbreak;\n\n p = &((p)->next);\n }\n\n /* If the function already exists, overwrite the old function. /\n if (p && grub_strcmp ((p)->name, func->name) == 0)\n {\n grub_script_function_t q;\n\n q = p;\n grub_script_free (q->func);\n q->func = cmd;\n grub_free (func);\n func = q;\n }\n else\n {\n func->next = p;\n p = func;\n }\n\n return func;\n}\n\nvoid\n```\n\n### include/grub/script_sh.h\n\n#### region() [lines 312-414]\n```c\nstruct grub_script_mem grub_script_mem_record (struct grub_parser_param state);\nstruct grub_script_mem grub_script_mem_record_stop (struct grub_parser_param state,\n\t\t\t\t\t\t struct grub_script_mem restore);\nvoid grub_script_malloc (struct grub_parser_param state, grub_size_t size);\n\n/ Functions used by bison. /\nunion YYSTYPE;\nint grub_script_yylex (union YYSTYPE , struct grub_parser_param );\nint grub_script_yyparse (struct grub_parser_param );\nvoid grub_script_yyerror (struct grub_parser_param , char const );\n\n/* Commands to execute, don't use these directly. /\ngrub_err_t grub_script_execute_cmdline (struct grub_script_cmd cmd);\ngrub_err_t grub_script_execute_cmdlist (struct grub_script_cmd cmd);\ngrub_err_t grub_script_execute_cmdif (struct grub_script_cmd cmd);\ngrub_err_t grub_script_execute_cmdfor (struct grub_script_cmd cmd);\ngrub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd cmd);\n\n/* Execute any GRUB pre-parsed command or script. /\ngrub_err_t grub_script_execute (struct grub_script script);\ngrub_err_t grub_script_execute_sourcecode (const char source);\ngrub_err_t grub_script_execute_new_scope (const char source, int argc, char *args);\n\n/ Break command for loops. /\ngrub_err_t grub_script_break (grub_command_t cmd, int argc, char argv[]);\n\n/* SHIFT command for GRUB script. /\ngrub_err_t grub_script_shift (grub_command_t cmd, int argc, char argv[]);\n\n/* SETPARAMS command for GRUB script functions. /\ngrub_err_t grub_script_setparams (grub_command_t cmd, int argc, char argv[]);\n\n/* RETURN command for functions. /\ngrub_err_t grub_script_return (grub_command_t cmd, int argc, char argv[]);\n\n/* This variable points to the parsed command. This is used to\n communicate with the bison code. /\nextern struct grub_script_cmd grub_script_parsed;\n\n\f\n\n/* The function description. /\nstruct grub_script_function\n{\n / The name. /\n char name;\n\n /* The script function. /\n struct grub_script func;\n\n /* The flags. /\n unsigned flags;\n\n / The next element. /\n struct grub_script_function next;\n\n int references;\n};\ntypedef struct grub_script_function grub_script_function_t;\n\nextern grub_script_function_t grub_script_function_list;\n\n#define FOR_SCRIPT_FUNCTIONS(var) for((var) = grub_script_function_list; \\\n\t\t\t\t (var); (var) = (var)->next)\n\ngrub_script_function_t grub_script_function_create (struct grub_script_arg functionname,\n\t\t\t\t\t\t struct grub_script cmd);\nvoid grub_script_function_remove (const char name);\ngrub_script_function_t grub_script_function_find (char functionname);\n\ngrub_err_t grub_script_function_call (grub_script_function_t func,\n\t\t\t\t int argc, char args);\n\nchar \ngrub_script_execute_arglist_to_argv (struct grub_script_arglist arglist, int count);\n\ngrub_err_t\ngrub_normal_parse_line (char line,\n\t\t\tgrub_reader_getline_t getline_func,\n\t\t\tvoid getline_func_data);\n\nstatic inline struct grub_script \ngrub_script_ref (struct grub_script script)\n{\n if (script)\n script->refcnt++;\n return script;\n}\n\nstatic inline void\ngrub_script_unref (struct grub_script script)\n{\n if (! script)\n return;\n\n if (sc\n/* ... truncated ... /\n```\n\n\n## Upstream Fix\n```diff\nFrom 809f3a26897f5f648325c5741e72dc1b3db828ee Mon Sep 17 00:00:00 2001\nFrom: Chris Coulson <chris.coulson@canonical.com>\nDate: Fri, 10 Jul 2020 14:41:45 +0100\nSubject: [PATCH 19/27] script: Avoid a use-after-free when redefining a\n function during execution\n\nDefining a new function with the same name as a previously defined\nfunction causes the grub_script and associated resources for the\nprevious function to be freed. If the previous function is currently\nexecuting when a function with the same name is defined, this results\nin use-after-frees when processing subsequent commands in the original\nfunction.\n\nInstead, reject a new function definition if it has the same name as\na previously defined function, and that function is currently being\nexecuted. Although a behavioural change, this should be backwards\ncompatible with existing configurations because they can't be\ndependent on the current behaviour without being broken.\n\nSigned-off-by: Chris Coulson <chris.coulson@canonical.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/script/execute.c \| 2 ++\n grub-core/script/function.c \| 16 +++++++++++++---\n grub-core/script/parser.y \| 3 ++-\n include/grub/script_sh.h \| 2 ++\n 4 files changed, 19 insertions(+), 4 deletions(-)\n\ndiff --git a/grub-core/script/execute.c b/grub-core/script/execute.c\nindex 8a9161cc8..ce83edd4b 100644\n--- a/grub-core/script/execute.c\n+++ b/grub-core/script/execute.c\n@@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char args)\n old_scope = scope;\n scope = &new_scope;\n \n+ func->executing++;\n ret = grub_script_execute (func->func);\n+ func->executing--;\n \n function_return = 0;\n active_loops = loops;\ndiff --git a/grub-core/script/function.c b/grub-core/script/function.c\nindex d36655e51..3aad04bf9 100644\n--- a/grub-core/script/function.c\n+++ b/grub-core/script/function.c\n@@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg functionname_arg,\n func = (grub_script_function_t) grub_malloc (sizeof (func));\n if (! func)\n return 0;\n+ func->executing = 0;\n \n func->name = grub_strdup (functionname_arg->str);\n if (! func->name)\n@@ -60,10 +61,19 @@ grub_script_function_create (struct grub_script_arg functionname_arg,\n grub_script_function_t q;\n \n q = p;\n- grub_script_free (q->func);\n- q->func = cmd;\n grub_free (func);\n- func = q;\n+ if (q->executing > 0)\n+ {\n+ grub_error (GRUB_ERR_BAD_ARGUMENT,\n+\t\t N_(\"attempt to redefine a function being executed\"));\n+ func = NULL;\n+ }\n+ else\n+ {\n+ grub_script_free (q->func);\n+ q->func = cmd;\n+ func = q;\n+ }\n }\n else\n {\ndiff --git a/grub-core/script/parser.y b/grub-core/script/parser.y\nindex 4f0ab8319..f80b86b6f 100644\n--- a/grub-core/script/parser.y\n+++ b/grub-core/script/parser.y\n@@ -289,7 +289,8 @@ function: \"function\" \"name\"\n \t grub_script_mem_free (state->func_mem);\n \t else {\n \t script->children = state->scripts;\n-\t grub_script_function_create ($2, script);\n+\t if (!grub_script_function_create ($2, script))\n+\t\tgrub_script_free (script);\n \t }\n \n \t state->scripts = $<scripts>3;\ndiff --git a/include/grub/script_sh.h b/include/grub/script_sh.h\nindex b382bcf09..6c48e0751 100644\n--- a/include/grub/script_sh.h\n+++ b/include/grub/script_sh.h\n@@ -361,6 +361,8 @@ struct grub_script_function\n \n / The next element. /\n struct grub_script_function next;\n+\n+ unsigned executing;\n };\n typedef struct grub_script_function grub_script_function_t;\n \n-- \n2.27.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 809f3a26897f5f648325c5741e72dc1b3db828ee Mon Sep 17 00:00:00 2001\nFrom: Chris Coulson <chris.coulson@canonical.com>\nDate: Fri, 10 Jul 2020 14:41:45 +0100\nSubject: [PATCH 19/27] script: Avoid a use-after-free when redefining a\n function during execution\n\nDefining a new function with the same name as a previously defined\nfunction causes the grub_script and associated resources for the\nprevious function to be freed. If the previous function is currently\nexecuting when a function with the same name is defined, this results\nin use-after-frees when processing subsequent commands in the original\nfunction.\n\nInstead, reject a new function definition if it has the same name as\na previously defined function, and that function is currently being\nexecuted. Although a behavioural change, this should be backwards\ncompatible with existing configurations because they can't be\ndependent on the current behaviour without being broken.\n\nSigned-off-by: Chris Coulson <chris.coulson@canonical.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/script/execute.c \| 2 ++\n grub-core/script/function.c \| 16 +++++++++++++---\n grub-core/script/parser.y \| 3 ++-\n include/grub/script_sh.h \| 2 ++\n 4 files changed, 19 insertions(+), 4 deletions(-)\n\ndiff --git a/grub-core/script/execute.c b/grub-core/script/execute.c\nindex 8a9161cc8..ce83edd4b 100644\n--- a/grub-core/script/execute.c\n+++ b/grub-core/script/execute.c\n@@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char args)\n old_scope = scope;\n scope = &new_scope;\n \n+ func->executing++;\n ret = grub_script_execute (func->func);\n+ func->executing--;\n \n function_return = 0;\n active_loops = loops;\ndiff --git a/grub-core/script/function.c b/grub-core/script/function.c\nindex d36655e51..3aad04bf9 100644\n--- a/grub-core/script/function.c\n+++ b/grub-core/script/function.c\n@@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg functionname_arg,\n func = (grub_script_function_t) grub_malloc (sizeof (func));\n if (! func)\n return 0;\n+ func->executing = 0;\n \n func->name = grub_strdup (functionname_arg->str);\n if (! func->name)\n@@ -60,10 +61,19 @@ grub_script_function_create (struct grub_script_arg functionname_arg,\n grub_script_function_t q;\n \n q = p;\n- grub_script_free (q->func);\n- q->func = cmd;\n grub_free (func);\n- func = q;\n+ if (q->executing > 0)\n+ {\n+ grub_error (GRUB_ERR_BAD_ARGUMENT,\n+\t\t N_(\"attempt to redefine a function being executed\"));\n+ func = NULL;\n+ }\n+ else\n+ {\n+ grub_script_free (q->func);\n+ q->func = cmd;\n+ func = q;\n+ }\n }\n else\n {\ndiff --git a/grub-core/script/parser.y b/grub-core/script/parser.y\nindex 4f0ab8319..f80b86b6f 100644\n--- a/grub-core/script/parser.y\n+++ b/grub-core/script/parser.y\n@@ -289,7 +289,8 @@ function: \"function\" \"name\"\n \t grub_script_mem_free (state->func_mem);\n \t else {\n \t script->children = state->scripts;\n-\t grub_script_function_create ($2, script);\n+\t if (!grub_script_function_create ($2, script))\n+\t\tgrub_script_free (script);\n \t }\n \n \t state->scripts = $<scripts>3;\ndiff --git a/include/grub/script_sh.h b/include/grub/script_sh.h\nindex b382bcf09..6c48e0751 100644\n--- a/include/grub/script_sh.h\n+++ b/include/grub/script_sh.h\n@@ -361,6 +361,8 @@ struct grub_script_function\n \n / The next element. /\n struct grub_script_function next;\n+\n+ unsigned executing;\n };\n typedef struct grub_script_function *grub_script_function_t;\n \n-- \n2.27.0\n\n" } ]	{ "id": "grub2-15947-0009-script-Avoid-a-use-after-free-when-redefining-a-func.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0009-script-Avoid-a-use-after-free-when-redefining-a-func.patch", "tier": "identical", "language": "c", "patch_lines_changed": 24, "patch_files_count": 4, "total_tokens_est": 1983, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nkern/parser: Fix a memory leak\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/kern/parser.c\n\n## Target Source Code\n\n### grub-core/kern/parser.c\n\n#### grub_parser_split_cmdline() [lines 130-237]\n```c\n}\n\ngrub_err_t\ngrub_parser_split_cmdline (const char cmdline,\n\t\t\t grub_reader_getline_t getline, void getline_data,\n\t\t\t int argc, char *argv)\n{\n grub_parser_state_t state = GRUB_PARSER_STATE_TEXT;\n / XXX: Fixed size buffer, perhaps this buffer should be dynamically\n allocated. /\n char buffer[1024];\n char bp = buffer;\n char rd = (char ) cmdline;\n char varname[200];\n char vp = varname;\n char args;\n int i;\n\n argc = 0;\n do\n {\n if (!rd \|\| !rd)\n\t{\n\t if (getline)\n\t getline (&rd, 1, getline_data);\n\t else\n\t break;\n\t}\n\n if (!rd)\n\tbreak;\n\n for (; rd; rd++)\n\t{\n\t grub_parser_state_t newstate;\n\t char use;\n\n\t newstate = grub_parser_cmdline_state (state, rd, &use);\n\n\t /* If a variable was being processed and this character does\n\t not describe the variable anymore, write the variable to\n\t the buffer. /\n\t add_var (varname, &bp, &vp, state, newstate);\n\n\t if (check_varstate (newstate))\n\t {\n\t if (use)\n\t\t(vp++) = use;\n\t }\n\t else\n\t {\n\t if (newstate == GRUB_PARSER_STATE_TEXT\n\t\t && state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n\t\t{\n\t\t /* Don't add more than one argument if multiple\n\t\t spaces are used. /\n\t\t if (bp != buffer && (bp - 1))\n\t\t {\n\t\t (bp++) = '\\0';\n\t\t (argc)++;\n\t\t }\n\t\t}\n\t else if (use)\n\t\t(bp++) = use;\n\t }\n\t state = newstate;\n\t}\n }\n while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));\n\n / A special case for when the last character was part of a\n variable. /\n add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);\n\n if (bp != buffer && (bp - 1))\n {\n (bp++) = '\\0';\n (argc)++;\n }\n\n /* Reserve memory for the return values. /\n args = grub_malloc (bp - buffer);\n if (!args)\n return grub_errno;\n grub_memcpy (args, buffer, bp - buffer);\n\n argv = grub_malloc (sizeof (char ) (argc + 1));\n if (!argv)\n {\n grub_free (args);\n return grub_errno;\n }\n\n /* The arguments are separated with 0's, setup argv so it points to\n the right values. /\n bp = args;\n for (i = 0; i < argc; i++)\n {\n (argv)[i] = bp;\n while (bp)\n\tbp++;\n bp++;\n }\n\n return 0;\n}\n\n/* Helper for grub_parser_execute. /\n```\n\n\n## Upstream Fix\n```diff\nFrom 808a80c385ad7519b49616ae4f6b0961f64217da Mon Sep 17 00:00:00 2001\nFrom: Chris Coulson <chris.coulson@canonical.com>\nDate: Wed, 18 Nov 2020 00:59:24 +0000\nSubject: [PATCH 25/45] kern/parser: Fix a memory leak\n\nThe getline() function supplied to grub_parser_split_cmdline() returns\na newly allocated buffer and can be called multiple times, but the\nreturned buffer is never freed.\n\nSigned-off-by: Chris Coulson <chris.coulson@canonical.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/kern/parser.c \| 20 ++++++++++++++++----\n 1 file changed, 16 insertions(+), 4 deletions(-)\n\ndiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c\nindex d1cf061ad..39e4df65b 100644\n--- a/grub-core/kern/parser.c\n+++ b/grub-core/kern/parser.c\n@@ -140,6 +140,7 @@ grub_parser_split_cmdline (const char cmdline,\n char buffer[1024];\n char bp = buffer;\n char rd = (char ) cmdline;\n+ char rp = rd;\n char varname[200];\n char vp = varname;\n char args;\n@@ -149,10 +150,18 @@ grub_parser_split_cmdline (const char cmdline,\n argv = NULL;\n do\n {\n- if (!rd \|\| !rd)\n+ if (rp == NULL \|\| rp == '\\0')\n \t{\n+\t if (rd != cmdline)\n+\t {\n+\t grub_free (rd);\n+\t rd = rp = NULL;\n+\t }\n \t if (getline)\n-\t getline (&rd, 1, getline_data);\n+\t {\n+\t getline (&rd, 1, getline_data);\n+\t rp = rd;\n+\t }\n \t else\n \t break;\n \t}\n@@ -160,12 +169,12 @@ grub_parser_split_cmdline (const char cmdline,\n if (!rd)\n \tbreak;\n \n- for (; rd; rd++)\n+ for (; rp != '\\0'; rp++)\n \t{\n \t grub_parser_state_t newstate;\n \t char use;\n \n-\t newstate = grub_parser_cmdline_state (state, rd, &use);\n+\t newstate = grub_parser_cmdline_state (state, rp, &use);\n \n \t / If a variable was being processed and this character does\n \t not describe the variable anymore, write the variable to\n@@ -198,6 +207,9 @@ grub_parser_split_cmdline (const char cmdline,\n }\n while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));\n \n+ if (rd != cmdline)\n+ grub_free (rd);\n+\n / A special case for when the last character was part of a\n variable. /\n add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 808a80c385ad7519b49616ae4f6b0961f64217da Mon Sep 17 00:00:00 2001\nFrom: Chris Coulson <chris.coulson@canonical.com>\nDate: Wed, 18 Nov 2020 00:59:24 +0000\nSubject: [PATCH 25/45] kern/parser: Fix a memory leak\n\nThe getline() function supplied to grub_parser_split_cmdline() returns\na newly allocated buffer and can be called multiple times, but the\nreturned buffer is never freed.\n\nSigned-off-by: Chris Coulson <chris.coulson@canonical.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/kern/parser.c \| 20 ++++++++++++++++----\n 1 file changed, 16 insertions(+), 4 deletions(-)\n\ndiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c\nindex d1cf061ad..39e4df65b 100644\n--- a/grub-core/kern/parser.c\n+++ b/grub-core/kern/parser.c\n@@ -140,6 +140,7 @@ grub_parser_split_cmdline (const char cmdline,\n char buffer[1024];\n char bp = buffer;\n char rd = (char ) cmdline;\n+ char rp = rd;\n char varname[200];\n char vp = varname;\n char args;\n@@ -149,10 +150,18 @@ grub_parser_split_cmdline (const char cmdline,\n argv = NULL;\n do\n {\n- if (!rd \|\| !rd)\n+ if (rp == NULL \|\| rp == '\\0')\n \t{\n+\t if (rd != cmdline)\n+\t {\n+\t grub_free (rd);\n+\t rd = rp = NULL;\n+\t }\n \t if (getline)\n-\t getline (&rd, 1, getline_data);\n+\t {\n+\t getline (&rd, 1, getline_data);\n+\t rp = rd;\n+\t }\n \t else\n \t break;\n \t}\n@@ -160,12 +169,12 @@ grub_parser_split_cmdline (const char cmdline,\n if (!rd)\n \tbreak;\n \n- for (; rd; rd++)\n+ for (; rp != '\\0'; rp++)\n \t{\n \t grub_parser_state_t newstate;\n \t char use;\n \n-\t newstate = grub_parser_cmdline_state (state, rd, &use);\n+\t newstate = grub_parser_cmdline_state (state, rp, &use);\n \n \t / If a variable was being processed and this character does\n \t not describe the variable anymore, write the variable to\n@@ -198,6 +207,9 @@ grub_parser_split_cmdline (const char cmdline,\n }\n while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));\n \n+ if (rd != cmdline)\n+ grub_free (rd);\n+\n / A special case for when the last character was part of a\n variable. */\n add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0025-kern-parser-Fix-a-memory-leak.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0025-kern-parser-Fix-a-memory-leak.patch", "tier": "identical", "language": "c", "patch_lines_changed": 21, "patch_files_count": 1, "total_tokens_est": 1247, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nefi: Only register shim_lock verifier if shim_lock\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/commands/efi/shim_lock.c\n\n## Target Source Code\n\n### grub-core/commands/efi/shim_lock.c\n\n#### region() [lines 1-77]\n```c\n/\n GRUB -- GRand Unified Bootloader\n * Copyright (C) 2017 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n \n EFI shim lock verifier.\n /\n\n#include <grub/dl.h>\n#include <grub/efi/efi.h>\n#include <grub/err.h>\n#include <grub/file.h>\n#include <grub/misc.h>\n#include <grub/verify.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\n#define GRUB_EFI_SHIM_LOCK_GUID \\\n { 0x605dab50, 0xe046, 0x4300, \\\n { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n }\n\nstruct grub_efi_shim_lock_protocol\n{\n grub_efi_status_t\n (verify) (void buffer, grub_uint32_t size);\n};\ntypedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n\nstatic grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\nstatic grub_efi_shim_lock_protocol_t sl;\n\n/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. /\nstatic const char const disabled_mods[] = {\"iorw\", \"memrw\", \"wrmsr\", NULL};\n\nstatic grub_err_t\nshim_lock_init (grub_file_t io, enum grub_file_type type,\n\t\tvoid *context __attribute__ ((unused)),\n\t\tenum grub_verify_flags flags)\n{\n const char b, e;\n int i;\n\n flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;\n\n if (!sl)\n return GRUB_ERR_NONE;\n\n switch (type & GRUB_FILE_TYPE_MASK)\n {\n case GRUB_FILE_TYPE_GRUB_MODULE:\n / Establish GRUB module name. /\n b = grub_strrchr (io->name, '/');\n e = grub_strrchr (io->name, '.');\n\n b = b ? (b + 1) : io->name;\n e = e ? e : io->name + grub_strlen (io->name);\n e = (e > b) ? e : io->name + grub_strlen (io->name);\n\n for (i = 0; disabled_mods[i]; i++)\n\tif (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e)))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"module cannot be loaded in UEFI secure boot mode: %s\"),\n\t\t\tio->name);\n```\n\n#### region() [lines 1-86]\n```c\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2017 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n \n EFI shim lock verifier.\n /\n\n#include <grub/dl.h>\n#include <grub/efi/efi.h>\n#include <grub/err.h>\n#include <grub/file.h>\n#include <grub/misc.h>\n#include <grub/verify.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\n#define GRUB_EFI_SHIM_LOCK_GUID \\\n { 0x605dab50, 0xe046, 0x4300, \\\n { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n }\n\nstruct grub_efi_shim_lock_protocol\n{\n grub_efi_status_t\n (verify) (void buffer, grub_uint32_t size);\n};\ntypedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n\nstatic grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\nstatic grub_efi_shim_lock_protocol_t sl;\n\n/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. /\nstatic const char const disabled_mods[] = {\"iorw\", \"memrw\", \"wrmsr\", NULL};\n\nstatic grub_err_t\nshim_lock_init (grub_file_t io, enum grub_file_type type,\n\t\tvoid *context __attribute__ ((unused)),\n\t\tenum grub_verify_flags flags)\n{\n const char b, e;\n int i;\n\n flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;\n\n if (!sl)\n return GRUB_ERR_NONE;\n\n switch (type & GRUB_FILE_TYPE_MASK)\n {\n case GRUB_FILE_TYPE_GRUB_MODULE:\n / Establish GRUB module name. /\n b = grub_strrchr (io->name, '/');\n e = grub_strrchr (io->name, '.');\n\n b = b ? (b + 1) : io->name;\n e = e ? e : io->name + grub_strlen (io->name);\n e = (e > b) ? e : io->name + grub_strlen (io->name);\n\n for (i = 0; disabled_mods[i]; i++)\n\tif (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e)))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"module cannot be loaded in UEFI secure boot mode: %s\"),\n\t\t\tio->name);\n\t return GRUB_ERR_ACCESS_DENIED;\n\t }\n\n / Fall through. /\n\n case GRUB_FILE_TYPE_ACPI_TABLE:\n case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:\n flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;\n\n```\n\n#### shim_lock_init() [lines 46-112]\n```c\nstatic const char * const disabled_mods[] = {\"iorw\", \"memrw\", \"wrmsr\", NULL};\n\nstatic grub_err_t\nshim_lock_init (grub_file_t io, enum grub_file_type type,\n\t\tvoid *context __attribute__ ((unused)),\n\t\tenum grub_verify_flags flags)\n{\n const char b, e;\n int i;\n\n flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;\n\n if (!sl)\n return GRUB_ERR_NONE;\n\n switch (type & GRUB_FILE_TYPE_MASK)\n {\n case GRUB_FILE_TYPE_GRUB_MODULE:\n / Establish GRUB module name. /\n b = grub_strrchr (io->name, '/');\n e = grub_strrchr (io->name, '.');\n\n b = b ? (b + 1) : io->name;\n e = e ? e : io->name + grub_strlen (io->name);\n e = (e > b) ? e : io->name + grub_strlen (io->name);\n\n for (i = 0; disabled_mods[i]; i++)\n\tif (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e)))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"module cannot be loaded in UEFI secure boot mode: %s\"),\n\t\t\tio->name);\n\t return GRUB_ERR_ACCESS_DENIED;\n\t }\n\n / Fall through. /\n\n case GRUB_FILE_TYPE_ACPI_TABLE:\n case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:\n flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;\n\n return GRUB_ERR_NONE;\n\n case GRUB_FILE_TYPE_LINUX_KERNEL:\n case GRUB_FILE_TYPE_MULTIBOOT_KERNEL:\n case GRUB_FILE_TYPE_BSD_KERNEL:\n case GRUB_FILE_TYPE_XNU_KERNEL:\n case GRUB_FILE_TYPE_PLAN9_KERNEL:\n for (i = 0; disabled_mods[i]; i++)\n\tif (grub_dl_get (disabled_mods[i]))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"cannot boot due to dangerous module in memory: %s\"),\n\t\t\tdisabled_mods[i]);\n\t return GRUB_ERR_ACCESS_DENIED;\n\t }\n\n flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK;\n\n / Fall through. /\n\n default:\n return GRUB_ERR_NONE;\n }\n}\n\nstatic grub_err_t\n```\n\n#### region() [lines 66-143]\n```c\n e = grub_strrchr (io->name, '.');\n\n b = b ? (b + 1) : io->name;\n e = e ? e : io->name + grub_strlen (io->name);\n e = (e > b) ? e : io->name + grub_strlen (io->name);\n\n for (i = 0; disabled_mods[i]; i++)\n\tif (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e)))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"module cannot be loaded in UEFI secure boot mode: %s\"),\n\t\t\tio->name);\n\t return GRUB_ERR_ACCESS_DENIED;\n\t }\n\n / Fall through. /\n\n case GRUB_FILE_TYPE_ACPI_TABLE:\n case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:\n flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;\n\n return GRUB_ERR_NONE;\n\n case GRUB_FILE_TYPE_LINUX_KERNEL:\n case GRUB_FILE_TYPE_MULTIBOOT_KERNEL:\n case GRUB_FILE_TYPE_BSD_KERNEL:\n case GRUB_FILE_TYPE_XNU_KERNEL:\n case GRUB_FILE_TYPE_PLAN9_KERNEL:\n for (i = 0; disabled_mods[i]; i++)\n\tif (grub_dl_get (disabled_mods[i]))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"cannot boot due to dangerous module in memory: %s\"),\n\t\t\tdisabled_mods[i]);\n\t return GRUB_ERR_ACCESS_DENIED;\n\t }\n\n flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK;\n\n / Fall through. /\n\n default:\n return GRUB_ERR_NONE;\n }\n}\n\nstatic grub_err_t\nshim_lock_write (void context __attribute__ ((unused)), void buf, grub_size_t size)\n{\n if (sl->verify (buf, size) != GRUB_EFI_SUCCESS)\n return grub_error (GRUB_ERR_BAD_SIGNATURE, N_(\"bad shim signature\"));\n\n return GRUB_ERR_NONE;\n}\n\nstruct grub_file_verifier shim_lock =\n {\n .name = \"shim_lock\",\n .init = shim_lock_init,\n .write = shim_lock_write\n };\n\nGRUB_MOD_INIT(shim_lock)\n{\n sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n grub_verifier_register (&shim_lock);\n\n if (!sl)\n return;\n\n grub_dl_set_persistent (mod);\n}\n\nGRUB_MOD_FINI(shim_lock)\n{\n grub_verifier_unregister (&shim_lock);\n}\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 8df2ccf8a380be374c7d17af8dc162518f3d989a Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Thu, 3 Dec 2020 16:01:49 +0100\nSubject: [PATCH 06/45] efi: Only register shim_lock verifier if shim_lock\n protocol is found and SB enabled\n\nThe shim_lock module registers a verifier to call shim's verify, but the\nhandler is registered even when the shim_lock protocol was not installed.\n\nThis doesn't cause a NULL pointer dereference in shim_lock_write() because\nthe shim_lock_init() function just returns GRUB_ERR_NONE if sl isn't set.\n\nBut in that case there's no point to even register the shim_lock verifier\nsince won't do anything. Additionally, it is only useful when Secure Boot\nis enabled.\n\nFinally, don't assume that the shim_lock protocol will always be present\nwhen the shim_lock_write() function is called, and check for it on every\ncall to this function.\n\nReported-by: Michael Chang <mchang@suse.com>\nReported-by: Peter Jones <pjones@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/efi/shim_lock.c \| 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c\nindex d8f52d721..f7f3109d6 100644\n--- a/grub-core/commands/efi/shim_lock.c\n+++ b/grub-core/commands/efi/shim_lock.c\n@@ -20,6 +20,7 @@\n \n #include <grub/dl.h>\n #include <grub/efi/efi.h>\n+#include <grub/efi/sb.h>\n #include <grub/err.h>\n #include <grub/file.h>\n #include <grub/misc.h>\n@@ -28,7 +29,6 @@\n GRUB_MOD_LICENSE (\"GPLv3+\");\n \n static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\n-static grub_efi_shim_lock_protocol_t sl;\n \n /* List of modules which cannot be loaded if UEFI secure boot mode is enabled. /\n static const char const disabled_mods[] = {\"iorw\", \"memrw\", \"wrmsr\", NULL};\n@@ -43,9 +43,6 @@ shim_lock_init (grub_file_t io, enum grub_file_type type,\n \n flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;\n \n- if (!sl)\n- return GRUB_ERR_NONE;\n-\n switch (type & GRUB_FILE_TYPE_MASK)\n {\n case GRUB_FILE_TYPE_GRUB_MODULE:\n@@ -100,6 +97,11 @@ shim_lock_init (grub_file_t io, enum grub_file_type type,\n static grub_err_t\n shim_lock_write (void context __attribute__ ((unused)), void buf, grub_size_t size)\n {\n+ grub_efi_shim_lock_protocol_t sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n+\n+ if (sl == NULL)\n+ return grub_error (GRUB_ERR_ACCESS_DENIED, N_(\"shim_lock protocol not found\"));\n+\n if (sl->verify (buf, size) != GRUB_EFI_SUCCESS)\n return grub_error (GRUB_ERR_BAD_SIGNATURE, N_(\"bad shim signature\"));\n \n@@ -115,12 +117,13 @@ struct grub_file_verifier shim_lock =\n \n GRUB_MOD_INIT(shim_lock)\n {\n- sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n- grub_verifier_register (&shim_lock);\n+ grub_efi_shim_lock_protocol_t sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n \n- if (!sl)\n+ if (sl == NULL \|\| grub_efi_get_secureboot () != GRUB_EFI_SECUREBOOT_MODE_ENABLED)\n return;\n \n+ grub_verifier_register (&shim_lock);\n+\n grub_dl_set_persistent (mod);\n }\n \n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 8df2ccf8a380be374c7d17af8dc162518f3d989a Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Thu, 3 Dec 2020 16:01:49 +0100\nSubject: [PATCH 06/45] efi: Only register shim_lock verifier if shim_lock\n protocol is found and SB enabled\n\nThe shim_lock module registers a verifier to call shim's verify, but the\nhandler is registered even when the shim_lock protocol was not installed.\n\nThis doesn't cause a NULL pointer dereference in shim_lock_write() because\nthe shim_lock_init() function just returns GRUB_ERR_NONE if sl isn't set.\n\nBut in that case there's no point to even register the shim_lock verifier\nsince won't do anything. Additionally, it is only useful when Secure Boot\nis enabled.\n\nFinally, don't assume that the shim_lock protocol will always be present\nwhen the shim_lock_write() function is called, and check for it on every\ncall to this function.\n\nReported-by: Michael Chang <mchang@suse.com>\nReported-by: Peter Jones <pjones@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/efi/shim_lock.c \| 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c\nindex d8f52d721..f7f3109d6 100644\n--- a/grub-core/commands/efi/shim_lock.c\n+++ b/grub-core/commands/efi/shim_lock.c\n@@ -20,6 +20,7 @@\n \n #include <grub/dl.h>\n #include <grub/efi/efi.h>\n+#include <grub/efi/sb.h>\n #include <grub/err.h>\n #include <grub/file.h>\n #include <grub/misc.h>\n@@ -28,7 +29,6 @@\n GRUB_MOD_LICENSE (\"GPLv3+\");\n \n static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\n-static grub_efi_shim_lock_protocol_t sl;\n \n /* List of modules which cannot be loaded if UEFI secure boot mode is enabled. /\n static const char const disabled_mods[] = {\"iorw\", \"memrw\", \"wrmsr\", NULL};\n@@ -43,9 +43,6 @@ shim_lock_init (grub_file_t io, enum grub_file_type type,\n \n flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;\n \n- if (!sl)\n- return GRUB_ERR_NONE;\n-\n switch (type & GRUB_FILE_TYPE_MASK)\n {\n case GRUB_FILE_TYPE_GRUB_MODULE:\n@@ -100,6 +97,11 @@ shim_lock_init (grub_file_t io, enum grub_file_type type,\n static grub_err_t\n shim_lock_write (void context __attribute__ ((unused)), void buf, grub_size_t size)\n {\n+ grub_efi_shim_lock_protocol_t sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n+\n+ if (sl == NULL)\n+ return grub_error (GRUB_ERR_ACCESS_DENIED, N_(\"shim_lock protocol not found\"));\n+\n if (sl->verify (buf, size) != GRUB_EFI_SUCCESS)\n return grub_error (GRUB_ERR_BAD_SIGNATURE, N_(\"bad shim signature\"));\n \n@@ -115,12 +117,13 @@ struct grub_file_verifier shim_lock =\n \n GRUB_MOD_INIT(shim_lock)\n {\n- sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n- grub_verifier_register (&shim_lock);\n+ grub_efi_shim_lock_protocol_t *sl = grub_efi_locate_protocol (&shim_lock_guid, 0);\n \n- if (!sl)\n+ if (sl == NULL \|\| grub_efi_get_secureboot () != GRUB_EFI_SECUREBOOT_MODE_ENABLED)\n return;\n \n+ grub_verifier_register (&shim_lock);\n+\n grub_dl_set_persistent (mod);\n }\n \n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0006-efi-Only-register-shim_lock-verifier-if-shim_lock-pr.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0006-efi-Only-register-shim_lock-verifier-if-shim_lock-pr.patch", "tier": "identical", "language": "c", "patch_lines_changed": 18, "patch_files_count": 1, "total_tokens_est": 1727, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\n===================================================================\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.02~beta3/grub-core/fs/btrfs.c\n\n## Target Source Code\n\n### grub-core/fs/btrfs.c\n\n#### lookup_root_by_name() [lines 849-1154]\n```c\ngrub_btrfs_read_logical (struct grub_btrfs_data data, grub_disk_addr_t addr,\n\t\t\t void buf, grub_size_t size, int recursion_depth)\n{\n while (size > 0)\n {\n grub_uint8_t ptr;\n struct grub_btrfs_key key;\n struct grub_btrfs_chunk_item chunk;\n grub_uint64_t csize;\n grub_err_t err = 0;\n struct grub_btrfs_key key_out;\n int challoc = 0;\n struct grub_btrfs_key key_in;\n grub_size_t chsize;\n grub_disk_addr_t chaddr;\n\n grub_dprintf (\"btrfs\", \"searching for laddr %\" PRIxGRUB_UINT64_T \"\\n\",\n\t\t addr);\n for (ptr = data->sblock.bootstrap_mapping;\n\t ptr < data->sblock.bootstrap_mapping\n\t + sizeof (data->sblock.bootstrap_mapping)\n\t - sizeof (struct grub_btrfs_key);)\n\t{\n\t key = (struct grub_btrfs_key ) ptr;\n\t if (key->type != GRUB_BTRFS_ITEM_TYPE_CHUNK)\n\t break;\n\t chunk = (struct grub_btrfs_chunk_item ) (key + 1);\n\t grub_dprintf (\"btrfs\",\n\t\t\t\"%\" PRIxGRUB_UINT64_T \" %\" PRIxGRUB_UINT64_T \" \\n\",\n\t\t\tgrub_le_to_cpu64 (key->offset),\n\t\t\tgrub_le_to_cpu64 (chunk->size));\n\t if (grub_le_to_cpu64 (key->offset) <= addr\n\t && addr < grub_le_to_cpu64 (key->offset)\n\t + grub_le_to_cpu64 (chunk->size))\n\t goto chunk_found;\n\t ptr += sizeof (key) + sizeof (chunk)\n\t + sizeof (struct grub_btrfs_chunk_stripe)\n\t grub_le_to_cpu16 (chunk->nstripes);\n\t}\n\n/* ... 27 lines omitted ... /\n chunk_found:\n {\n\tgrub_uint64_t stripen;\n\tgrub_uint64_t stripe_offset;\n\tgrub_uint64_t off = addr - grub_le_to_cpu64 (key->offset);\n\tgrub_uint64_t chunk_stripe_length;\n\tgrub_uint16_t nstripes;\n\tunsigned redundancy = 1;\n\tunsigned i, j;\n\tint is_raid56;\n\tgrub_uint64_t parities_pos = 0;\n\n is_raid56 = !!(grub_le_to_cpu64 (chunk->type) &\n\t\t (GRUB_BTRFS_CHUNK_TYPE_RAID5 \|\n\t\t GRUB_BTRFS_CHUNK_TYPE_RAID6));\n\n\tif (grub_le_to_cpu64 (chunk->size) <= off)\n\t {\n\t grub_dprintf (\"btrfs\", \"no chunk\\n\");\n\t return grub_error (GRUB_ERR_BAD_FS,\n\t\t\t \"couldn't find the chunk descriptor\");\n\t }\n\n\tnstripes = grub_le_to_cpu16 (chunk->nstripes) ? : 1;\n\tchunk_stripe_length = grub_le_to_cpu64 (chunk->stripe_length) ? : 512;\n\tgrub_dprintf (\"btrfs\", \"chunk 0x%\" PRIxGRUB_UINT64_T\n\t\t \"+0x%\" PRIxGRUB_UINT64_T\n\t\t \" (%d stripes (%d substripes) of %\"\n\t\t PRIxGRUB_UINT64_T \")\\n\",\n\t\t grub_le_to_cpu64 (key->offset),\n/ ... 189 lines omitted ... /\n\t\t\t\t\t i, / redundancy /\n\t\t\t\t\t csize, buf);\n\t\t if (!err)\n\t\t break;\n\t\t grub_errno = GRUB_ERR_NONE;\n\t\t}\n\t if (!err)\n\t break;\n\t }\n\tif (err)\n\t return grub_errno = err;\n }\n size -= csize;\n buf = (grub_uint8_t ) buf + csize;\n addr += csize;\n if (challoc)\n\tgrub_free (chunk);\n }\n return GRUB_ERR_NONE;\n}\n```\n\n\n## Upstream Fix\n```diff\nIndex: grub-2.02~beta3/grub-core/fs/btrfs.c\n===================================================================\n--- grub-2.02~beta3.orig/grub-core/fs/btrfs.c\n+++ grub-2.02~beta3/grub-core/fs/btrfs.c\n@@ -925,10 +925,40 @@ lookup_root_by_name(struct grub_btrfs_da\n }\n \n static grub_err_t\n+lookup_root_by_name_fallback(struct grub_btrfs_data data, const char path)\n+{\n+ grub_err_t err;\n+ grub_uint64_t tree = 0;\n+ grub_uint8_t type;\n+ struct grub_btrfs_key key;\n+\n+ err = find_path (data, path, &key, &tree, &type);\n+ if (err)\n+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, \"couldn't locate %s\\n\", path);\n+\n+ if (key.object_id != grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK) \|\| tree == 0)\n+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, \"%s: not a subvolume\\n\", path);\n+\n+ data->fs_tree = tree;\n+ return GRUB_ERR_NONE;\n+}\n+\n+static grub_err_t\n btrfs_handle_subvol(struct grub_btrfs_data data __attribute__ ((unused)))\n {\n if (btrfs_default_subvol)\n- return lookup_root_by_name(data, btrfs_default_subvol);\n+ {\n+ grub_err_t err;\n+ err = lookup_root_by_name(data, btrfs_default_subvol);\n+\n+ / Fallback to old schemes /\n+ if (err == GRUB_ERR_FILE_NOT_FOUND)\n+\t{\n+\t err = GRUB_ERR_NONE;\n+\t return lookup_root_by_name_fallback(data, btrfs_default_subvol);\n+\t}\n+ return err;\n+ }\n \n if (btrfs_default_subvolid)\n return lookup_root_by_id(data, btrfs_default_subvolid);\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: grub-2.02~beta3/grub-core/fs/btrfs.c\n===================================================================\n--- grub-2.02~beta3.orig/grub-core/fs/btrfs.c\n+++ grub-2.02~beta3/grub-core/fs/btrfs.c\n@@ -925,10 +925,40 @@ lookup_root_by_name(struct grub_btrfs_da\n }\n \n static grub_err_t\n+lookup_root_by_name_fallback(struct grub_btrfs_data data, const char path)\n+{\n+ grub_err_t err;\n+ grub_uint64_t tree = 0;\n+ grub_uint8_t type;\n+ struct grub_btrfs_key key;\n+\n+ err = find_path (data, path, &key, &tree, &type);\n+ if (err)\n+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, \"couldn't locate %s\\n\", path);\n+\n+ if (key.object_id != grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK) \|\| tree == 0)\n+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, \"%s: not a subvolume\\n\", path);\n+\n+ data->fs_tree = tree;\n+ return GRUB_ERR_NONE;\n+}\n+\n+static grub_err_t\n btrfs_handle_subvol(struct grub_btrfs_data data __attribute__ ((unused)))\n {\n if (btrfs_default_subvol)\n- return lookup_root_by_name(data, btrfs_default_subvol);\n+ {\n+ grub_err_t err;\n+ err = lookup_root_by_name(data, btrfs_default_subvol);\n+\n+ /* Fallback to old schemes */\n+ if (err == GRUB_ERR_FILE_NOT_FOUND)\n+\t{\n+\t err = GRUB_ERR_NONE;\n+\t return lookup_root_by_name_fallback(data, btrfs_default_subvol);\n+\t}\n+ return err;\n+ }\n \n if (btrfs_default_subvolid)\n return lookup_root_by_id(data, btrfs_default_subvolid);\n" } ]	{ "id": "grub2-15947-grub2-btrfs-07-subvol-fallback.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-btrfs-07-subvol-fallback.patch", "tier": "identical", "language": "c", "patch_lines_changed": 32, "patch_files_count": 1, "total_tokens_est": 875, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ninclude/grub/i386/linux.h: Include missing\n\n## Package\ngrub2\n\n## Files to modify\n- include/grub/i386/linux.h\n\n## Target Source Code\n\n### include/grub/i386/linux.h\n\n#### region() [lines 1-76]\n```c\n/\n GRUB -- GRand Unified Bootloader\n * Copyright (C) 1999,2000,2001,2002,2003,2004,2007,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#ifndef GRUB_I386_LINUX_HEADER\n#define GRUB_I386_LINUX_HEADER\t1\n\n#define GRUB_LINUX_I386_MAGIC_SIGNATURE\t0x53726448 / \"HdrS\" /\n#define GRUB_LINUX_DEFAULT_SETUP_SECTS\t4\n#define GRUB_LINUX_INITRD_MAX_ADDRESS\t0x37FFFFFF\n#define GRUB_LINUX_MAX_SETUP_SECTS\t64\n#define GRUB_LINUX_BOOT_LOADER_TYPE\t0x72\n#define GRUB_LINUX_HEAP_END_OFFSET\t(0x9000 - 0x200)\n\n#define GRUB_LINUX_BZIMAGE_ADDR\t\t0x100000\n#define GRUB_LINUX_ZIMAGE_ADDR\t\t0x10000\n#define GRUB_LINUX_OLD_REAL_MODE_ADDR\t0x90000\n#define GRUB_LINUX_SETUP_STACK\t\t0x9000\n\n#define GRUB_LINUX_FLAG_BIG_KERNEL\t0x1\n#define GRUB_LINUX_FLAG_QUIET\t\t0x20\n#define GRUB_LINUX_FLAG_CAN_USE_HEAP\t0x80\n\n/ Linux's video mode selection support. Actually I hate it! /\n#define GRUB_LINUX_VID_MODE_NORMAL\t0xFFFF\n#define GRUB_LINUX_VID_MODE_EXTENDED\t0xFFFE\n#define GRUB_LINUX_VID_MODE_ASK\t\t0xFFFD\n#define GRUB_LINUX_VID_MODE_VESA_START\t0x0300\n\n#define GRUB_LINUX_CL_MAGIC\t\t0xA33F\n\n#define VIDEO_CAPABILITY_SKIP_QUIRKS\t(1 << 0)\n#define VIDEO_CAPABILITY_64BIT_BASE\t(1 << 1)\t/ Frame buffer base is 64-bit. /\n\n/ Maximum number of MBR signatures to store. /\n#define EDD_MBR_SIG_MAX\t\t\t16\n\n#ifdef __x86_64__\n\n#define GRUB_LINUX_EFI_SIGNATURE\t\\\n ('4' << 24 \| '6' << 16 \| 'L' << 8 \| 'E')\n\n#else\n\n#define GRUB_LINUX_EFI_SIGNATURE\t\\\n ('2' << 24 \| '3' << 16 \| 'L' << 8 \| 'E')\n\n#endif\n\n#define GRUB_LINUX_EFI_SIGNATURE_0204\t\\\n ('L' << 24 \| 'I' << 16 \| 'F' << 8 \| 'E')\n\n#define GRUB_LINUX_OFW_SIGNATURE\t\\\n (' ' << 24 \| 'W' << 16 \| 'F' << 8 \| 'O')\n\n#ifndef ASM_FILE\n\n#define GRUB_E820_RAM 1\n#define GRUB_E820_RESERVED 2\n#define GRUB_E820_ACPI 3\n#define GRUB_E820_NVS 4\n#define GRUB_E820_BADRAM 5\n```\n\n\n## Upstream Fix\n```diff\nFrom b34466c8977ed8647d49933926938e43d4e6a91c Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Thu, 3 Dec 2020 16:01:43 +0100\nSubject: [PATCH 01/45] include/grub/i386/linux.h: Include missing\n <grub/types.h> header\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n\nThis header uses types defined in <grub/types.h> but does not include it,\nwhich leads to compile errors like the following:\n\nIn file included from ../include/grub/cpu/linux.h:19,\n from kern/efi/sb.c:21:\n../include/grub/i386/linux.h:80:3: error: unknown type name ‘grub_uint64_t’\n 80 \| grub_uint64_t addr;\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n include/grub/i386/linux.h \| 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h\nindex ce30e7fb0..6da5f030f 100644\n--- a/include/grub/i386/linux.h\n+++ b/include/grub/i386/linux.h\n@@ -19,6 +19,8 @@\n #ifndef GRUB_I386_LINUX_HEADER\n #define GRUB_I386_LINUX_HEADER\t1\n \n+#include <grub/types.h>\n+\n #define GRUB_LINUX_I386_MAGIC_SIGNATURE\t0x53726448 / \"HdrS\" /\n #define GRUB_LINUX_DEFAULT_SETUP_SECTS\t4\n #define GRUB_LINUX_INITRD_MAX_ADDRESS\t0x37FFFFFF\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From b34466c8977ed8647d49933926938e43d4e6a91c Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Thu, 3 Dec 2020 16:01:43 +0100\nSubject: [PATCH 01/45] include/grub/i386/linux.h: Include missing\n <grub/types.h> header\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n\nThis header uses types defined in <grub/types.h> but does not include it,\nwhich leads to compile errors like the following:\n\nIn file included from ../include/grub/cpu/linux.h:19,\n from kern/efi/sb.c:21:\n../include/grub/i386/linux.h:80:3: error: unknown type name ‘grub_uint64_t’\n 80 \| grub_uint64_t addr;\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n include/grub/i386/linux.h \| 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h\nindex ce30e7fb0..6da5f030f 100644\n--- a/include/grub/i386/linux.h\n+++ b/include/grub/i386/linux.h\n@@ -19,6 +19,8 @@\n #ifndef GRUB_I386_LINUX_HEADER\n #define GRUB_I386_LINUX_HEADER\t1\n \n+#include <grub/types.h>\n+\n #define GRUB_LINUX_I386_MAGIC_SIGNATURE\t0x53726448 / \"HdrS\" */\n #define GRUB_LINUX_DEFAULT_SETUP_SECTS\t4\n #define GRUB_LINUX_INITRD_MAX_ADDRESS\t0x37FFFFFF\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0001-include-grub-i386-linux.h-Include-missing-grub-types.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0001-include-grub-i386-linux.h-Include-missing-grub-types.patch", "tier": "identical", "language": "c", "patch_lines_changed": 3, "patch_files_count": 1, "total_tokens_est": 801, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nkern/mm.c : Make grub_calloc inline\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/kern/mm.c\n- include/grub/mm.h\n\n## Target Source Code\n\n### grub-core/kern/mm.c\n\n#### region() [lines 11-125]\n```c\n * GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n/\n The design of this memory manager.\n\n This is a simple implementation of malloc with a few extensions. These are\n the extensions:\n\n - memalign is implemented efficiently.\n\n - multiple regions may be used as free space. They may not be\n contiguous.\n\n Regions are managed by a singly linked list, and the meta information is\n stored in the beginning of each region. Space after the meta information\n is used to allocate memory.\n\n The memory space is used as cells instead of bytes for simplicity. This\n is important for some CPUs which may not access multiple bytes at a time\n when the first byte is not aligned at a certain boundary (typically,\n 4-byte or 8-byte). The size of each cell is equal to the size of struct\n grub_mm_header, so the header of each allocated/free block fits into one\n cell precisely. One cell is 16 bytes on 32-bit platforms and 32 bytes\n on 64-bit platforms.\n\n There are two types of blocks: allocated blocks and free blocks.\n\n In allocated blocks, the header of each block has only its size. Note that\n this size is based on cells but not on bytes. The header is located right\n before the returned pointer, that is, the header resides at the previous\n cell.\n\n Free blocks constitutes a ring, using a singly linked list. The first free\n block is pointed to by the meta information of a region. The allocator\n attempts to pick up the second block instead of the first one. This is\n a typical optimization against defragmentation, and makes the\n implementation a bit easier.\n\n For safety, both allocated blocks and free ones are marked by magic\n numbers. Whenever anything unexpected is detected, GRUB aborts the\n operation.\n /\n\n#include <config.h>\n#include <grub/mm.h>\n#include <grub/misc.h>\n#include <grub/err.h>\n#include <grub/types.h>\n#include <grub/disk.h>\n#include <grub/dl.h>\n#include <grub/i18n.h>\n#include <grub/mm_private.h>\n\n#ifdef MM_DEBUG\n# undef grub_malloc\n# undef grub_zalloc\n# undef grub_realloc\n# undef grub_free\n# undef grub_memalign\n#endif\n\n\f\n\ngrub_mm_region_t grub_mm_base;\n\n/ Get a header from the pointer PTR, and set P and R to a pointer\n to the header and a pointer to its region, respectively. PTR must\n be allocated. /\nstatic void\nget_header_from_pointer (void ptr, grub_mm_header_t p, grub_mm_region_t r)\n{\n if ((grub_addr_t) ptr & (GRUB_MM_ALIGN - 1))\n grub_fatal (\"unaligned pointer %p\", ptr);\n\n for (r = grub_mm_base; r; r = (r)->next)\n if ((grub_addr_t) ptr > (grub_addr_t) ((r) + 1)\n\t&& (grub_addr_t) ptr <= (grub_addr_t) ((r) + 1) + (r)->size)\n break;\n\n if (! r)\n grub_fatal (\"out of range pointer %p\", ptr);\n\n p = (grub_mm_header_t) ptr - 1;\n if ((p)->magic == GRUB_MM_FREE_MAGIC)\n grub_fatal (\"double free at %p\", p);\n if ((p)->magic != GRUB_MM_ALLOC_MAGIC)\n grub_fatal (\"alloc magic is broken at %p: %lx\", p,\n\t\t(unsigned long) (p)->magic);\n}\n\n/* Initialize a region starting from ADDR and whose size is SIZE,\n to use it as free space. /\nvoid\ngrub_mm_init_region (void addr, grub_size_t size)\n{\n grub_mm_header_t h;\n grub_mm_region_t r, p, q;\n\n#if 0\n grub_printf (\"Using memory for heap: start=%p, end=%p\\n\", addr, addr + (unsigned int) size);\n#endif\n\n / Exclude last 4K to avoid overflows. /\n / If addr + 0x1000 overflows then whole region is in excluded zone. /\n if ((grub_addr_t) addr > ~((grub_addr_t) 0x1000))\n return;\n\n / If addr + 0x1000 + size overflows then decrease size. /\n```\n\n#### grub_memalign() [lines 316-378]\n```c\n\n/ Allocate SIZE bytes with the alignment ALIGN and return the pointer. /\nvoid \ngrub_memalign (grub_size_t align, grub_size_t size)\n{\n grub_mm_region_t r;\n grub_size_t n = ((size + GRUB_MM_ALIGN - 1) >> GRUB_MM_ALIGN_LOG2) + 1;\n int count = 0;\n\n if (!grub_mm_base)\n goto fail;\n\n if (size > ~(grub_size_t) align)\n goto fail;\n\n /* We currently assume at least a 32-bit grub_size_t,\n so limiting allocations to <adress space size> - 1MiB\n in name of sanity is beneficial. /\n if ((size + align) > ~(grub_size_t) 0x100000)\n goto fail;\n\n align = (align >> GRUB_MM_ALIGN_LOG2);\n if (align == 0)\n align = 1;\n\n again:\n\n for (r = grub_mm_base; r; r = r->next)\n {\n void p;\n\n p = grub_real_malloc (&(r->first), n, align);\n if (p)\n\treturn p;\n }\n\n /* If failed, increase free memory somehow. /\n switch (count)\n {\n case 0:\n / Invalidate disk caches. /\n grub_disk_cache_invalidate_all ();\n count++;\n goto again;\n\n#if 0\n case 1:\n / Unload unneeded modules. /\n grub_dl_unload_unneeded ();\n count++;\n goto again;\n#endif\n\n default:\n break;\n }\n\n fail:\n grub_error (GRUB_ERR_OUT_OF_MEMORY, N_(\"out of memory\"));\n return 0;\n}\n\n/ Allocate SIZE bytes and return the pointer. /\n```\n\n### include/grub/mm.h\n\n#### region() [lines 1-78]\n```c\n/ mm.h - prototypes and declarations for memory manager /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2002,2007 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#ifndef GRUB_MM_H\n#define GRUB_MM_H\t1\n\n#include <grub/types.h>\n#include <grub/symbol.h>\n#include <config.h>\n\n#ifndef NULL\n# define NULL\t((void ) 0)\n#endif\n\nvoid grub_mm_init_region (void addr, grub_size_t size);\nvoid EXPORT_FUNC(grub_malloc) (grub_size_t size);\nvoid EXPORT_FUNC(grub_zalloc) (grub_size_t size);\nvoid EXPORT_FUNC(grub_free) (void ptr);\nvoid EXPORT_FUNC(grub_realloc) (void ptr, grub_size_t size);\n#ifndef GRUB_MACHINE_EMU\nvoid EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);\n#endif\n\nvoid grub_mm_check_real (const char file, int line);\n#define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);\n\n/* For debugging. /\n#if defined(MM_DEBUG) && !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)\n/ Set this variable to 1 when you want to trace all memory function calls. /\nextern int EXPORT_VAR(grub_mm_debug);\n\nvoid grub_mm_dump_free (void);\nvoid grub_mm_dump (unsigned lineno);\n\n#define grub_malloc(size)\t\\\n grub_debug_malloc (GRUB_FILE, __LINE__, size)\n\n#define grub_zalloc(size)\t\\\n grub_debug_zalloc (GRUB_FILE, __LINE__, size)\n\n#define grub_realloc(ptr,size)\t\\\n grub_debug_realloc (GRUB_FILE, __LINE__, ptr, size)\n\n#define grub_memalign(align,size)\t\\\n grub_debug_memalign (GRUB_FILE, __LINE__, align, size)\n\n#define grub_free(ptr)\t\\\n grub_debug_free (GRUB_FILE, __LINE__, ptr)\n\nvoid EXPORT_FUNC(grub_debug_malloc) (const char file, int line,\n\t\t\t\t grub_size_t size);\nvoid EXPORT_FUNC(grub_debug_zalloc) (const char file, int line,\n\t\t\t\t grub_size_t size);\nvoid EXPORT_FUNC(grub_debug_free) (const char file, int line, void ptr);\nvoid EXPORT_FUNC(grub_debug_realloc) (const char file, int line, void ptr,\n\t\t\t\t grub_size_t size);\nvoid EXPORT_FUNC(grub_debug_memalign) (const char file, int line,\n\t\t\t\t\tgrub_size_t align, grub_size_t size);\n#endif /* MM_DEBUG && ! GRUB_UTIL /\n\n#endif / ! GRUB_MM_H /\n\n```\n\n\n## Upstream Fix\n```diff\nFrom c2475f1337dff2e2a3e45514119d5186e55753c1 Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Thu, 13 Aug 2020 09:36:45 +0800\nSubject: [PATCH] kern/mm.c : Make grub_calloc inline\n\nTo circumvent the situation that symbol 'grub_calloc' not found would\nhappen if system is using stray grub (ie not managed by system update)\nas stage1 that can be too old to load updated modules.\n---\n grub-core/kern/mm.c \| 28 ----------------------------\n include/grub/mm.h \| 32 +++++++++++++++++++++++++++++++-\n 2 files changed, 31 insertions(+), 29 deletions(-)\n\ndiff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c\nindex f2822a836..dacdaa239 100644\n--- a/grub-core/kern/mm.c\n+++ b/grub-core/kern/mm.c\n@@ -60,14 +60,10 @@\n \n #include <config.h>\n #include <grub/mm.h>\n-#include <grub/misc.h>\n-#include <grub/err.h>\n #include <grub/types.h>\n #include <grub/disk.h>\n #include <grub/dl.h>\n-#include <grub/i18n.h>\n #include <grub/mm_private.h>\n-#include <grub/safemath.h>\n \n #ifdef MM_DEBUG\n # undef grub_calloc\n@@ -377,30 +373,6 @@ grub_memalign (grub_size_t align, grub_size_t size)\n return 0;\n }\n \n-/\n- * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on\n- * integer overflow.\n- /\n-void \n-grub_calloc (grub_size_t nmemb, grub_size_t size)\n-{\n- void ret;\n- grub_size_t sz = 0;\n-\n- if (grub_mul (nmemb, size, &sz))\n- {\n- grub_error (GRUB_ERR_OUT_OF_RANGE, N_(\"overflow is detected\"));\n- return NULL;\n- }\n-\n- ret = grub_memalign (0, sz);\n- if (!ret)\n- return NULL;\n-\n- grub_memset (ret, 0, sz);\n- return ret;\n-}\n-\n / Allocate SIZE bytes and return the pointer. /\n void \n grub_malloc (grub_size_t size)\ndiff --git a/include/grub/mm.h b/include/grub/mm.h\nindex 9c38dd3ca..1754635e7 100644\n--- a/include/grub/mm.h\n+++ b/include/grub/mm.h\n@@ -29,7 +29,6 @@\n #endif\n \n void grub_mm_init_region (void addr, grub_size_t size);\n-void EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);\n void EXPORT_FUNC(grub_malloc) (grub_size_t size);\n void EXPORT_FUNC(grub_zalloc) (grub_size_t size);\n void EXPORT_FUNC(grub_free) (void ptr);\n@@ -37,6 +36,37 @@ void EXPORT_FUNC(grub_realloc) (void ptr, grub_size_t size);\n #ifndef GRUB_MACHINE_EMU\n void EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);\n #endif\n+#if !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)\n+#include <grub/misc.h>\n+#include <grub/err.h>\n+#include <grub/i18n.h>\n+#include <grub/safemath.h>\n+/\n+ Allocate NMEMB instances of SIZE bytes and return the pointer, or error on\n+ * integer overflow.\n+ /\n+static inline void \n+grub_calloc (grub_size_t nmemb, grub_size_t size)\n+{\n+ void ret;\n+ grub_size_t sz = 0;\n+\n+ if (grub_mul (nmemb, size, &sz))\n+ {\n+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_(\"overflow is detected\"));\n+ return NULL;\n+ }\n+\n+ ret = grub_memalign (0, sz);\n+ if (!ret)\n+ return NULL;\n+\n+ grub_memset (ret, 0, sz);\n+ return ret;\n+}\n+#else\n+void EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);\n+#endif\n \n void grub_mm_check_real (const char file, int line);\n #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From c2475f1337dff2e2a3e45514119d5186e55753c1 Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Thu, 13 Aug 2020 09:36:45 +0800\nSubject: [PATCH] kern/mm.c : Make grub_calloc inline\n\nTo circumvent the situation that symbol 'grub_calloc' not found would\nhappen if system is using stray grub (ie not managed by system update)\nas stage1 that can be too old to load updated modules.\n---\n grub-core/kern/mm.c \| 28 ----------------------------\n include/grub/mm.h \| 32 +++++++++++++++++++++++++++++++-\n 2 files changed, 31 insertions(+), 29 deletions(-)\n\ndiff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c\nindex f2822a836..dacdaa239 100644\n--- a/grub-core/kern/mm.c\n+++ b/grub-core/kern/mm.c\n@@ -60,14 +60,10 @@\n \n #include <config.h>\n #include <grub/mm.h>\n-#include <grub/misc.h>\n-#include <grub/err.h>\n #include <grub/types.h>\n #include <grub/disk.h>\n #include <grub/dl.h>\n-#include <grub/i18n.h>\n #include <grub/mm_private.h>\n-#include <grub/safemath.h>\n \n #ifdef MM_DEBUG\n # undef grub_calloc\n@@ -377,30 +373,6 @@ grub_memalign (grub_size_t align, grub_size_t size)\n return 0;\n }\n \n-/\n- * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on\n- * integer overflow.\n- /\n-void \n-grub_calloc (grub_size_t nmemb, grub_size_t size)\n-{\n- void ret;\n- grub_size_t sz = 0;\n-\n- if (grub_mul (nmemb, size, &sz))\n- {\n- grub_error (GRUB_ERR_OUT_OF_RANGE, N_(\"overflow is detected\"));\n- return NULL;\n- }\n-\n- ret = grub_memalign (0, sz);\n- if (!ret)\n- return NULL;\n-\n- grub_memset (ret, 0, sz);\n- return ret;\n-}\n-\n / Allocate SIZE bytes and return the pointer. /\n void \n grub_malloc (grub_size_t size)\ndiff --git a/include/grub/mm.h b/include/grub/mm.h\nindex 9c38dd3ca..1754635e7 100644\n--- a/include/grub/mm.h\n+++ b/include/grub/mm.h\n@@ -29,7 +29,6 @@\n #endif\n \n void grub_mm_init_region (void addr, grub_size_t size);\n-void EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);\n void EXPORT_FUNC(grub_malloc) (grub_size_t size);\n void EXPORT_FUNC(grub_zalloc) (grub_size_t size);\n void EXPORT_FUNC(grub_free) (void ptr);\n@@ -37,6 +36,37 @@ void EXPORT_FUNC(grub_realloc) (void ptr, grub_size_t size);\n #ifndef GRUB_MACHINE_EMU\n void EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);\n #endif\n+#if !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)\n+#include <grub/misc.h>\n+#include <grub/err.h>\n+#include <grub/i18n.h>\n+#include <grub/safemath.h>\n+/\n+ Allocate NMEMB instances of SIZE bytes and return the pointer, or error on\n+ * integer overflow.\n+ /\n+static inline void \n+grub_calloc (grub_size_t nmemb, grub_size_t size)\n+{\n+ void ret;\n+ grub_size_t sz = 0;\n+\n+ if (grub_mul (nmemb, size, &sz))\n+ {\n+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_(\"overflow is detected\"));\n+ return NULL;\n+ }\n+\n+ ret = grub_memalign (0, sz);\n+ if (!ret)\n+ return NULL;\n+\n+ grub_memset (ret, 0, sz);\n+ return ret;\n+}\n+#else\n+void EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);\n+#endif\n \n void grub_mm_check_real (const char *file, int line);\n #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0001-kern-mm.c-Make-grub_calloc-inline.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0001-kern-mm.c-Make-grub_calloc-inline.patch", "tier": "identical", "language": "c", "patch_lines_changed": 61, "patch_files_count": 2, "total_tokens_est": 1725, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ncmdline: Provide cmdline functions as module\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/Makefile.core.def\n- grub-core/lib/cmdline.c\n\n## Target Source Code\n\n### grub-core/lib/cmdline.c\n\n#### region() [lines 1-76]\n```c\n/* cmdline.c - linux command line handling /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2010 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#include <grub/lib/cmdline.h>\n#include <grub/misc.h>\n\nstatic unsigned int check_arg (char c, int has_space)\n{\n int space = 0;\n unsigned int size = 0;\n\n while (c)\n {\n if (c == '\\\\' \|\| c == '\\'' \|\| c == '\"')\n\tsize++;\n else if (c == ' ')\n\tspace = 1;\n\n size++;\n c++;\n }\n\n if (space)\n size += 2;\n\n if (has_space)\n has_space = space;\n\n return size;\n}\n\nunsigned int grub_loader_cmdline_size (int argc, char argv[])\n{\n int i;\n unsigned int size = 0;\n\n for (i = 0; i < argc; i++)\n {\n size += check_arg (argv[i], 0);\n size++; /* Separator space or NULL. /\n }\n\n if (size == 0)\n size = 1;\n\n return size;\n}\n\ngrub_err_t\ngrub_create_loader_cmdline (int argc, char argv[], char buf,\n\t\t\t grub_size_t size, enum grub_verify_string_type type)\n{\n int i, space;\n unsigned int arg_size;\n char c, orig_buf = buf;\n\n for (i = 0; i < argc; i++)\n {\n c = argv[i];\n arg_size = check_arg(argv[i], &space);\n```\n\n\n## Upstream Fix\n```diff\nFrom 42cb0ebbffd660608612f9e32150a6596c6933c4 Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Mon, 17 Aug 2020 17:25:56 +0800\nSubject: [PATCH 2/2] cmdline: Provide cmdline functions as module\n\nThe command line processing is needed by many loader modules, hence we should\nmake it a sharable one rather than belonging to linux loader. This can cut the\ndependency to linux module among multiple loaders like multiboot linuxefi and\nso on to make custom boot image much more flexible to compose.\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n---\n grub-core/Makefile.core.def \| 6 +++++-\n grub-core/lib/cmdline.c \| 3 +++\n 2 files changed, 8 insertions(+), 1 deletion(-)\n\ndiff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def\nindex c413267a0..6045da47b 100644\n--- a/grub-core/Makefile.core.def\n+++ b/grub-core/Makefile.core.def\n@@ -1790,7 +1790,6 @@ module = {\n riscv64 = loader/riscv/linux.c;\n emu = loader/emu/linux.c;\n common = loader/linux.c;\n- common = lib/cmdline.c;\n };\n \n module = {\n@@ -2518,3 +2517,8 @@ module = {\n common = commands/i386/wrmsr.c;\n enable = x86;\n };\n+\n+module = {\n+ name = cmdline;\n+ common = lib/cmdline.c;\n+};\ndiff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c\nindex ed0b149dc..bd392e30f 100644\n--- a/grub-core/lib/cmdline.c\n+++ b/grub-core/lib/cmdline.c\n@@ -19,6 +19,9 @@\n \n #include <grub/lib/cmdline.h>\n #include <grub/misc.h>\n+#include <grub/dl.h>\n+\n+GRUB_MOD_LICENSE (\"GPLv3+\");\n \n static unsigned int check_arg (char c, int has_space)\n {\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 42cb0ebbffd660608612f9e32150a6596c6933c4 Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Mon, 17 Aug 2020 17:25:56 +0800\nSubject: [PATCH 2/2] cmdline: Provide cmdline functions as module\n\nThe command line processing is needed by many loader modules, hence we should\nmake it a sharable one rather than belonging to linux loader. This can cut the\ndependency to linux module among multiple loaders like multiboot linuxefi and\nso on to make custom boot image much more flexible to compose.\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n---\n grub-core/Makefile.core.def \| 6 +++++-\n grub-core/lib/cmdline.c \| 3 +++\n 2 files changed, 8 insertions(+), 1 deletion(-)\n\ndiff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def\nindex c413267a0..6045da47b 100644\n--- a/grub-core/Makefile.core.def\n+++ b/grub-core/Makefile.core.def\n@@ -1790,7 +1790,6 @@ module = {\n riscv64 = loader/riscv/linux.c;\n emu = loader/emu/linux.c;\n common = loader/linux.c;\n- common = lib/cmdline.c;\n };\n \n module = {\n@@ -2518,3 +2517,8 @@ module = {\n common = commands/i386/wrmsr.c;\n enable = x86;\n };\n+\n+module = {\n+ name = cmdline;\n+ common = lib/cmdline.c;\n+};\ndiff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c\nindex ed0b149dc..bd392e30f 100644\n--- a/grub-core/lib/cmdline.c\n+++ b/grub-core/lib/cmdline.c\n@@ -19,6 +19,9 @@\n \n #include <grub/lib/cmdline.h>\n #include <grub/misc.h>\n+#include <grub/dl.h>\n+\n+GRUB_MOD_LICENSE (\"GPLv3+\");\n \n static unsigned int check_arg (char c, int *has_space)\n {\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0002-cmdline-Provide-cmdline-functions-as-module.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0002-cmdline-Provide-cmdline-functions-as-module.patch", "tier": "identical", "language": "c", "patch_lines_changed": 10, "patch_files_count": 2, "total_tokens_est": 931, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nkern/parser: Fix resource leak if argc == 0\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/kern/parser.c\n\n## Target Source Code\n\n### grub-core/kern/parser.c\n\n#### grub_parser_split_cmdline() [lines 130-237]\n```c\n}\n\ngrub_err_t\ngrub_parser_split_cmdline (const char cmdline,\n\t\t\t grub_reader_getline_t getline, void getline_data,\n\t\t\t int argc, char *argv)\n{\n grub_parser_state_t state = GRUB_PARSER_STATE_TEXT;\n / XXX: Fixed size buffer, perhaps this buffer should be dynamically\n allocated. /\n char buffer[1024];\n char bp = buffer;\n char rd = (char ) cmdline;\n char varname[200];\n char vp = varname;\n char args;\n int i;\n\n argc = 0;\n do\n {\n if (!rd \|\| !rd)\n\t{\n\t if (getline)\n\t getline (&rd, 1, getline_data);\n\t else\n\t break;\n\t}\n\n if (!rd)\n\tbreak;\n\n for (; rd; rd++)\n\t{\n\t grub_parser_state_t newstate;\n\t char use;\n\n\t newstate = grub_parser_cmdline_state (state, rd, &use);\n\n\t /* If a variable was being processed and this character does\n\t not describe the variable anymore, write the variable to\n\t the buffer. /\n\t add_var (varname, &bp, &vp, state, newstate);\n\n\t if (check_varstate (newstate))\n\t {\n\t if (use)\n\t\t(vp++) = use;\n\t }\n\t else\n\t {\n\t if (newstate == GRUB_PARSER_STATE_TEXT\n\t\t && state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n\t\t{\n\t\t /* Don't add more than one argument if multiple\n\t\t spaces are used. /\n\t\t if (bp != buffer && (bp - 1))\n\t\t {\n\t\t (bp++) = '\\0';\n\t\t (argc)++;\n\t\t }\n\t\t}\n\t else if (use)\n\t\t(bp++) = use;\n\t }\n\t state = newstate;\n\t}\n }\n while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));\n\n / A special case for when the last character was part of a\n variable. /\n add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);\n\n if (bp != buffer && (bp - 1))\n {\n (bp++) = '\\0';\n (argc)++;\n }\n\n /* Reserve memory for the return values. /\n args = grub_malloc (bp - buffer);\n if (!args)\n return grub_errno;\n grub_memcpy (args, buffer, bp - buffer);\n\n argv = grub_malloc (sizeof (char ) (argc + 1));\n if (!argv)\n {\n grub_free (args);\n return grub_errno;\n }\n\n /* The arguments are separated with 0's, setup argv so it points to\n the right values. /\n bp = args;\n for (i = 0; i < argc; i++)\n {\n (argv)[i] = bp;\n while (bp)\n\tbp++;\n bp++;\n }\n\n return 0;\n}\n\n/* Helper for grub_parser_execute. /\n```\n\n\n## Upstream Fix\n```diff\nFrom 7889f273aaf1e1e4ef417478c0a5dbe7da577f32 Mon Sep 17 00:00:00 2001\nFrom: Darren Kenny <darren.kenny@oracle.com>\nDate: Fri, 22 Jan 2021 12:32:41 +0000\nSubject: [PATCH 24/45] kern/parser: Fix resource leak if argc == 0\n\nAfter processing the command-line yet arriving at the point where we are\nsetting argv, we are allocating memory, even if argc == 0, which makes\nno sense since we never put anything into the allocated argv.\n\nThe solution is to simply return that we've successfully processed the\narguments but that argc == 0, and also ensure that argv is NULL when\nwe're not allocating anything in it.\n\nThere are only 2 callers of this function, and both are handling a zero\nvalue in argc assuming nothing is allocated in argv.\n\nFixes: CID 96680\n\nSigned-off-by: Darren Kenny <darren.kenny@oracle.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/kern/parser.c \| 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c\nindex 619db3122..d1cf061ad 100644\n--- a/grub-core/kern/parser.c\n+++ b/grub-core/kern/parser.c\n@@ -146,6 +146,7 @@ grub_parser_split_cmdline (const char cmdline,\n int i;\n \n argc = 0;\n+ argv = NULL;\n do\n {\n if (!rd \|\| !rd)\n@@ -207,6 +208,10 @@ grub_parser_split_cmdline (const char cmdline,\n (argc)++;\n }\n \n+ / If there are no args, then we're done. /\n+ if (!argc)\n+ return 0;\n+\n /* Reserve memory for the return values. /\n args = grub_malloc (bp - buffer);\n if (!args)\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 7889f273aaf1e1e4ef417478c0a5dbe7da577f32 Mon Sep 17 00:00:00 2001\nFrom: Darren Kenny <darren.kenny@oracle.com>\nDate: Fri, 22 Jan 2021 12:32:41 +0000\nSubject: [PATCH 24/45] kern/parser: Fix resource leak if argc == 0\n\nAfter processing the command-line yet arriving at the point where we are\nsetting argv, we are allocating memory, even if argc == 0, which makes\nno sense since we never put anything into the allocated argv.\n\nThe solution is to simply return that we've successfully processed the\narguments but that argc == 0, and also ensure that argv is NULL when\nwe're not allocating anything in it.\n\nThere are only 2 callers of this function, and both are handling a zero\nvalue in argc assuming nothing is allocated in argv.\n\nFixes: CID 96680\n\nSigned-off-by: Darren Kenny <darren.kenny@oracle.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/kern/parser.c \| 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c\nindex 619db3122..d1cf061ad 100644\n--- a/grub-core/kern/parser.c\n+++ b/grub-core/kern/parser.c\n@@ -146,6 +146,7 @@ grub_parser_split_cmdline (const char cmdline,\n int i;\n \n argc = 0;\n+ argv = NULL;\n do\n {\n if (!rd \|\| !rd)\n@@ -207,6 +208,10 @@ grub_parser_split_cmdline (const char cmdline,\n (argc)++;\n }\n \n+ / If there are no args, then we're done. /\n+ if (!argc)\n+ return 0;\n+\n /* Reserve memory for the return values. */\n args = grub_malloc (bp - buffer);\n if (!args)\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0024-kern-parser-Fix-resource-leak-if-argc-0.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0024-kern-parser-Fix-resource-leak-if-argc-0.patch", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 1, "total_tokens_est": 910, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nefi: Make shim_lock GUID and protocol type public\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/commands/efi/shim_lock.c\n- include/grub/efi/api.h\n\n## Target Source Code\n\n### grub-core/commands/efi/shim_lock.c\n\n#### region() [lines 1-96]\n```c\n/\n GRUB -- GRand Unified Bootloader\n * Copyright (C) 2017 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n \n EFI shim lock verifier.\n /\n\n#include <grub/dl.h>\n#include <grub/efi/efi.h>\n#include <grub/err.h>\n#include <grub/file.h>\n#include <grub/misc.h>\n#include <grub/verify.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\n#define GRUB_EFI_SHIM_LOCK_GUID \\\n { 0x605dab50, 0xe046, 0x4300, \\\n { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n }\n\nstruct grub_efi_shim_lock_protocol\n{\n grub_efi_status_t\n (verify) (void buffer, grub_uint32_t size);\n};\ntypedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n\nstatic grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\nstatic grub_efi_shim_lock_protocol_t sl;\n\n/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. /\nstatic const char const disabled_mods[] = {\"iorw\", \"memrw\", \"wrmsr\", NULL};\n\nstatic grub_err_t\nshim_lock_init (grub_file_t io, enum grub_file_type type,\n\t\tvoid *context __attribute__ ((unused)),\n\t\tenum grub_verify_flags flags)\n{\n const char b, e;\n int i;\n\n flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;\n\n if (!sl)\n return GRUB_ERR_NONE;\n\n switch (type & GRUB_FILE_TYPE_MASK)\n {\n case GRUB_FILE_TYPE_GRUB_MODULE:\n / Establish GRUB module name. /\n b = grub_strrchr (io->name, '/');\n e = grub_strrchr (io->name, '.');\n\n b = b ? (b + 1) : io->name;\n e = e ? e : io->name + grub_strlen (io->name);\n e = (e > b) ? e : io->name + grub_strlen (io->name);\n\n for (i = 0; disabled_mods[i]; i++)\n\tif (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e)))\n\t {\n\t grub_error (GRUB_ERR_ACCESS_DENIED,\n\t\t\tN_(\"module cannot be loaded in UEFI secure boot mode: %s\"),\n\t\t\tio->name);\n\t return GRUB_ERR_ACCESS_DENIED;\n\t }\n\n / Fall through. /\n\n case GRUB_FILE_TYPE_ACPI_TABLE:\n case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:\n flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;\n\n return GRUB_ERR_NONE;\n\n case GRUB_FILE_TYPE_LINUX_KERNEL:\n case GRUB_FILE_TYPE_MULTIBOOT_KERNEL:\n case GRUB_FILE_TYPE_BSD_KERNEL:\n case GRUB_FILE_TYPE_XNU_KERNEL:\n case GRUB_FILE_TYPE_PLAN9_KERNEL:\n for (i = 0; disabled_mods[i]; i++)\n\tif (grub_dl_get (disabled_mods[i]))\n\t {\n```\n\n### include/grub/efi/api.h\n\n#### region() [lines 267-389]\n```c\n#define GRUB_EFI_TSC_FREQUENCY_GUID \\\n { 0xdba6a7e3, 0xbb57, 0x4be7, \\\n { 0x8a, 0xf8, 0xd5, 0x78, 0xdb, 0x7e, 0x56, 0x87 } \\\n }\n\n#define GRUB_EFI_SYSTEM_RESOURCE_TABLE_GUID \\\n { 0xb122a263, 0x3661, 0x4f68, \\\n { 0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80 } \\\n }\n\n#define GRUB_EFI_DXE_SERVICES_TABLE_GUID \\\n { 0x05ad34ba, 0x6f02, 0x4214, \\\n { 0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9 } \\\n }\n\n#define GRUB_EFI_HOB_LIST_GUID \\\n { 0x7739f24c, 0x93d7, 0x11d4, \\\n { 0x9a, 0x3a, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n\n#define GRUB_EFI_MEMORY_TYPE_INFORMATION_GUID \\\n { 0x4c19049f, 0x4137, 0x4dd3, \\\n { 0x9c, 0x10, 0x8b, 0x97, 0xa8, 0x3f, 0xfd, 0xfa } \\\n }\n\n#define GRUB_EFI_DEBUG_IMAGE_INFO_TABLE_GUID \\\n { 0x49152e77, 0x1ada, 0x4764, \\\n { 0xb7, 0xa2, 0x7a, 0xfe, 0xfe, 0xd9, 0x5e, 0x8b } \\\n }\n\n#define GRUB_EFI_MPS_TABLE_GUID\t\\\n { 0xeb9d2d2f, 0x2d88, 0x11d3, \\\n { 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n\n#define GRUB_EFI_ACPI_TABLE_GUID\t\\\n { 0xeb9d2d30, 0x2d88, 0x11d3, \\\n { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n\n#define GRUB_EFI_ACPI_20_TABLE_GUID\t\\\n { 0x8868e871, 0xe4f1, 0x11d3, \\\n { 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \\\n }\n\n#define GRUB_EFI_SMBIOS_TABLE_GUID\t\\\n { 0xeb9d2d31, 0x2d88, 0x11d3, \\\n { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n\n#define GRUB_EFI_SAL_TABLE_GUID \\\n { 0xeb9d2d32, 0x2d88, 0x11d3, \\\n { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n\n#define GRUB_EFI_HCDP_TABLE_GUID \\\n { 0xf951938d, 0x620b, 0x42ef, \\\n { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \\\n }\n\n#define GRUB_EFI_DEVICE_TREE_GUID \\\n { 0xb1b621d5, 0xf19c, 0x41a5, \\\n { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \\\n }\n\n#define GRUB_EFI_VENDOR_APPLE_GUID \\\n { 0x2B0585EB, 0xD8B8, 0x49A9,\t\\\n { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \\\n }\n\nstruct grub_efi_sal_system_table\n{\n grub_uint32_t signature;\n grub_uint32_t total_table_len;\n grub_uint16_t sal_rev;\n grub_uint16_t entry_count;\n grub_uint8_t checksum;\n grub_uint8_t reserved1[7];\n grub_uint16_t sal_a_version;\n grub_uint16_t sal_b_version;\n grub_uint8_t oem_id[32];\n grub_uint8_t product_id[32];\n/* ... 21 lines omitted ... /\n grub_uint64_t reserved[2];\n};\n\nstruct grub_efi_sal_system_table_memory_descriptor\n{\n grub_uint8_t type;\n grub_uint8_t sal_used;\n grub_uint8_t attr;\n grub_uint8_t ar;\n grub_uint8_t attr_mask;\n grub_uint8_t mem_type;\n grub_uint8_t usage;\n grub_uint8_t unknown;\n grub_uint64_t addr;\n grub_uint64_t len;\n grub_uint64_t unknown2;\n};\n\nstruct grub_efi_sal_system_table_platform_features\n{\n```\n\n#### region() [lines 1921-1762]\n```c\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 5a21320931e16618f304253a48b109b0c8a72e5e Mon Sep 17 00:00:00 2001\nFrom: Daniel Kiper <daniel.kiper@oracle.com>\nDate: Thu, 3 Dec 2020 16:01:45 +0100\nSubject: [PATCH 02/45] efi: Make shim_lock GUID and protocol type public\n\nThe GUID will be used to properly detect and report UEFI Secure Boot\nstatus to the x86 Linux kernel. The functionality will be added by\nsubsequent patches. The shim_lock protocol type is made public for\ncompleteness.\n\nAdditionally, fix formatting of four preceding GUIDs.\n\nSigned-off-by: Daniel Kiper <daniel.kiper@oracle.com>\nSigned-off-by: Marco A Benatto <mbenatto@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/efi/shim_lock.c \| 12 ------------\n include/grub/efi/api.h \| 19 +++++++++++++++----\n 2 files changed, 15 insertions(+), 16 deletions(-)\n\ndiff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c\nindex 764098cfc..d8f52d721 100644\n--- a/grub-core/commands/efi/shim_lock.c\n+++ b/grub-core/commands/efi/shim_lock.c\n@@ -27,18 +27,6 @@\n \n GRUB_MOD_LICENSE (\"GPLv3+\");\n \n-#define GRUB_EFI_SHIM_LOCK_GUID \\\n- { 0x605dab50, 0xe046, 0x4300, \\\n- { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n- }\n-\n-struct grub_efi_shim_lock_protocol\n-{\n- grub_efi_status_t\n- (verify) (void buffer, grub_uint32_t size);\n-};\n-typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n-\n static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\n static grub_efi_shim_lock_protocol_t sl;\n \ndiff --git a/include/grub/efi/api.h b/include/grub/efi/api.h\nindex 21efee3f3..b5cef9a88 100644\n--- a/include/grub/efi/api.h\n+++ b/include/grub/efi/api.h\n@@ -316,22 +316,27 @@\n \n #define GRUB_EFI_SAL_TABLE_GUID \\\n { 0xeb9d2d32, 0x2d88, 0x11d3, \\\n- { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n+ { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n \n #define GRUB_EFI_HCDP_TABLE_GUID \\\n { 0xf951938d, 0x620b, 0x42ef, \\\n- { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \\\n+ { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \\\n }\n \n #define GRUB_EFI_DEVICE_TREE_GUID \\\n { 0xb1b621d5, 0xf19c, 0x41a5, \\\n- { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \\\n+ { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \\\n }\n \n #define GRUB_EFI_VENDOR_APPLE_GUID \\\n { 0x2B0585EB, 0xD8B8, 0x49A9,\t\\\n- { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \\\n+ { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \\\n+ }\n+\n+#define GRUB_EFI_SHIM_LOCK_GUID \\\n+ { 0x605dab50, 0xe046, 0x4300, \\\n+ { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n }\n \n #define GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID \\\n@@ -1970,6 +1975,12 @@ struct grub_efi_ip6_config_manual_address {\n };\n typedef struct grub_efi_ip6_config_manual_address grub_efi_ip6_config_manual_address_t;\n \n+struct grub_efi_shim_lock_protocol\n+{\n+ grub_efi_status_t (verify) (void buffer, grub_uint32_t size);\n+};\n+typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n+\n #if (GRUB_TARGET_SIZEOF_VOID_P == 4) \|\| defined (__ia64__) \\\n \|\| defined (__aarch64__) \|\| defined (__MINGW64__) \|\| defined (__CYGWIN__) \\\n \|\| defined(__riscv)\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 5a21320931e16618f304253a48b109b0c8a72e5e Mon Sep 17 00:00:00 2001\nFrom: Daniel Kiper <daniel.kiper@oracle.com>\nDate: Thu, 3 Dec 2020 16:01:45 +0100\nSubject: [PATCH 02/45] efi: Make shim_lock GUID and protocol type public\n\nThe GUID will be used to properly detect and report UEFI Secure Boot\nstatus to the x86 Linux kernel. The functionality will be added by\nsubsequent patches. The shim_lock protocol type is made public for\ncompleteness.\n\nAdditionally, fix formatting of four preceding GUIDs.\n\nSigned-off-by: Daniel Kiper <daniel.kiper@oracle.com>\nSigned-off-by: Marco A Benatto <mbenatto@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/efi/shim_lock.c \| 12 ------------\n include/grub/efi/api.h \| 19 +++++++++++++++----\n 2 files changed, 15 insertions(+), 16 deletions(-)\n\ndiff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c\nindex 764098cfc..d8f52d721 100644\n--- a/grub-core/commands/efi/shim_lock.c\n+++ b/grub-core/commands/efi/shim_lock.c\n@@ -27,18 +27,6 @@\n \n GRUB_MOD_LICENSE (\"GPLv3+\");\n \n-#define GRUB_EFI_SHIM_LOCK_GUID \\\n- { 0x605dab50, 0xe046, 0x4300, \\\n- { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n- }\n-\n-struct grub_efi_shim_lock_protocol\n-{\n- grub_efi_status_t\n- (verify) (void buffer, grub_uint32_t size);\n-};\n-typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n-\n static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID;\n static grub_efi_shim_lock_protocol_t sl;\n \ndiff --git a/include/grub/efi/api.h b/include/grub/efi/api.h\nindex 21efee3f3..b5cef9a88 100644\n--- a/include/grub/efi/api.h\n+++ b/include/grub/efi/api.h\n@@ -316,22 +316,27 @@\n \n #define GRUB_EFI_SAL_TABLE_GUID \\\n { 0xeb9d2d32, 0x2d88, 0x11d3, \\\n- { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n+ { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\\n }\n \n #define GRUB_EFI_HCDP_TABLE_GUID \\\n { 0xf951938d, 0x620b, 0x42ef, \\\n- { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \\\n+ { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \\\n }\n \n #define GRUB_EFI_DEVICE_TREE_GUID \\\n { 0xb1b621d5, 0xf19c, 0x41a5, \\\n- { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \\\n+ { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \\\n }\n \n #define GRUB_EFI_VENDOR_APPLE_GUID \\\n { 0x2B0585EB, 0xD8B8, 0x49A9,\t\\\n- { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \\\n+ { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \\\n+ }\n+\n+#define GRUB_EFI_SHIM_LOCK_GUID \\\n+ { 0x605dab50, 0xe046, 0x4300, \\\n+ { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \\\n }\n \n #define GRUB_EFI_IP4_CONFIG2_PROTOCOL_GUID \\\n@@ -1970,6 +1975,12 @@ struct grub_efi_ip6_config_manual_address {\n };\n typedef struct grub_efi_ip6_config_manual_address grub_efi_ip6_config_manual_address_t;\n \n+struct grub_efi_shim_lock_protocol\n+{\n+ grub_efi_status_t (verify) (void *buffer, grub_uint32_t size);\n+};\n+typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t;\n+\n #if (GRUB_TARGET_SIZEOF_VOID_P == 4) \|\| defined (__ia64__) \\\n \|\| defined (__aarch64__) \|\| defined (__MINGW64__) \|\| defined (__CYGWIN__) \\\n \|\| defined(__riscv)\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0002-efi-Make-shim_lock-GUID-and-protocol-type-public.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0002-efi-Make-shim_lock-GUID-and-protocol-type-public.patch", "tier": "identical", "language": "c", "patch_lines_changed": 32, "patch_files_count": 2, "total_tokens_est": 1784, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nefi: Return grub_efi_status_t from\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/commands/efi/efifwsetup.c\n- grub-core/kern/efi/efi.c\n- grub-core/video/efi_gop.c\n- include/grub/efi/efi.h\n\n## Target Source Code\n\n### grub-core/commands/efi/efifwsetup.c\n\n#### grub_cmd_fwsetup() [lines 28-57]\n```c\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\nstatic grub_err_t\ngrub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),\n\t\t int argc __attribute__ ((unused)),\n\t\t char *args __attribute__ ((unused)))\n{\n grub_efi_uint64_t old_os_indications;\n grub_efi_uint64_t os_indications = GRUB_EFI_OS_INDICATIONS_BOOT_TO_FW_UI;\n grub_err_t status;\n grub_size_t oi_size;\n grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n\n old_os_indications = grub_efi_get_variable (\"OsIndications\", &global,\n\t\t\t\t\t &oi_size);\n\n if (old_os_indications != NULL && oi_size == sizeof (os_indications))\n os_indications \|= old_os_indications;\n\n status = grub_efi_set_variable (\"OsIndications\", &global, &os_indications,\n\t\t\t\t sizeof (os_indications));\n if (status != GRUB_ERR_NONE)\n return status;\n\n grub_reboot ();\n\n return GRUB_ERR_BUG;\n}\n\nstatic grub_command_t cmd = NULL;\n```\n\n#### efifwsetup_is_supported() [lines 57-78]\n```c\nstatic grub_command_t cmd = NULL;\n\nstatic grub_efi_boolean_t\nefifwsetup_is_supported (void)\n{\n grub_efi_uint64_t os_indications_supported = NULL;\n grub_size_t oi_size = 0;\n grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n\n os_indications_supported = grub_efi_get_variable (\"OsIndicationsSupported\",\n\t\t\t\t\t\t &global, &oi_size);\n\n if (!os_indications_supported)\n return 0;\n\n if (os_indications_supported & GRUB_EFI_OS_INDICATIONS_BOOT_TO_FW_UI)\n return 1;\n\n return 0;\n}\n\nGRUB_MOD_INIT (efifwsetup)\n```\n\n### grub-core/kern/efi/efi.c\n\n#### grub_efi_set_variable() [lines 192-225]\n```c\n}\n\ngrub_err_t\ngrub_efi_set_variable(const char var, const grub_efi_guid_t guid,\n\t\t void data, grub_size_t datasize)\n{\n grub_efi_status_t status;\n grub_efi_runtime_services_t r;\n grub_efi_char16_t var16;\n grub_size_t len, len16;\n\n len = grub_strlen (var);\n len16 = len * GRUB_MAX_UTF16_PER_UTF8;\n var16 = grub_malloc ((len16 + 1) * sizeof (var16[0]));\n if (!var16)\n return grub_errno;\n len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t ) var, len, NULL);\n var16[len16] = 0;\n\n r = grub_efi_system_table->runtime_services;\n\n status = efi_call_5 (r->set_variable, var16, guid, \n\t\t (GRUB_EFI_VARIABLE_NON_VOLATILE\n\t\t\t\| GRUB_EFI_VARIABLE_BOOTSERVICE_ACCESS\n\t\t\t\| GRUB_EFI_VARIABLE_RUNTIME_ACCESS),\n\t\t datasize, data);\n grub_free (var16);\n if (status == GRUB_EFI_SUCCESS)\n return GRUB_ERR_NONE;\n\n return grub_error (GRUB_ERR_IO, \"could not set EFI variable `%s'\", var);\n}\n\nvoid \n```\n\n#### grub_efi_get_variable() [lines 223-276]\n```c\n}\n\nvoid \ngrub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n\t\t grub_size_t datasize_out)\n{\n grub_efi_status_t status;\n grub_efi_uintn_t datasize = 0;\n grub_efi_runtime_services_t r;\n grub_efi_char16_t var16;\n void data;\n grub_size_t len, len16;\n\n datasize_out = 0;\n\n len = grub_strlen (var);\n len16 = len * GRUB_MAX_UTF16_PER_UTF8;\n var16 = grub_malloc ((len16 + 1) * sizeof (var16[0]));\n if (!var16)\n return NULL;\n len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t ) var, len, NULL);\n var16[len16] = 0;\n\n r = grub_efi_system_table->runtime_services;\n\n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, NULL);\n\n if (status != GRUB_EFI_BUFFER_TOO_SMALL \|\| !datasize)\n {\n grub_free (var16);\n return NULL;\n }\n\n data = grub_malloc (datasize);\n if (!data)\n {\n grub_free (var16);\n return NULL;\n }\n\n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);\n grub_free (var16);\n\n if (status == GRUB_EFI_SUCCESS)\n {\n datasize_out = datasize;\n return data;\n }\n\n grub_free (data);\n return NULL;\n}\n\n#pragma GCC diagnostic ignored \"-Wcast-align\"\n```\n\n### grub-core/video/efi_gop.c\n\n#### grub_video_gop_get_edid() [lines 290-332]\n```c\n}\n\nstatic grub_err_t\ngrub_video_gop_get_edid (struct grub_video_edid_info edid_info)\n{\n struct grub_efi_active_edid edid;\n grub_size_t copy_size;\n\n grub_memset (edid_info, 0, sizeof (edid_info));\n\n edid = grub_efi_open_protocol (gop_handle, &active_edid_guid,\n\t\t\t\t GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);\n if (!edid \|\| edid->size_of_edid == 0)\n edid = grub_efi_open_protocol (gop_handle, &discovered_edid_guid,\n\t\t\t\t GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);\n\n if (!edid \|\| edid->size_of_edid == 0)\n {\n char edidname[] = \"agp-internal-edid\";\n grub_size_t datasize;\n grub_uint8_t data;\n data = grub_efi_get_variable (edidname, &efi_var_guid, &datasize);\n if (data && datasize > 16)\n\t{\n\t copy_size = datasize - 16;\n\t if (copy_size > sizeof (edid_info))\n\t copy_size = sizeof (edid_info);\n\t grub_memcpy (edid_info, data + 16, copy_size);\n\t grub_free (data);\n\t return GRUB_ERR_NONE;\n\t}\n return grub_error (GRUB_ERR_BAD_DEVICE, \"EDID information not available\");\n }\n\n copy_size = edid->size_of_edid;\n if (copy_size > sizeof (edid_info))\n copy_size = sizeof (edid_info);\n grub_memcpy (edid_info, edid->edid, copy_size);\n\n return GRUB_ERR_NONE;\n}\n\nstatic grub_err_t\n```\n\n### include/grub/efi/efi.h\n\n#### EXPORT_FUNC() [lines 28-122]\n```c\nvoid EXPORT_FUNC(grub_efi_locate_protocol) (grub_efi_guid_t protocol,\n\t\t\t\t\t void registration);\ngrub_efi_handle_t \nEXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type,\n\t\t\t\t grub_efi_guid_t protocol,\n\t\t\t\t void search_key,\n\t\t\t\t grub_efi_uintn_t num_handles);\nvoid EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,\n\t\t\t\t\t grub_efi_guid_t protocol,\n\t\t\t\t\t grub_efi_uint32_t attributes);\nint EXPORT_FUNC(grub_efi_set_text_mode) (int on);\nvoid EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);\nvoid \nEXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages,\n\t\t\t\t\t grub_efi_allocate_type_t alloctype,\n\t\t\t\t\t grub_efi_memory_type_t memtype);\nvoid \nEXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages);\nvoid \nEXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);\nvoid EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages);\ngrub_efi_uintn_t EXPORT_FUNC(grub_efi_find_mmap_size) (void);\nint\nEXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t memory_map_size,\n\t\t\t\t grub_efi_memory_descriptor_t memory_map,\n\t\t\t\t grub_efi_uintn_t map_key,\n\t\t\t\t grub_efi_uintn_t descriptor_size,\n\t\t\t\t grub_efi_uint32_t descriptor_version);\nvoid grub_efi_memory_fini (void);\ngrub_efi_loaded_image_t EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);\nvoid EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t dp);\nchar EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t dp);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_get_device_path) (grub_efi_handle_t handle);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_find_last_device_path) (const grub_efi_device_path_t dp);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_duplicate_device_path) (const grub_efi_device_path_t dp);\ngrub_err_t EXPORT_FUNC (grub_efi_finish_boot_services) (grub_efi_uintn_t outbuf_size, void outbuf,\n\t\t\t\t\t\t\tgrub_efi_uintn_t map_key,\n\t\t\t\t\t\t\tgrub_efi_uintn_t efi_desc_size,\n\t\t\t\t\t\t\tgrub_efi_uint32_t efi_desc_version);\ngrub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memory_map_size,\n\t\t\t\t\t\t\t grub_efi_uintn_t descriptor_size,\n\t\t\t\t\t\t\t grub_efi_uint32_t descriptor_version,\n\t\t\t\t\t\t\t grub_efi_memory_descriptor_t virtual_map);\nvoid EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n\t\t\t\t\t const grub_efi_guid_t guid,\n\t\t\t\t\t grub_size_t datasize_out);\ngrub_err_t\nEXPORT_FUNC (grub_efi_set_variable) (const char var,\n\t\t\t\t const grub_efi_guid_t guid,\n\t\t\t\t void data,\n\t\t\t\t grub_size_t datasize);\nint\nEXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n\t\t\t\t\t const grub_efi_device_path_t dp2);\n\nextern void (EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, \n\t\t\t\t\t\tchar device,\n\t\t\t\t\t\tchar path);\n\n#if defined(__arm__) \|\| defined(__aarch64__) \|\| defined(__riscv)\nvoid EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);\ngrub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub\n/ ... truncated ... /\n```\n\n\n## Upstream Fix\n```diff\nFrom 9a3e7a102166f0a5ae35df1e5c59b37991a15776 Mon Sep 17 00:00:00 2001\nFrom: Daniel Kiper <daniel.kiper@oracle.com>\nDate: Thu, 3 Dec 2020 16:01:46 +0100\nSubject: [PATCH 03/45] efi: Return grub_efi_status_t from\n grub_efi_get_variable()\n\nThis is needed to properly detect and report UEFI Secure Boot status\nto the x86 Linux kernel. The functionality will be added by subsequent\npatches.\n\nSigned-off-by: Daniel Kiper <daniel.kiper@oracle.com>\nSigned-off-by: Marco A Benatto <mbenatto@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/efi/efifwsetup.c \| 8 ++++----\n grub-core/kern/efi/efi.c \| 16 +++++++++-------\n grub-core/video/efi_gop.c \| 2 +-\n include/grub/efi/efi.h \| 7 ++++---\n 4 files changed, 18 insertions(+), 15 deletions(-)\n\ndiff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c\nindex 7a137a72a..eaca03283 100644\n--- a/grub-core/commands/efi/efifwsetup.c\n+++ b/grub-core/commands/efi/efifwsetup.c\n@@ -38,8 +38,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),\n grub_size_t oi_size;\n grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n \n- old_os_indications = grub_efi_get_variable (\"OsIndications\", &global,\n-\t\t\t\t\t &oi_size);\n+ grub_efi_get_variable (\"OsIndications\", &global, &oi_size,\n+\t\t\t (void ) &old_os_indications);\n \n if (old_os_indications != NULL && oi_size == sizeof (os_indications))\n os_indications \|= old_os_indications;\n@@ -63,8 +63,8 @@ efifwsetup_is_supported (void)\n grub_size_t oi_size = 0;\n grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n \n- os_indications_supported = grub_efi_get_variable (\"OsIndicationsSupported\",\n-\t\t\t\t\t\t &global, &oi_size);\n+ grub_efi_get_variable (\"OsIndicationsSupported\", &global, &oi_size,\n+\t\t\t (void *) &os_indications_supported);\n \n if (!os_indications_supported)\n return 0;\ndiff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c\nindex 02d298b0c..9fd136694 100644\n--- a/grub-core/kern/efi/efi.c\n+++ b/grub-core/kern/efi/efi.c\n@@ -222,9 +222,9 @@ grub_efi_set_variable(const char var, const grub_efi_guid_t guid,\n return grub_error (GRUB_ERR_IO, \"could not set EFI variable `%s'\", var);\n }\n \n-void \n+grub_efi_status_t\n grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n-\t\t grub_size_t datasize_out)\n+\t\t grub_size_t datasize_out, void *data_out)\n {\n grub_efi_status_t status;\n grub_efi_uintn_t datasize = 0;\n@@ -233,13 +233,14 @@ grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n void data;\n grub_size_t len, len16;\n \n+ data_out = NULL;\n datasize_out = 0;\n \n len = grub_strlen (var);\n len16 = len * GRUB_MAX_UTF16_PER_UTF8;\n var16 = grub_calloc (len16 + 1, sizeof (var16[0]));\n if (!var16)\n- return NULL;\n+ return GRUB_EFI_OUT_OF_RESOURCES;\n len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t ) var, len, NULL);\n var16[len16] = 0;\n \n@@ -250,14 +251,14 @@ grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n if (status != GRUB_EFI_BUFFER_TOO_SMALL \|\| !datasize)\n {\n grub_free (var16);\n- return NULL;\n+ return status;\n }\n \n data = grub_malloc (datasize);\n if (!data)\n {\n grub_free (var16);\n- return NULL;\n+ return GRUB_EFI_OUT_OF_RESOURCES;\n }\n \n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);\n@@ -265,12 +266,13 @@ grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n \n if (status == GRUB_EFI_SUCCESS)\n {\n+ data_out = data;\n datasize_out = datasize;\n- return data;\n+ return status;\n }\n \n grub_free (data);\n- return NULL;\n+ return status;\n }\n \n grub_efi_boolean_t\ndiff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c\nindex df29853f0..962f0eb8f 100644\n--- a/grub-core/video/efi_gop.c\n+++ b/grub-core/video/efi_gop.c\n@@ -310,7 +310,7 @@ grub_video_gop_get_edid (struct grub_video_edid_info edid_info)\n char edidname[] = \"agp-internal-edid\";\n grub_size_t datasize;\n grub_uint8_t data;\n- data = grub_efi_get_variable (edidname, &efi_var_guid, &datasize);\n+ grub_efi_get_variable (edidname, &efi_var_guid, &datasize, (void ) &data);\n if (data && datasize > 16)\n \t{\n \t copy_size = datasize - 16;\ndiff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h\nindex 085ee0524..f27d3a365 100644\n--- a/include/grub/efi/efi.h\n+++ b/include/grub/efi/efi.h\n@@ -77,9 +77,10 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo\n \t\t\t\t\t\t\t grub_efi_uintn_t descriptor_size,\n \t\t\t\t\t\t\t grub_efi_uint32_t descriptor_version,\n \t\t\t\t\t\t\t grub_efi_memory_descriptor_t virtual_map);\n-void EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n-\t\t\t\t\t const grub_efi_guid_t guid,\n-\t\t\t\t\t grub_size_t datasize_out);\n+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n+\t\t\t\t\t\t const grub_efi_guid_t guid,\n+\t\t\t\t\t\t grub_size_t datasize_out,\n+\t\t\t\t\t\t void data_out);\n grub_err_t\n EXPORT_FUNC (grub_efi_set_variable) (const char var,\n \t\t\t\t const grub_efi_guid_t guid,\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 9a3e7a102166f0a5ae35df1e5c59b37991a15776 Mon Sep 17 00:00:00 2001\nFrom: Daniel Kiper <daniel.kiper@oracle.com>\nDate: Thu, 3 Dec 2020 16:01:46 +0100\nSubject: [PATCH 03/45] efi: Return grub_efi_status_t from\n grub_efi_get_variable()\n\nThis is needed to properly detect and report UEFI Secure Boot status\nto the x86 Linux kernel. The functionality will be added by subsequent\npatches.\n\nSigned-off-by: Daniel Kiper <daniel.kiper@oracle.com>\nSigned-off-by: Marco A Benatto <mbenatto@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/efi/efifwsetup.c \| 8 ++++----\n grub-core/kern/efi/efi.c \| 16 +++++++++-------\n grub-core/video/efi_gop.c \| 2 +-\n include/grub/efi/efi.h \| 7 ++++---\n 4 files changed, 18 insertions(+), 15 deletions(-)\n\ndiff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c\nindex 7a137a72a..eaca03283 100644\n--- a/grub-core/commands/efi/efifwsetup.c\n+++ b/grub-core/commands/efi/efifwsetup.c\n@@ -38,8 +38,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),\n grub_size_t oi_size;\n grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n \n- old_os_indications = grub_efi_get_variable (\"OsIndications\", &global,\n-\t\t\t\t\t &oi_size);\n+ grub_efi_get_variable (\"OsIndications\", &global, &oi_size,\n+\t\t\t (void ) &old_os_indications);\n \n if (old_os_indications != NULL && oi_size == sizeof (os_indications))\n os_indications \|= old_os_indications;\n@@ -63,8 +63,8 @@ efifwsetup_is_supported (void)\n grub_size_t oi_size = 0;\n grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n \n- os_indications_supported = grub_efi_get_variable (\"OsIndicationsSupported\",\n-\t\t\t\t\t\t &global, &oi_size);\n+ grub_efi_get_variable (\"OsIndicationsSupported\", &global, &oi_size,\n+\t\t\t (void *) &os_indications_supported);\n \n if (!os_indications_supported)\n return 0;\ndiff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c\nindex 02d298b0c..9fd136694 100644\n--- a/grub-core/kern/efi/efi.c\n+++ b/grub-core/kern/efi/efi.c\n@@ -222,9 +222,9 @@ grub_efi_set_variable(const char var, const grub_efi_guid_t guid,\n return grub_error (GRUB_ERR_IO, \"could not set EFI variable `%s'\", var);\n }\n \n-void \n+grub_efi_status_t\n grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n-\t\t grub_size_t datasize_out)\n+\t\t grub_size_t datasize_out, void *data_out)\n {\n grub_efi_status_t status;\n grub_efi_uintn_t datasize = 0;\n@@ -233,13 +233,14 @@ grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n void data;\n grub_size_t len, len16;\n \n+ data_out = NULL;\n datasize_out = 0;\n \n len = grub_strlen (var);\n len16 = len * GRUB_MAX_UTF16_PER_UTF8;\n var16 = grub_calloc (len16 + 1, sizeof (var16[0]));\n if (!var16)\n- return NULL;\n+ return GRUB_EFI_OUT_OF_RESOURCES;\n len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t ) var, len, NULL);\n var16[len16] = 0;\n \n@@ -250,14 +251,14 @@ grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n if (status != GRUB_EFI_BUFFER_TOO_SMALL \|\| !datasize)\n {\n grub_free (var16);\n- return NULL;\n+ return status;\n }\n \n data = grub_malloc (datasize);\n if (!data)\n {\n grub_free (var16);\n- return NULL;\n+ return GRUB_EFI_OUT_OF_RESOURCES;\n }\n \n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);\n@@ -265,12 +266,13 @@ grub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n \n if (status == GRUB_EFI_SUCCESS)\n {\n+ data_out = data;\n datasize_out = datasize;\n- return data;\n+ return status;\n }\n \n grub_free (data);\n- return NULL;\n+ return status;\n }\n \n grub_efi_boolean_t\ndiff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c\nindex df29853f0..962f0eb8f 100644\n--- a/grub-core/video/efi_gop.c\n+++ b/grub-core/video/efi_gop.c\n@@ -310,7 +310,7 @@ grub_video_gop_get_edid (struct grub_video_edid_info edid_info)\n char edidname[] = \"agp-internal-edid\";\n grub_size_t datasize;\n grub_uint8_t data;\n- data = grub_efi_get_variable (edidname, &efi_var_guid, &datasize);\n+ grub_efi_get_variable (edidname, &efi_var_guid, &datasize, (void ) &data);\n if (data && datasize > 16)\n \t{\n \t copy_size = datasize - 16;\ndiff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h\nindex 085ee0524..f27d3a365 100644\n--- a/include/grub/efi/efi.h\n+++ b/include/grub/efi/efi.h\n@@ -77,9 +77,10 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo\n \t\t\t\t\t\t\t grub_efi_uintn_t descriptor_size,\n \t\t\t\t\t\t\t grub_efi_uint32_t descriptor_version,\n \t\t\t\t\t\t\t grub_efi_memory_descriptor_t virtual_map);\n-void EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n-\t\t\t\t\t const grub_efi_guid_t guid,\n-\t\t\t\t\t grub_size_t datasize_out);\n+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n+\t\t\t\t\t\t const grub_efi_guid_t guid,\n+\t\t\t\t\t\t grub_size_t datasize_out,\n+\t\t\t\t\t\t void data_out);\n grub_err_t\n EXPORT_FUNC (grub_efi_set_variable) (const char var,\n \t\t\t\t const grub_efi_guid_t *guid,\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0003-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0003-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch", "tier": "identical", "language": "c", "patch_lines_changed": 34, "patch_files_count": 4, "total_tokens_est": 2795, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nFrom: Raymund Will <rw@suse.com>\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.04~rc1/grub-core/loader/efi/chainloader.c\n\n## Target Source Code\n\n### grub-core/loader/efi/chainloader.c\n\n#### grub_cmd_chainloader() [lines 198-416]\n```c\n}\n\nstatic grub_err_t\ngrub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),\n\t\t int argc, char argv[])\n{\n grub_file_t file = 0;\n grub_ssize_t size;\n grub_efi_status_t status;\n grub_efi_boot_services_t b;\n grub_device_t dev = 0;\n grub_efi_device_path_t dp = 0;\n grub_efi_loaded_image_t loaded_image;\n char filename;\n void boot_image = 0;\n grub_efi_handle_t dev_handle = 0;\n\n if (argc == 0)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, N_(\"filename expected\"));\n filename = argv[0];\n\n grub_dl_ref (my_mod);\n\n /* Initialize some global variables. /\n address = 0;\n image_handle = 0;\n file_path = 0;\n\n b = grub_efi_system_table->boot_services;\n\n file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);\n if (! file)\n goto fail;\n\n / Get the root device's device path. /\n dev = grub_device_open (0);\n if (! dev)\n goto fail;\n\n if (dev->disk)\n/ ... 467 lines omitted ... /\n```\n\n\n## Upstream Fix\n```diff\nFrom: Raymund Will <rw@suse.com>\nSubject: Use device part of chainloader target, if present.\nReferences: bnc#871857, bnc#880177\nPatch-Mainline: no\n\nOtherwise chainloading is restricted to '$root', which might not even\nbe readable by EFI!\n\nv1. use grub_file_get_device_name() to get device name\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n\n---\n grub-core/loader/efi/chainloader.c \| 17 ++++++++++++++++-\n 1 file changed, 16 insertions(+), 1 deletion(-)\n\nIndex: grub-2.04~rc1/grub-core/loader/efi/chainloader.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/loader/efi/chainloader.c\n+++ grub-2.04~rc1/grub-core/loader/efi/chainloader.c\n@@ -714,12 +714,16 @@ grub_cmd_chainloader (grub_command_t cmd\n (--p16) = 0;\n }\n \n+ grub_dprintf (\"chain\", \"cmd='%s'\\n\", filename);\n file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);\n if (! file)\n goto fail;\n \n- /* Get the root device's device path. /\n- dev = grub_device_open (0);\n+ / Get the device path from filename. /\n+ char devname = grub_file_get_device_name (filename);\n+ dev = grub_device_open (devname);\n+ if (devname)\n+ grub_free (devname);\n if (! dev)\n goto fail;\n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From: Raymund Will <rw@suse.com>\nSubject: Use device part of chainloader target, if present.\nReferences: bnc#871857, bnc#880177\nPatch-Mainline: no\n\nOtherwise chainloading is restricted to '$root', which might not even\nbe readable by EFI!\n\nv1. use grub_file_get_device_name() to get device name\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n\n---\n grub-core/loader/efi/chainloader.c \| 17 ++++++++++++++++-\n 1 file changed, 16 insertions(+), 1 deletion(-)\n\nIndex: grub-2.04~rc1/grub-core/loader/efi/chainloader.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/loader/efi/chainloader.c\n+++ grub-2.04~rc1/grub-core/loader/efi/chainloader.c\n@@ -714,12 +714,16 @@ grub_cmd_chainloader (grub_command_t cmd\n (--p16) = 0;\n }\n \n+ grub_dprintf (\"chain\", \"cmd='%s'\\n\", filename);\n file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);\n if (! file)\n goto fail;\n \n- / Get the root device's device path. /\n- dev = grub_device_open (0);\n+ / Get the device path from filename. /\n+ char devname = grub_file_get_device_name (filename);\n+ dev = grub_device_open (devname);\n+ if (devname)\n+ grub_free (devname);\n if (! dev)\n goto fail;\n \n" } ]	{ "id": "grub2-15947-grub2-efi-chainloader-root.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-efi-chainloader-root.patch", "tier": "identical", "language": "c", "patch_lines_changed": 8, "patch_files_count": 1, "total_tokens_est": 770, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ngdb: Restrict GDB access when locked down\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/gdb/gdb.c\n\n## Target Source Code\n\n### grub-core/gdb/gdb.c\n\n#### region() [lines 26-101]\n```c\n#include <grub/normal.h>\n#include <grub/term.h>\n#include <grub/cpu/gdb.h>\n#include <grub/gdb.h>\n#include <grub/serial.h>\n#include <grub/i18n.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\nstatic grub_err_t\ngrub_cmd_gdbstub (struct grub_command cmd __attribute__ ((unused)),\n\t\t int argc, char args)\n{\n struct grub_serial_port port;\n if (argc < 1)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"port required\");\n port = grub_serial_find (args[0]);\n if (!port)\n return grub_errno;\n grub_gdb_port = port;\n /* TRANSLATORS: at this position GRUB waits for the user to do an action\n in remote debugger, namely to tell it to establish connection. /\n grub_puts_ (N_(\"Now connect the remote debugger, please.\"));\n grub_gdb_breakpoint ();\n return 0;\n}\n\nstatic grub_err_t\ngrub_cmd_gdbstop (struct grub_command cmd __attribute__ ((unused)),\n\t\t int argc __attribute__ ((unused)),\n\t\t char *args __attribute__ ((unused)))\n{\n grub_gdb_port = NULL;\n return 0;\n}\n\nstatic grub_err_t\ngrub_cmd_gdb_break (struct grub_command cmd __attribute__ ((unused)),\n\t\t int argc __attribute__ ((unused)),\n\t\t char *args __attribute__ ((unused)))\n{\n if (!grub_gdb_port)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"No GDB stub is running\");\n grub_gdb_breakpoint ();\n return 0;\n}\n\nstatic grub_command_t cmd, cmd_stop, cmd_break;\n\nGRUB_MOD_INIT (gdb)\n{\n grub_gdb_idtinit ();\n cmd = grub_register_command (\"gdbstub\", grub_cmd_gdbstub,\n\t\t\t N_(\"PORT\"), \n\t\t\t / TRANSLATORS: GDB stub is a small part of\n\t\t\t\t GDB functionality running on local host\n\t\t\t\t which allows remote debugger to\n\t\t\t\t connect to it. /\n\t\t\t N_(\"Start GDB stub on given port\"));\n cmd_break = grub_register_command (\"gdbstub_break\", grub_cmd_gdb_break,\n\t\t\t\t / TRANSLATORS: this refers to triggering\n\t\t\t\t\ta breakpoint so that the user will land\n\t\t\t\t\tinto GDB. /\n\t\t\t\t 0, N_(\"Break into GDB\"));\n cmd_stop = grub_register_command (\"gdbstub_stop\", grub_cmd_gdbstop,\n\t\t\t\t 0, N_(\"Stop GDB stub\"));\n}\n\nGRUB_MOD_FINI (gdb)\n{\n grub_unregister_command (cmd);\n grub_unregister_command (cmd_stop);\n grub_gdb_idtrestore ();\n}\n\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 0e482928c919319482419c964f1db34e6595a961 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 24 Feb 2021 15:03:26 +0100\nSubject: [PATCH 18/45] gdb: Restrict GDB access when locked down\n\nThe gdbstub commands allow to start and control a GDB stub running on\nlocal host that can be used to connect from a remote debugger. Restrict\nthis functionality when the GRUB is locked down.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/gdb/gdb.c \| 32 ++++++++++++++++++--------------\n 1 file changed, 18 insertions(+), 14 deletions(-)\n\ndiff --git a/grub-core/gdb/gdb.c b/grub-core/gdb/gdb.c\nindex 847a1e1e3..1818cb6f8 100644\n--- a/grub-core/gdb/gdb.c\n+++ b/grub-core/gdb/gdb.c\n@@ -75,20 +75,24 @@ static grub_command_t cmd, cmd_stop, cmd_break;\n GRUB_MOD_INIT (gdb)\n {\n grub_gdb_idtinit ();\n- cmd = grub_register_command (\"gdbstub\", grub_cmd_gdbstub,\n-\t\t\t N_(\"PORT\"), \n-\t\t\t /* TRANSLATORS: GDB stub is a small part of\n-\t\t\t\t GDB functionality running on local host\n-\t\t\t\t which allows remote debugger to\n-\t\t\t\t connect to it. /\n-\t\t\t N_(\"Start GDB stub on given port\"));\n- cmd_break = grub_register_command (\"gdbstub_break\", grub_cmd_gdb_break,\n-\t\t\t\t / TRANSLATORS: this refers to triggering\n-\t\t\t\t\ta breakpoint so that the user will land\n-\t\t\t\t\tinto GDB. /\n-\t\t\t\t 0, N_(\"Break into GDB\"));\n- cmd_stop = grub_register_command (\"gdbstub_stop\", grub_cmd_gdbstop,\n-\t\t\t\t 0, N_(\"Stop GDB stub\"));\n+ cmd = grub_register_command_lockdown (\"gdbstub\", grub_cmd_gdbstub,\n+\t\t\t\t\tN_(\"PORT\"),\n+\t\t\t\t\t/\n+\t\t\t\t\t * TRANSLATORS: GDB stub is a small part of\n+\t\t\t\t\t * GDB functionality running on local host\n+\t\t\t\t\t * which allows remote debugger to\n+\t\t\t\t\t * connect to it.\n+\t\t\t\t\t /\n+\t\t\t\t\tN_(\"Start GDB stub on given port\"));\n+ cmd_break = grub_register_command_lockdown (\"gdbstub_break\", grub_cmd_gdb_break,\n+\t\t\t\t\t /\n+\t\t\t\t\t * TRANSLATORS: this refers to triggering\n+\t\t\t\t\t * a breakpoint so that the user will land\n+\t\t\t\t\t * into GDB.\n+\t\t\t\t\t /\n+\t\t\t\t\t 0, N_(\"Break into GDB\"));\n+ cmd_stop = grub_register_command_lockdown (\"gdbstub_stop\", grub_cmd_gdbstop,\n+\t\t\t\t\t 0, N_(\"Stop GDB stub\"));\n }\n \n GRUB_MOD_FINI (gdb)\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 0e482928c919319482419c964f1db34e6595a961 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 24 Feb 2021 15:03:26 +0100\nSubject: [PATCH 18/45] gdb: Restrict GDB access when locked down\n\nThe gdbstub commands allow to start and control a GDB stub running on\nlocal host that can be used to connect from a remote debugger. Restrict\nthis functionality when the GRUB is locked down.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/gdb/gdb.c \| 32 ++++++++++++++++++--------------\n 1 file changed, 18 insertions(+), 14 deletions(-)\n\ndiff --git a/grub-core/gdb/gdb.c b/grub-core/gdb/gdb.c\nindex 847a1e1e3..1818cb6f8 100644\n--- a/grub-core/gdb/gdb.c\n+++ b/grub-core/gdb/gdb.c\n@@ -75,20 +75,24 @@ static grub_command_t cmd, cmd_stop, cmd_break;\n GRUB_MOD_INIT (gdb)\n {\n grub_gdb_idtinit ();\n- cmd = grub_register_command (\"gdbstub\", grub_cmd_gdbstub,\n-\t\t\t N_(\"PORT\"), \n-\t\t\t /* TRANSLATORS: GDB stub is a small part of\n-\t\t\t\t GDB functionality running on local host\n-\t\t\t\t which allows remote debugger to\n-\t\t\t\t connect to it. /\n-\t\t\t N_(\"Start GDB stub on given port\"));\n- cmd_break = grub_register_command (\"gdbstub_break\", grub_cmd_gdb_break,\n-\t\t\t\t / TRANSLATORS: this refers to triggering\n-\t\t\t\t\ta breakpoint so that the user will land\n-\t\t\t\t\tinto GDB. /\n-\t\t\t\t 0, N_(\"Break into GDB\"));\n- cmd_stop = grub_register_command (\"gdbstub_stop\", grub_cmd_gdbstop,\n-\t\t\t\t 0, N_(\"Stop GDB stub\"));\n+ cmd = grub_register_command_lockdown (\"gdbstub\", grub_cmd_gdbstub,\n+\t\t\t\t\tN_(\"PORT\"),\n+\t\t\t\t\t/\n+\t\t\t\t\t * TRANSLATORS: GDB stub is a small part of\n+\t\t\t\t\t * GDB functionality running on local host\n+\t\t\t\t\t * which allows remote debugger to\n+\t\t\t\t\t * connect to it.\n+\t\t\t\t\t /\n+\t\t\t\t\tN_(\"Start GDB stub on given port\"));\n+ cmd_break = grub_register_command_lockdown (\"gdbstub_break\", grub_cmd_gdb_break,\n+\t\t\t\t\t /\n+\t\t\t\t\t * TRANSLATORS: this refers to triggering\n+\t\t\t\t\t * a breakpoint so that the user will land\n+\t\t\t\t\t * into GDB.\n+\t\t\t\t\t */\n+\t\t\t\t\t 0, N_(\"Break into GDB\"));\n+ cmd_stop = grub_register_command_lockdown (\"gdbstub_stop\", grub_cmd_gdbstop,\n+\t\t\t\t\t 0, N_(\"Stop GDB stub\"));\n }\n \n GRUB_MOD_FINI (gdb)\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0018-gdb-Restrict-GDB-access-when-locked-down.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0018-gdb-Restrict-GDB-access-when-locked-down.patch", "tier": "identical", "language": "c", "patch_lines_changed": 33, "patch_files_count": 1, "total_tokens_est": 1295, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nvideo: limit the resolution for fixed bimap font\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/video/efi_gop.c\n- grub-core/video/i386/pc/vbe.c\n\n## Target Source Code\n\n### grub-core/video/efi_gop.c\n\n#### grub_video_gop_setup() [lines 348-526]\n```c\n}\n\nstatic grub_err_t\ngrub_video_gop_setup (unsigned int width, unsigned int height,\n\t\t unsigned int mode_type,\n\t\t unsigned int mode_mask __attribute__ ((unused)))\n{\n unsigned int depth;\n struct grub_efi_gop_mode_info info = NULL;\n unsigned best_mode = 0;\n grub_err_t err;\n unsigned bpp;\n int found = 0;\n unsigned long long best_volume = 0;\n unsigned int preferred_width = 0, preferred_height = 0;\n grub_uint8_t buffer;\n\n depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)\n >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;\n\n if (width == 0 && height == 0)\n {\n err = grub_gop_get_preferred_mode (&preferred_width, &preferred_height);\n if (err \|\| preferred_width >= 4096 \|\| preferred_height >= 4096)\n\t{\n\t preferred_width = 800;\n\t preferred_height = 600;\n\t grub_errno = GRUB_ERR_NONE;\n\t}\n }\n\n /* Keep current mode if possible. /\n if (gop->mode->info)\n {\n bpp = grub_video_gop_get_bpp (gop->mode->info);\n if (bpp && ((width == gop->mode->info->width\n\t\t && height == gop->mode->info->height)\n\t\t \|\| (width == 0 && height == 0))\n\t && (depth == bpp \|\| depth == 0))\n\t{\n/ ... 129 lines omitted ... /\n err = grub_video_fb_set_active_render_target (framebuffer.render_target);\n \n if (err)\n {\n grub_dprintf (\"video\", \"GOP: Couldn't set FB target\\n\");\n return err;\n }\n \n err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,\n\t\t\t\t grub_video_fbstd_colors);\n\n if (err)\n grub_dprintf (\"video\", \"GOP: Couldn't set palette\\n\");\n else\n grub_dprintf (\"video\", \"GOP: Success\\n\");\n \n return err;\n}\n\nstatic grub_err_t\n```\n\n### grub-core/video/i386/pc/vbe.c\n\n#### grub_video_vbe_setup() [lines 975-1151]\n```c\n}\n\nstatic grub_err_t\ngrub_video_vbe_setup (unsigned int width, unsigned int height,\n grub_video_mode_type_t mode_type, \n\t\t grub_video_mode_type_t mode_mask)\n{\n grub_uint16_t p;\n struct grub_vbe_mode_info_block vbe_mode_info;\n struct grub_vbe_mode_info_block best_vbe_mode_info;\n grub_uint32_t best_vbe_mode = 0;\n int depth;\n int preferred_mode = 0;\n\n /* Decode depth from mode_type. If it is zero, then autodetect. /\n depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)\n >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;\n\n if (width == 0 && height == 0)\n {\n grub_vbe_get_preferred_mode (&width, &height);\n if (grub_errno == GRUB_ERR_NONE)\n\tpreferred_mode = 1;\n else\n\t{\n\t / Fall back to 640x480. This is conservative, but the largest\n\t mode supported by the graphics card may not be safe for the\n\t display device. /\n\t grub_errno = GRUB_ERR_NONE;\n\t width = 640;\n\t height = 480;\n\t}\n }\n\n / Walk thru mode list and try to find matching mode. /\n for (p = vbe_mode_list; p != 0xFFFF; p++)\n {\n grub_uint32_t vbe_mode = p;\n\n grub_vbe_get_video_mode_info (vbe_mode, &vbe_mode_info);\n/ ... 120 lines omitted ... /\n\t err = grub_video_fb_setup (mode_type, mode_mask,\n\t\t\t\t &framebuffer.mode_info,\n\t\t\t\t framebuffer.ptr, 0, 0);\n }\n\n / Copy default palette to initialize emulated palette. /\n err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,\n\t\t\t\t grub_video_fbstd_colors);\n\n grub_vbe_enable_mtrr (framebuffer.ptr,\n\t\t\t controller_info.total_memory << 16);\n\n return err;\n }\n\n / Couldn't found matching mode. /\n return grub_error (GRUB_ERR_UNKNOWN_DEVICE, \"no matching mode found\");\n}\n\nstatic grub_err_t\n```\n\n\n## Upstream Fix\n```diff\nFrom 5f7f27d1198ef425f4943cc10132509415bbaf55 Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Thu, 24 Jan 2019 16:41:04 +0800\nSubject: [PATCH] video: limit the resolution for fixed bimap font\n\nAs grub uses fixed bitmap font and also its size is a fixed property, it is not\npossible to accommodate to all resolutions, therefore we raise some limit to\nthe preferred resolution as most themes are designed on popular device and the\nresolution in its prime, which is supposedly Full HD.\n\nThis change also makes grub font readable on hiDPI device without going through\nthe steps in.\n\nhttps://wiki.archlinux.org/index.php/HiDPI#GRUB\n\nv2: efi_gop: Avoid high resolution when trying to keep current mode. \n\n---\n grub-core/video/efi_gop.c \| 7 +++++++\n grub-core/video/i386/pc/vbe.c \| 8 +++++++-\n 2 files changed, 14 insertions(+), 1 deletion(-)\n\nIndex: grub-2.02/grub-core/video/efi_gop.c\n===================================================================\n--- grub-2.02.orig/grub-core/video/efi_gop.c\n+++ grub-2.02/grub-core/video/efi_gop.c\n@@ -360,7 +360,7 @@ grub_video_gop_setup (unsigned int width\n grub_err_t err;\n unsigned bpp;\n int found = 0;\n- int avoid_low_resolution = 1;\n+ int avoid_extreme_resolution = 1;\n unsigned long long best_volume = 0;\n unsigned int preferred_width = 0, preferred_height = 0;\n grub_uint8_t buffer;\n@@ -377,13 +377,21 @@ grub_video_gop_setup (unsigned int width\n \t preferred_height = 600;\n \t grub_errno = GRUB_ERR_NONE;\n \t}\n+ else\n+\t{\n+\t /* Limit the range of preferred resolution not exceeding FHD\n+\t to keep the fixed bitmap font readable /\n+\t preferred_width = (preferred_width < 1920) ? preferred_width : 1920;\n+\t preferred_height = (preferred_height < 1080) ? preferred_height : 1080;\n+\t}\n }\n \n again:\n / Keep current mode if possible. /\n if (gop->mode->info &&\n- (!avoid_low_resolution \|\|\n- (gop->mode->info->width >= 800 && gop->mode->info->height >= 600)))\n+ (!avoid_extreme_resolution \|\|\n+ ((gop->mode->info->width >= 800 && gop->mode->info->height >= 600) &&\n+ (gop->mode->info->width <= 1920 && gop->mode->info->height <= 1080))))\n {\n bpp = grub_video_gop_get_bpp (gop->mode->info);\n if (bpp && ((width == gop->mode->info->width\n@@ -456,9 +464,9 @@ again:\n \n if (!found)\n {\n- if (avoid_low_resolution && gop->mode->info)\n+ if (avoid_extreme_resolution && gop->mode->info)\n {\n- avoid_low_resolution = 0;\n+ avoid_extreme_resolution = 0;\n goto again;\n }\n grub_dprintf (\"video\", \"GOP: no mode found\\n\");\nIndex: grub-2.02/grub-core/video/i386/pc/vbe.c\n===================================================================\n--- grub-2.02.orig/grub-core/video/i386/pc/vbe.c\n+++ grub-2.02/grub-core/video/i386/pc/vbe.c\n@@ -994,7 +994,13 @@ grub_video_vbe_setup (unsigned int width\n {\n grub_vbe_get_preferred_mode (&width, &height);\n if (grub_errno == GRUB_ERR_NONE)\n-\tpreferred_mode = 1;\n+\t{\n+\t preferred_mode = 1;\n+\t / Limit the range of preferred resolution not exceeding FHD\n+\t to keep the fixed bitmap font readable /\n+\t width = (width < 1920) ? width : 1920;\n+\t height = (height < 1080) ? height : 1080;\n+\t}\n else\n \t{\n \t / Fall back to 640x480. This is conservative, but the largest\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 5f7f27d1198ef425f4943cc10132509415bbaf55 Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Thu, 24 Jan 2019 16:41:04 +0800\nSubject: [PATCH] video: limit the resolution for fixed bimap font\n\nAs grub uses fixed bitmap font and also its size is a fixed property, it is not\npossible to accommodate to all resolutions, therefore we raise some limit to\nthe preferred resolution as most themes are designed on popular device and the\nresolution in its prime, which is supposedly Full HD.\n\nThis change also makes grub font readable on hiDPI device without going through\nthe steps in.\n\nhttps://wiki.archlinux.org/index.php/HiDPI#GRUB\n\nv2: efi_gop: Avoid high resolution when trying to keep current mode. \n\n---\n grub-core/video/efi_gop.c \| 7 +++++++\n grub-core/video/i386/pc/vbe.c \| 8 +++++++-\n 2 files changed, 14 insertions(+), 1 deletion(-)\n\nIndex: grub-2.02/grub-core/video/efi_gop.c\n===================================================================\n--- grub-2.02.orig/grub-core/video/efi_gop.c\n+++ grub-2.02/grub-core/video/efi_gop.c\n@@ -360,7 +360,7 @@ grub_video_gop_setup (unsigned int width\n grub_err_t err;\n unsigned bpp;\n int found = 0;\n- int avoid_low_resolution = 1;\n+ int avoid_extreme_resolution = 1;\n unsigned long long best_volume = 0;\n unsigned int preferred_width = 0, preferred_height = 0;\n grub_uint8_t buffer;\n@@ -377,13 +377,21 @@ grub_video_gop_setup (unsigned int width\n \t preferred_height = 600;\n \t grub_errno = GRUB_ERR_NONE;\n \t}\n+ else\n+\t{\n+\t / Limit the range of preferred resolution not exceeding FHD\n+\t to keep the fixed bitmap font readable /\n+\t preferred_width = (preferred_width < 1920) ? preferred_width : 1920;\n+\t preferred_height = (preferred_height < 1080) ? preferred_height : 1080;\n+\t}\n }\n \n again:\n / Keep current mode if possible. /\n if (gop->mode->info &&\n- (!avoid_low_resolution \|\|\n- (gop->mode->info->width >= 800 && gop->mode->info->height >= 600)))\n+ (!avoid_extreme_resolution \|\|\n+ ((gop->mode->info->width >= 800 && gop->mode->info->height >= 600) &&\n+ (gop->mode->info->width <= 1920 && gop->mode->info->height <= 1080))))\n {\n bpp = grub_video_gop_get_bpp (gop->mode->info);\n if (bpp && ((width == gop->mode->info->width\n@@ -456,9 +464,9 @@ again:\n \n if (!found)\n {\n- if (avoid_low_resolution && gop->mode->info)\n+ if (avoid_extreme_resolution && gop->mode->info)\n {\n- avoid_low_resolution = 0;\n+ avoid_extreme_resolution = 0;\n goto again;\n }\n grub_dprintf (\"video\", \"GOP: no mode found\\n\");\nIndex: grub-2.02/grub-core/video/i386/pc/vbe.c\n===================================================================\n--- grub-2.02.orig/grub-core/video/i386/pc/vbe.c\n+++ grub-2.02/grub-core/video/i386/pc/vbe.c\n@@ -994,7 +994,13 @@ grub_video_vbe_setup (unsigned int width\n {\n grub_vbe_get_preferred_mode (&width, &height);\n if (grub_errno == GRUB_ERR_NONE)\n-\tpreferred_mode = 1;\n+\t{\n+\t preferred_mode = 1;\n+\t / Limit the range of preferred resolution not exceeding FHD\n+\t to keep the fixed bitmap font readable /\n+\t width = (width < 1920) ? width : 1920;\n+\t height = (height < 1080) ? height : 1080;\n+\t}\n else\n \t{\n \t / Fall back to 640x480. This is conservative, but the largest\n" } ]	{ "id": "grub2-15947-grub2-video-limit-the-resolution-for-fixed-bimap-font.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-video-limit-the-resolution-for-fixed-bimap-font.patch", "tier": "identical", "language": "c", "patch_lines_changed": 26, "patch_files_count": 2, "total_tokens_est": 1822, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nloader/xnu: Don't allow loading extension and packages\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/loader/xnu.c\n\n## Target Source Code\n\n### grub-core/loader/xnu.c\n\n#### GRUB_MOD_INIT() [lines 1476-1519]\n```c\nstatic grub_command_t cmd_kextdir, cmd_ramdisk, cmd_resume;\nstatic grub_extcmd_t cmd_splash;\n\nGRUB_MOD_INIT(xnu)\n{\n cmd_kernel = grub_register_command (\"xnu_kernel\", grub_cmd_xnu_kernel, 0,\n\t\t\t\t N_(\"Load XNU image.\"));\n cmd_kernel64 = grub_register_command (\"xnu_kernel64\", grub_cmd_xnu_kernel64,\n\t\t\t\t\t0, N_(\"Load 64-bit XNU image.\"));\n cmd_mkext = grub_register_command (\"xnu_mkext\", grub_cmd_xnu_mkext, 0,\n\t\t\t\t N_(\"Load XNU extension package.\"));\n cmd_kext = grub_register_command (\"xnu_kext\", grub_cmd_xnu_kext, 0,\n\t\t\t\t N_(\"Load XNU extension.\"));\n cmd_kextdir = grub_register_command (\"xnu_kextdir\", grub_cmd_xnu_kextdir,\n\t\t\t\t /* TRANSLATORS: OSBundleRequired is a\n\t\t\t\t\t variable name in xnu extensions\n\t\t\t\t\t manifests. It behaves mostly like\n\t\t\t\t\t GNU/Linux runlevels.\n\t\t\t\t /\n\t\t\t\t N_(\"DIRECTORY [OSBundleRequired]\"),\n\t\t\t\t / TRANSLATORS: There are many extensions\n\t\t\t\t\t in extension directory. /\n\t\t\t\t N_(\"Load XNU extension directory.\"));\n cmd_ramdisk = grub_register_command (\"xnu_ramdisk\", grub_cmd_xnu_ramdisk, 0,\n / TRANSLATORS: ramdisk here isn't identifier. It can be translated. /\n\t\t\t\t N_(\"Load XNU ramdisk. \"\n\t\t\t\t\t \"It will be available in OS as md0.\"));\n cmd_splash = grub_register_extcmd (\"xnu_splash\",\n\t\t\t\t grub_cmd_xnu_splash, 0, 0,\n\t\t\t\t N_(\"Load a splash image for XNU.\"),\n\t\t\t\t xnu_splash_cmd_options);\n\n#ifndef GRUB_MACHINE_EMU\n cmd_resume = grub_register_command (\"xnu_resume\", grub_cmd_xnu_resume,\n\t\t\t\t 0, N_(\"Load an image of hibernated\"\n\t\t\t\t\t \" XNU.\"));\n#endif\n\n grub_cpu_xnu_init ();\n\n my_mod = mod;\n}\n\nGRUB_MOD_FINI(xnu)\n```\n\n\n## Upstream Fix\n```diff\nFrom 1d071ebb910bfb36bce0025fed7631f8cfb9c905 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 24 Feb 2021 14:44:38 +0100\nSubject: [PATCH 19/45] loader/xnu: Don't allow loading extension and packages\n when locked down\n\nThe shim_lock verifier validates the XNU kernels but no its extensions\nand packages. Prevent these to be loaded when the GRUB is locked down.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/loader/xnu.c \| 31 +++++++++++++++++--------------\n 1 file changed, 17 insertions(+), 14 deletions(-)\n\ndiff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c\nindex 77d7060e1..07232d2a1 100644\n--- a/grub-core/loader/xnu.c\n+++ b/grub-core/loader/xnu.c\n@@ -1482,20 +1482,23 @@ GRUB_MOD_INIT(xnu)\n \t\t\t\t N_(\"Load XNU image.\"));\n cmd_kernel64 = grub_register_command (\"xnu_kernel64\", grub_cmd_xnu_kernel64,\n \t\t\t\t\t0, N_(\"Load 64-bit XNU image.\"));\n- cmd_mkext = grub_register_command (\"xnu_mkext\", grub_cmd_xnu_mkext, 0,\n-\t\t\t\t N_(\"Load XNU extension package.\"));\n- cmd_kext = grub_register_command (\"xnu_kext\", grub_cmd_xnu_kext, 0,\n-\t\t\t\t N_(\"Load XNU extension.\"));\n- cmd_kextdir = grub_register_command (\"xnu_kextdir\", grub_cmd_xnu_kextdir,\n-\t\t\t\t / TRANSLATORS: OSBundleRequired is a\n-\t\t\t\t\t variable name in xnu extensions\n-\t\t\t\t\t manifests. It behaves mostly like\n-\t\t\t\t\t GNU/Linux runlevels.\n-\t\t\t\t /\n-\t\t\t\t N_(\"DIRECTORY [OSBundleRequired]\"),\n-\t\t\t\t / TRANSLATORS: There are many extensions\n-\t\t\t\t\t in extension directory. /\n-\t\t\t\t N_(\"Load XNU extension directory.\"));\n+ cmd_mkext = grub_register_command_lockdown (\"xnu_mkext\", grub_cmd_xnu_mkext, 0,\n+\t\t\t\t\t N_(\"Load XNU extension package.\"));\n+ cmd_kext = grub_register_command_lockdown (\"xnu_kext\", grub_cmd_xnu_kext, 0,\n+\t\t\t\t\t N_(\"Load XNU extension.\"));\n+ cmd_kextdir = grub_register_command_lockdown (\"xnu_kextdir\", grub_cmd_xnu_kextdir,\n+\t\t\t\t\t\t/\n+\t\t\t\t\t\t * TRANSLATORS: OSBundleRequired is\n+\t\t\t\t\t\t * a variable name in xnu extensions\n+\t\t\t\t\t\t * manifests. It behaves mostly like\n+\t\t\t\t\t\t * GNU/Linux runlevels.\n+\t\t\t\t\t\t /\n+\t\t\t\t\t\tN_(\"DIRECTORY [OSBundleRequired]\"),\n+\t\t\t\t\t\t/\n+\t\t\t\t\t\t * TRANSLATORS: There are many extensions\n+\t\t\t\t\t\t * in extension directory.\n+\t\t\t\t\t\t /\n+\t\t\t\t\t\tN_(\"Load XNU extension directory.\"));\n cmd_ramdisk = grub_register_command (\"xnu_ramdisk\", grub_cmd_xnu_ramdisk, 0,\n / TRANSLATORS: ramdisk here isn't identifier. It can be translated. /\n \t\t\t\t N_(\"Load XNU ramdisk. \"\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 1d071ebb910bfb36bce0025fed7631f8cfb9c905 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 24 Feb 2021 14:44:38 +0100\nSubject: [PATCH 19/45] loader/xnu: Don't allow loading extension and packages\n when locked down\n\nThe shim_lock verifier validates the XNU kernels but no its extensions\nand packages. Prevent these to be loaded when the GRUB is locked down.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/loader/xnu.c \| 31 +++++++++++++++++--------------\n 1 file changed, 17 insertions(+), 14 deletions(-)\n\ndiff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c\nindex 77d7060e1..07232d2a1 100644\n--- a/grub-core/loader/xnu.c\n+++ b/grub-core/loader/xnu.c\n@@ -1482,20 +1482,23 @@ GRUB_MOD_INIT(xnu)\n \t\t\t\t N_(\"Load XNU image.\"));\n cmd_kernel64 = grub_register_command (\"xnu_kernel64\", grub_cmd_xnu_kernel64,\n \t\t\t\t\t0, N_(\"Load 64-bit XNU image.\"));\n- cmd_mkext = grub_register_command (\"xnu_mkext\", grub_cmd_xnu_mkext, 0,\n-\t\t\t\t N_(\"Load XNU extension package.\"));\n- cmd_kext = grub_register_command (\"xnu_kext\", grub_cmd_xnu_kext, 0,\n-\t\t\t\t N_(\"Load XNU extension.\"));\n- cmd_kextdir = grub_register_command (\"xnu_kextdir\", grub_cmd_xnu_kextdir,\n-\t\t\t\t / TRANSLATORS: OSBundleRequired is a\n-\t\t\t\t\t variable name in xnu extensions\n-\t\t\t\t\t manifests. It behaves mostly like\n-\t\t\t\t\t GNU/Linux runlevels.\n-\t\t\t\t /\n-\t\t\t\t N_(\"DIRECTORY [OSBundleRequired]\"),\n-\t\t\t\t / TRANSLATORS: There are many extensions\n-\t\t\t\t\t in extension directory. /\n-\t\t\t\t N_(\"Load XNU extension directory.\"));\n+ cmd_mkext = grub_register_command_lockdown (\"xnu_mkext\", grub_cmd_xnu_mkext, 0,\n+\t\t\t\t\t N_(\"Load XNU extension package.\"));\n+ cmd_kext = grub_register_command_lockdown (\"xnu_kext\", grub_cmd_xnu_kext, 0,\n+\t\t\t\t\t N_(\"Load XNU extension.\"));\n+ cmd_kextdir = grub_register_command_lockdown (\"xnu_kextdir\", grub_cmd_xnu_kextdir,\n+\t\t\t\t\t\t/\n+\t\t\t\t\t\t * TRANSLATORS: OSBundleRequired is\n+\t\t\t\t\t\t * a variable name in xnu extensions\n+\t\t\t\t\t\t * manifests. It behaves mostly like\n+\t\t\t\t\t\t * GNU/Linux runlevels.\n+\t\t\t\t\t\t /\n+\t\t\t\t\t\tN_(\"DIRECTORY [OSBundleRequired]\"),\n+\t\t\t\t\t\t/\n+\t\t\t\t\t\t * TRANSLATORS: There are many extensions\n+\t\t\t\t\t\t * in extension directory.\n+\t\t\t\t\t\t /\n+\t\t\t\t\t\tN_(\"Load XNU extension directory.\"));\n cmd_ramdisk = grub_register_command (\"xnu_ramdisk\", grub_cmd_xnu_ramdisk, 0,\n / TRANSLATORS: ramdisk here isn't identifier. It can be translated. */\n \t\t\t\t N_(\"Load XNU ramdisk. \"\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0019-loader-xnu-Don-t-allow-loading-extension-and-package.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0019-loader-xnu-Don-t-allow-loading-extension-and-package.patch", "tier": "identical", "language": "c", "patch_lines_changed": 32, "patch_files_count": 1, "total_tokens_est": 1435, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\n===================================================================\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n- grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n- grub-2.04~rc1/grub-core/kern/ieee1275/init.c\n\n## Target Source Code\n\n### grub-core/kern/ieee1275/openfw.c\n\n#### grub_ieee1275_map() [lines 261-305]\n```c\n\n/* Call the \"map\" method of /chosen/mmu. /\nint\ngrub_ieee1275_map (grub_addr_t phys, grub_addr_t virt, grub_size_t size,\n\t\t grub_uint32_t mode)\n{\n struct map_args {\n struct grub_ieee1275_common_hdr common;\n grub_ieee1275_cell_t method;\n grub_ieee1275_cell_t ihandle;\n grub_ieee1275_cell_t mode;\n grub_ieee1275_cell_t size;\n grub_ieee1275_cell_t virt;\n#ifdef __sparc__\n grub_ieee1275_cell_t phys_high;\n#endif\n grub_ieee1275_cell_t phys_low;\n grub_ieee1275_cell_t catch_result;\n } args;\n\n INIT_IEEE1275_COMMON (&args.common, \"call-method\",\n#ifdef __sparc__\n\t\t\t7,\n#else\n\t\t\t6,\n#endif\n\t\t\t1);\n args.method = (grub_ieee1275_cell_t) \"map\";\n args.ihandle = grub_ieee1275_mmu;\n#ifdef __sparc__\n args.phys_high = 0;\n#endif\n args.phys_low = phys;\n args.virt = virt;\n args.size = size;\n args.mode = mode; / Format is WIMG0PP. /\n args.catch_result = (grub_ieee1275_cell_t) -1;\n\n if (IEEE1275_CALL_ENTRY_FN (&args) == -1)\n return -1;\n\n return args.catch_result;\n}\n\ngrub_err_t\n```\n\n#### grub_claimmap() [lines 303-323]\n```c\n}\n\ngrub_err_t\ngrub_claimmap (grub_addr_t addr, grub_size_t size)\n{\n if (grub_ieee1275_claim (addr, size, 0, 0))\n return -1;\n\n if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_REAL_MODE)\n && grub_ieee1275_map (addr, addr, size, 0x00))\n {\n grub_error (GRUB_ERR_OUT_OF_MEMORY, \"map failed: address 0x%llx, size 0x%llx\\n\",\n\t\t (long long) addr, (long long) size);\n grub_ieee1275_release (addr, size);\n return grub_errno;\n }\n\n return GRUB_ERR_NONE;\n}\n\n/ Get the device arguments of the Open Firmware node name `path'. /\n```\n\n### include/grub/ieee1275/ieee1275.h\n\n#### region() [lines 1-87]\n```c\n/ ieee1275.h - Access the Open Firmware client interface. /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2003,2004,2005,2007,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#ifndef GRUB_IEEE1275_HEADER\n#define GRUB_IEEE1275_HEADER\t1\n\n#include <grub/err.h>\n#include <grub/types.h>\n#include <grub/machine/ieee1275.h>\n\nstruct grub_ieee1275_mem_region\n{\n unsigned int start;\n unsigned int size;\n};\n\n#define IEEE1275_MAX_PROP_LEN\t8192\n#define IEEE1275_MAX_PATH_LEN\t256\n\n#ifndef IEEE1275_CALL_ENTRY_FN\n#define IEEE1275_CALL_ENTRY_FN(args) (grub_ieee1275_entry_fn) (args)\n#endif\n\n/* All backcalls to the firmware is done by calling an entry function\n which was passed to us from the bootloader. When doing the backcall,\n a structure is passed which specifies what the firmware should do.\n NAME is the requested service. NR_INS and NR_OUTS is the number of\n passed arguments and the expected number of return values, resp. /\nstruct grub_ieee1275_common_hdr\n{\n grub_ieee1275_cell_t name;\n grub_ieee1275_cell_t nr_ins;\n grub_ieee1275_cell_t nr_outs;\n};\n\n#define INIT_IEEE1275_COMMON(p, xname, xins, xouts) \\\n (p)->name = (grub_ieee1275_cell_t) xname; \\\n (p)->nr_ins = (grub_ieee1275_cell_t) xins; \\\n (p)->nr_outs = (grub_ieee1275_cell_t) xouts\n\ntypedef grub_uint32_t grub_ieee1275_ihandle_t;\ntypedef grub_uint32_t grub_ieee1275_phandle_t;\n\n#define GRUB_IEEE1275_PHANDLE_INVALID ((grub_ieee1275_phandle_t) -1)\n\nstruct grub_ieee1275_devalias\n{\n char name;\n char path;\n char type;\n char parent_path;\n grub_ieee1275_phandle_t phandle;\n grub_ieee1275_phandle_t parent_dev;\n};\n\nextern void (EXPORT_VAR(grub_ieee1275_net_config)) (const char dev,\n char device,\n char path,\n char bootargs);\n\n/* Maps a device alias to a pathname. /\nextern grub_ieee1275_phandle_t EXPORT_VAR(grub_ieee1275_chosen);\nextern grub_ieee1275_ihandle_t EXPORT_VAR(grub_ieee1275_mmu);\n#ifdef __i386__\n#define GRUB_IEEE1275_ENTRY_FN_ATTRIBUTE __attribute__ ((regparm(3)))\n#else\n#define GRUB_IEEE1275_ENTRY_FN_ATTRIBUTE\n#endif\n\nextern int ( EXPORT_VAR(grub_ieee1275_entry_fn)) (void ) GRUB_IEEE1275_ENTRY_FN_ATTRIBUTE;\n\n```\n\n#### region() [lines 186-267]\n```c\n\t\t\t\t void buffer, grub_size_t len,\n\t\t\t\t grub_ssize_t actualp);\nint EXPORT_FUNC(grub_ieee1275_seek) (grub_ieee1275_ihandle_t ihandle,\n\t\t\t\t grub_disk_addr_t pos,\n\t\t\t\t grub_ssize_t result);\nint EXPORT_FUNC(grub_ieee1275_peer) (grub_ieee1275_phandle_t node,\n\t\t\t\t grub_ieee1275_phandle_t result);\nint EXPORT_FUNC(grub_ieee1275_child) (grub_ieee1275_phandle_t node,\n\t\t\t\t grub_ieee1275_phandle_t result);\nint EXPORT_FUNC(grub_ieee1275_parent) (grub_ieee1275_phandle_t node,\n\t\t\t\t grub_ieee1275_phandle_t result);\nint EXPORT_FUNC(grub_ieee1275_interpret) (const char command,\n\t\t\t\t\t grub_ieee1275_cell_t catch);\nint EXPORT_FUNC(grub_ieee1275_enter) (void);\nvoid EXPORT_FUNC(grub_ieee1275_exit) (void) __attribute__ ((noreturn));\nint EXPORT_FUNC(grub_ieee1275_open) (const char node,\n\t\t\t\t grub_ieee1275_ihandle_t result);\nint EXPORT_FUNC(grub_ieee1275_close) (grub_ieee1275_ihandle_t ihandle);\nint EXPORT_FUNC(grub_ieee1275_claim) (grub_addr_t addr, grub_size_t size,\n\t\t\t\t unsigned int align, grub_addr_t result);\nint EXPORT_FUNC(grub_ieee1275_release) (grub_addr_t addr, grub_size_t size);\nint EXPORT_FUNC(grub_ieee1275_set_property) (grub_ieee1275_phandle_t phandle,\n\t\t\t\t\t const char propname,\n\t\t\t\t\t cons\n/ ... truncated ... /\n```\n\n### grub-core/kern/ieee1275/init.c\n\n#### region() [lines 24-130]\n```c\n#include <grub/partition.h>\n#include <grub/normal.h>\n#include <grub/fs.h>\n#include <grub/setjmp.h>\n#include <grub/env.h>\n#include <grub/misc.h>\n#include <grub/time.h>\n#include <grub/ieee1275/console.h>\n#include <grub/ieee1275/ofdisk.h>\n#ifdef __sparc__\n#include <grub/ieee1275/obdisk.h>\n#endif\n#include <grub/ieee1275/ieee1275.h>\n#include <grub/net.h>\n#include <grub/offsets.h>\n#include <grub/memory.h>\n#include <grub/loader.h>\n#ifdef __i386__\n#include <grub/cpu/tsc.h>\n#endif\n#ifdef __sparc__\n#include <grub/machine/kernel.h>\n#endif\n\n/ The minimal heap size we can live with. /\n#define HEAP_MIN_SIZE\t\t(unsigned long) (2 1024 * 1024)\n\n/* The maximum heap size we're going to claim /\n#ifdef __i386__\n#define HEAP_MAX_SIZE\t\t(unsigned long) (64 1024 * 1024)\n#else\n#define HEAP_MAX_SIZE\t\t(unsigned long) (32 * 1024 * 1024)\n#endif\n\n/* If possible, we will avoid claiming heap above this address, because it\n seems to cause relocation problems with OSes that link at 4 MiB /\n#ifdef __i386__\n#define HEAP_MAX_ADDR\t\t(unsigned long) (64 1024 * 1024)\n#else\n#define HEAP_MAX_ADDR\t\t(unsigned long) (32 * 1024 * 1024)\n#endif\n\nextern char _start[];\nextern char _end[];\n\n#ifdef __sparc__\ngrub_addr_t grub_ieee1275_original_stack;\n#endif\n\nvoid\ngrub_exit (void)\n{\n grub_ieee1275_exit ();\n}\n\n/* Translate an OF filesystem path (separated by backslashes), into a GRUB\n path (separated by forward slashes). /\nstatic void\ngrub_translate_ieee1275_path (char filepath)\n{\n char backslash;\n\n backslash = grub_strchr (filepath, '\\\\');\n while (backslash != 0)\n {\n backslash = '/';\n backslash = grub_strchr (filepath, '\\\\');\n }\n}\n\nvoid (grub_ieee1275_net_config) (const char dev, char device, char path,\n char bootpath);\nvoid\ngrub_machine_get_bootlocation (char device, char path)\n{\n char bootpath;\n char filename;\n char type;\n\n bootpath = grub_ieee1275_get_boot_dev ();\n if (! bootpath)\n return;\n\n /* Transform an OF device path to a GRUB path. /\n\n type = grub_ieee1275_get_device_type (bootpath);\n if (type && grub_strcmp (type, \"network\") == 0)\n {\n char dev, canon;\n char ptr;\n dev = grub_ieee1275_get_aliasdevname (bootpath);\n canon = grub_ieee1275_canonicalise_devname (dev);\n if (! canon)\n return;\n ptr = canon + grub_strlen (canon) - 1;\n while (ptr > canon && (ptr == ',' \|\| ptr == ':'))\n\tptr--;\n ptr++;\n ptr = 0;\n\n if (grub_ieee1275_net_config)\n\tgrub_ieee1275_net_config (canon, device, path, bootpath);\n grub_free (dev);\n grub_free (canon);\n }\n else\n device = grub_ieee1275_encode_devname (bootpath);\n```\n\n\n## Upstream Fix\n```diff\nIndex: grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/openfw.c\n+++ grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n@@ -302,6 +302,34 @@ grub_ieee1275_map (grub_addr_t phys, gru\n return args.catch_result;\n }\n \n+/* Preallocate IEEE1275_MAX_MAP_RESOURCE map tracks to track the\n+ * map regions allocated to us by the firmware. Cannot\n+ * dynamically allocate them, since the heap is not set\n+ * yet.\n+ /\n+struct grub_map_track grub_map_track[IEEE1275_MAX_MAP_RESOURCE];\n+int grub_map_track_index=0;\n+\n+void\n+grub_releasemap ()\n+{\n+ int i=0;\n+ for (i=grub_map_track_index-1; i >= 0; i--)\n+ grub_ieee1275_release(grub_map_track[i].addr, grub_map_track[i].size);\n+ grub_map_track_index = 0;\n+ return;\n+}\n+\n+static void\n+grub_track_map (grub_addr_t addr, grub_size_t size)\n+{\n+ if (grub_map_track_index >= IEEE1275_MAX_MAP_RESOURCE)\n+ return;\n+ grub_map_track[grub_map_track_index].addr = addr;\n+ grub_map_track[grub_map_track_index++].size = size;\n+ return;\n+}\n+\n grub_err_t\n grub_claimmap (grub_addr_t addr, grub_size_t size)\n {\n@@ -317,6 +345,7 @@ grub_claimmap (grub_addr_t addr, grub_si\n return grub_errno;\n }\n \n+ grub_track_map (addr, size);\n return GRUB_ERR_NONE;\n }\n \nIndex: grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n===================================================================\n--- grub-2.04~rc1.orig/include/grub/ieee1275/ieee1275.h\n+++ grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n@@ -30,6 +30,12 @@ struct grub_ieee1275_mem_region\n unsigned int size;\n };\n \n+#define IEEE1275_MAX_MAP_RESOURCE 10\n+struct grub_map_track {\n+ grub_addr_t addr;\n+ grub_size_t size;\n+};\n+\n #define IEEE1275_MAX_PROP_LEN\t8192\n #define IEEE1275_MAX_PATH_LEN\t256\n \n@@ -235,6 +241,7 @@ char EXPORT_FUNC(grub_ieee1275_encode_u\n int EXPORT_FUNC(grub_ieee1275_get_block_size) (grub_ieee1275_ihandle_t ihandle);\n \n grub_err_t EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);\n+void EXPORT_FUNC(grub_releasemap) (void);\n \n int\n EXPORT_FUNC(grub_ieee1275_map) (grub_addr_t phys, grub_addr_t virt,\nIndex: grub-2.04~rc1/grub-core/kern/ieee1275/init.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/init.c\n+++ grub-2.04~rc1/grub-core/kern/ieee1275/init.c\n@@ -73,6 +73,7 @@ grub_addr_t grub_ieee1275_original_stack\n void\n grub_exit (void)\n {\n+ grub_releasemap();\n grub_ieee1275_exit ();\n }\n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/openfw.c\n+++ grub-2.04~rc1/grub-core/kern/ieee1275/openfw.c\n@@ -302,6 +302,34 @@ grub_ieee1275_map (grub_addr_t phys, gru\n return args.catch_result;\n }\n \n+/* Preallocate IEEE1275_MAX_MAP_RESOURCE map tracks to track the\n+ * map regions allocated to us by the firmware. Cannot\n+ * dynamically allocate them, since the heap is not set\n+ * yet.\n+ /\n+struct grub_map_track grub_map_track[IEEE1275_MAX_MAP_RESOURCE];\n+int grub_map_track_index=0;\n+\n+void\n+grub_releasemap ()\n+{\n+ int i=0;\n+ for (i=grub_map_track_index-1; i >= 0; i--)\n+ grub_ieee1275_release(grub_map_track[i].addr, grub_map_track[i].size);\n+ grub_map_track_index = 0;\n+ return;\n+}\n+\n+static void\n+grub_track_map (grub_addr_t addr, grub_size_t size)\n+{\n+ if (grub_map_track_index >= IEEE1275_MAX_MAP_RESOURCE)\n+ return;\n+ grub_map_track[grub_map_track_index].addr = addr;\n+ grub_map_track[grub_map_track_index++].size = size;\n+ return;\n+}\n+\n grub_err_t\n grub_claimmap (grub_addr_t addr, grub_size_t size)\n {\n@@ -317,6 +345,7 @@ grub_claimmap (grub_addr_t addr, grub_si\n return grub_errno;\n }\n \n+ grub_track_map (addr, size);\n return GRUB_ERR_NONE;\n }\n \nIndex: grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n===================================================================\n--- grub-2.04~rc1.orig/include/grub/ieee1275/ieee1275.h\n+++ grub-2.04~rc1/include/grub/ieee1275/ieee1275.h\n@@ -30,6 +30,12 @@ struct grub_ieee1275_mem_region\n unsigned int size;\n };\n \n+#define IEEE1275_MAX_MAP_RESOURCE 10\n+struct grub_map_track {\n+ grub_addr_t addr;\n+ grub_size_t size;\n+};\n+\n #define IEEE1275_MAX_PROP_LEN\t8192\n #define IEEE1275_MAX_PATH_LEN\t256\n \n@@ -235,6 +241,7 @@ char EXPORT_FUNC(grub_ieee1275_encode_u\n int EXPORT_FUNC(grub_ieee1275_get_block_size) (grub_ieee1275_ihandle_t ihandle);\n \n grub_err_t EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);\n+void EXPORT_FUNC(grub_releasemap) (void);\n \n int\n EXPORT_FUNC(grub_ieee1275_map) (grub_addr_t phys, grub_addr_t virt,\nIndex: grub-2.04~rc1/grub-core/kern/ieee1275/init.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/init.c\n+++ grub-2.04~rc1/grub-core/kern/ieee1275/init.c\n@@ -73,6 +73,7 @@ grub_addr_t grub_ieee1275_original_stack\n void\n grub_exit (void)\n {\n+ grub_releasemap();\n grub_ieee1275_exit ();\n }\n \n" } ]	{ "id": "grub2-15947-grub2-ppc64le-memory-map.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-ppc64le-memory-map.patch", "tier": "identical", "language": "c", "patch_lines_changed": 37, "patch_files_count": 3, "total_tokens_est": 1439, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ngrub-install: remove useless check PReP partition is empty.\n\n## Package\ngrub2\n\n## Files to modify\n- util/grub-install.c\n\n## Target Source Code\n\n### util/grub-install.c\n\n#### is_prep_partition() [lines 698-737]\n```c\n}\n\nstatic int\nis_prep_partition (grub_device_t dev)\n{\n if (!dev->disk)\n return 0;\n if (!dev->disk->partition)\n return 0;\n if (strcmp(dev->disk->partition->partmap->name, \"msdos\") == 0)\n return (dev->disk->partition->msdostype == 0x41);\n\n if (strcmp (dev->disk->partition->partmap->name, \"gpt\") == 0)\n {\n struct grub_gpt_partentry gptdata;\n grub_partition_t p = dev->disk->partition;\n int ret = 0;\n dev->disk->partition = dev->disk->partition->parent;\n\n if (grub_disk_read (dev->disk, p->offset, p->index,\n\t\t\t sizeof (gptdata), &gptdata) == 0)\n\t{\n\t const grub_gpt_part_guid_t template = {\n\t grub_cpu_to_le32_compile_time (0x9e1a2d38),\n\t grub_cpu_to_le16_compile_time (0xc612),\n\t grub_cpu_to_le16_compile_time (0x4316),\n\t { 0xaa, 0x26, 0x8b, 0x49, 0x52, 0x1e, 0x5a, 0x8b }\n\t };\n\n\t ret = grub_memcmp (&template, &gptdata.type,\n\t\t\t sizeof (template)) == 0;\n\t}\n dev->disk->partition = p;\n return ret;\n }\n\n return 0;\n}\n\nstatic int\n```\n\n#### main() [lines 820-1965]\n```c\n}\n\nint\nmain (int argc, char argv[])\n{\n int is_efi = 0;\n const char efi_distributor = NULL;\n const char efi_file = NULL;\n char grub_devices;\n grub_fs_t grub_fs;\n grub_device_t grub_dev = NULL;\n enum grub_install_plat platform;\n char grubdir, device_map;\n char curdev, curdrive;\n char grub_drives;\n char relative_grubdir;\n char *efidir_device_names = NULL;\n grub_device_t efidir_grub_dev = NULL;\n char efidir_grub_devname;\n int efidir_is_mac = 0;\n int is_prep = 0;\n const char pkgdatadir;\n\n grub_util_host_init (&argc, &argv);\n product_version = xstrdup (PACKAGE_VERSION);\n pkgdatadir = grub_util_get_pkgdatadir ();\n label_font = grub_util_path_concat (2, pkgdatadir, \"unicode.pf2\");\n\n argp_parse (&argp, argc, argv, 0, 0, 0);\n\n if (verbosity > 1)\n grub_env_set (\"debug\", \"all\");\n\n grub_util_load_config (&config);\n\n if (!bootloader_id && config.grub_distributor)\n {\n char ptr;\n bootloader_id = xstrdup (config.grub_distributor);\n for (ptr = bootloader_id; ptr && ptr != ' '; ptr++)\n/* ... 903 lines omitted ... /\n\n\t bootx = grub_util_path_concat (2, core_services, \"BootX\");\n\t grub_install_copy_file (grub_chrp, bootx, 1);\n\n\t grub_elf = grub_util_path_concat (2, core_services, \"grub.elf\");\n\t grub_install_copy_file (imgfile, grub_elf, 1);\n\n\t f = grub_util_fopen (mach_kernel, \"a+\");\n\t if (!f)\n\t grub_util_error (_(\"Can't create file: %s\"), strerror (errno));\n\t fclose (f);\n\n\t fill_core_services (core_services);\n\n\t ins_dev = grub_device_open (install_drive);\n\n\t bless (ins_dev, core_services, 0);\n\n\t if (update_nvram)\n\t {\n\t const char dev;\n\t int partno;\n\n\t partno = ins_dev->disk->partition\n\t\t? ins_dev->disk->partition->number + 1 : 0;\n\t dev = grub_util_get_os_disk (install_device);\n\t grub_install_register_ieee1275 (0, dev, partno,\n\t\t\t\t\t \"\\\\\\\\BootX\");\n\t }\n\t grub_device_close (ins_dev);\n \t free (grub_elf);\n\t free (bootx);\n\t free (mach_kernel);\n\t free (grub_chrp);\n\t break;\n\t}\n/* ... 147 lines omitted ... /\n case GRUB_INSTALL_PLATFORM_I386_XEN:\n case GRUB_INSTALL_PLATFORM_X86_64_XEN:\n case GRUB_INSTALL_PLATFORM_I386_XEN_PVH:\n grub_util_warn (\"%s\",\n\t\t _(\"WARNING: no platform-specific install was performed\"));\n break;\n / pacify warning. /\n case GRUB_INSTALL_PLATFORM_MAX:\n break;\n }\n\n fprintf (stderr, \"%s\\n\", _(\"Installation finished. No error reported.\"));\n\n / Free resources. /\n grub_gcry_fini_all ();\n grub_fini_all ();\n\n return 0;\n}\n\n```\n\n\n## Upstream Fix\n```diff\nFrom b57af595c94db6d7babb7623c1530ee4f5b956f0 Mon Sep 17 00:00:00 2001\nFrom: Michal Suchanek <msuchanek@suse.de>\nDate: Tue, 31 Oct 2017 14:28:54 +0100\nSubject: [PATCH] grub-install: remove useless check PReP partition is empty.\n\nReferences: bsc#1065738\n\nThe grub-install rewrite in commit cd46aa6cefab checks that the PPeP\npartition does not install an ELF binary before writing grub to it. This\ncauses regression in installer scripts that expect to be able to\nreinstall bootloaders without first witping the partition by hand.\n\nFixes: cd46aa6cefab (\"Rewrite grub-install, grub-mkrescue,\n grub-mkstandalone and grub-mknetdir \")\n---\n util/grub-install.c \| 39 ++-------------------------------------\n 1 file changed, 2 insertions(+), 37 deletions(-)\n\ndiff --git a/util/grub-install.c b/util/grub-install.c\nindex 75e3e5ba6f07..ae859476e3da 100644\n--- a/util/grub-install.c\n+++ b/util/grub-install.c\n@@ -731,34 +731,6 @@ is_prep_partition (grub_device_t dev)\n return 0;\n }\n \n-static int\n-is_prep_empty (grub_device_t dev)\n-{\n- grub_disk_addr_t dsize, addr;\n- grub_uint32_t buffer[32768];\n-\n- dsize = grub_disk_get_size (dev->disk);\n- for (addr = 0; addr < dsize;\n- addr += sizeof (buffer) / GRUB_DISK_SECTOR_SIZE)\n- {\n- grub_size_t sz = sizeof (buffer);\n- grub_uint32_t ptr;\n-\n- if (sizeof (buffer) / GRUB_DISK_SECTOR_SIZE > dsize - addr)\n-\tsz = (dsize - addr) * GRUB_DISK_SECTOR_SIZE;\n- grub_disk_read (dev->disk, addr, 0, sz, buffer);\n-\n- if (addr == 0 && grub_memcmp (buffer, ELFMAG, SELFMAG) == 0)\n-\treturn 1;\n-\n- for (ptr = buffer; ptr < buffer + sz / sizeof (buffer); ptr++)\n-\tif (ptr)\n-\t return 0;\n- }\n-\n- return 1;\n-}\n-\n static void\n bless (grub_device_t dev, const char path, int x86)\n {\n@@ -1772,16 +1744,9 @@ main (int argc, char argv[])\n \t {\n \t grub_util_error (\"%s\", _(\"the chosen partition is not a PReP partition\"));\n \t }\n-\t if (is_prep_empty (ins_dev))\n-\t {\n-\t if (write_to_disk (ins_dev, imgfile))\n-\t\tgrub_util_error (\"%s\", _(\"failed to copy Grub to the PReP partition\"));\n-\t }\n-\t else\n+\t if (write_to_disk (ins_dev, imgfile))\n \t {\n-\t char s = xasprintf (\"dd if=/dev/zero of=%s\", install_device);\n-\t grub_util_error (_(\"the PReP partition is not empty. If you are sure you want to use it, run dd to clear it: `%s'\"),\n-\t\t\t s);\n+\t grub_util_error (\"%s\", _(\"failed to copy Grub to the PReP partition\"));\n \t }\n \t grub_device_close (ins_dev);\n \t if (update_nvram)\n-- \n2.13.6\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From b57af595c94db6d7babb7623c1530ee4f5b956f0 Mon Sep 17 00:00:00 2001\nFrom: Michal Suchanek <msuchanek@suse.de>\nDate: Tue, 31 Oct 2017 14:28:54 +0100\nSubject: [PATCH] grub-install: remove useless check PReP partition is empty.\n\nReferences: bsc#1065738\n\nThe grub-install rewrite in commit cd46aa6cefab checks that the PPeP\npartition does not install an ELF binary before writing grub to it. This\ncauses regression in installer scripts that expect to be able to\nreinstall bootloaders without first witping the partition by hand.\n\nFixes: cd46aa6cefab (\"Rewrite grub-install, grub-mkrescue,\n grub-mkstandalone and grub-mknetdir \")\n---\n util/grub-install.c \| 39 ++-------------------------------------\n 1 file changed, 2 insertions(+), 37 deletions(-)\n\ndiff --git a/util/grub-install.c b/util/grub-install.c\nindex 75e3e5ba6f07..ae859476e3da 100644\n--- a/util/grub-install.c\n+++ b/util/grub-install.c\n@@ -731,34 +731,6 @@ is_prep_partition (grub_device_t dev)\n return 0;\n }\n \n-static int\n-is_prep_empty (grub_device_t dev)\n-{\n- grub_disk_addr_t dsize, addr;\n- grub_uint32_t buffer[32768];\n-\n- dsize = grub_disk_get_size (dev->disk);\n- for (addr = 0; addr < dsize;\n- addr += sizeof (buffer) / GRUB_DISK_SECTOR_SIZE)\n- {\n- grub_size_t sz = sizeof (buffer);\n- grub_uint32_t ptr;\n-\n- if (sizeof (buffer) / GRUB_DISK_SECTOR_SIZE > dsize - addr)\n-\tsz = (dsize - addr) * GRUB_DISK_SECTOR_SIZE;\n- grub_disk_read (dev->disk, addr, 0, sz, buffer);\n-\n- if (addr == 0 && grub_memcmp (buffer, ELFMAG, SELFMAG) == 0)\n-\treturn 1;\n-\n- for (ptr = buffer; ptr < buffer + sz / sizeof (buffer); ptr++)\n-\tif (ptr)\n-\t return 0;\n- }\n-\n- return 1;\n-}\n-\n static void\n bless (grub_device_t dev, const char path, int x86)\n {\n@@ -1772,16 +1744,9 @@ main (int argc, char argv[])\n \t {\n \t grub_util_error (\"%s\", _(\"the chosen partition is not a PReP partition\"));\n \t }\n-\t if (is_prep_empty (ins_dev))\n-\t {\n-\t if (write_to_disk (ins_dev, imgfile))\n-\t\tgrub_util_error (\"%s\", _(\"failed to copy Grub to the PReP partition\"));\n-\t }\n-\t else\n+\t if (write_to_disk (ins_dev, imgfile))\n \t {\n-\t char *s = xasprintf (\"dd if=/dev/zero of=%s\", install_device);\n-\t grub_util_error (_(\"the PReP partition is not empty. If you are sure you want to use it, run dd to clear it: `%s'\"),\n-\t\t\t s);\n+\t grub_util_error (\"%s\", _(\"failed to copy Grub to the PReP partition\"));\n \t }\n \t grub_device_close (ins_dev);\n \t if (update_nvram)\n-- \n2.13.6\n\n" } ]	{ "id": "grub2-15947-grub2-install-remove-useless-check-PReP-partition-is-empty.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-install-remove-useless-check-PReP-partition-is-empty.patch", "tier": "identical", "language": "c", "patch_lines_changed": 40, "patch_files_count": 1, "total_tokens_est": 1401, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ngrub-core/video/efi_gop.c: Add support for BLT_ONLY adapters\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/video/efi_gop.c\n- include/grub/efi/graphics_output.h\n\n## Target Source Code\n\n### grub-core/video/efi_gop.c\n\n#### grub_video_gop_get_bpp() [lines 113-149]\n```c\n}\n\nstatic int\ngrub_video_gop_get_bpp (struct grub_efi_gop_mode_info in)\n{\n grub_uint32_t total_mask;\n int i;\n switch (in->pixel_format)\n {\n case GRUB_EFI_GOT_BGRA8:\n case GRUB_EFI_GOT_RGBA8:\n return 32;\n\n case GRUB_EFI_GOT_BITMASK:\n / Check overlaps. /\n if ((in->pixel_bitmask.r & in->pixel_bitmask.g)\n\t \|\| (in->pixel_bitmask.r & in->pixel_bitmask.b)\n\t \|\| (in->pixel_bitmask.g & in->pixel_bitmask.b)\n\t \|\| (in->pixel_bitmask.r & in->pixel_bitmask.a)\n\t \|\| (in->pixel_bitmask.g & in->pixel_bitmask.a)\n\t \|\| (in->pixel_bitmask.b & in->pixel_bitmask.a))\n\treturn 0;\n\n total_mask = in->pixel_bitmask.r \| in->pixel_bitmask.g\n\t\| in->pixel_bitmask.b \| in->pixel_bitmask.a;\n\n for (i = 31; i >= 0; i--)\n\tif (total_mask & (1 << i))\n\t return i + 1;\n\n / Fall through. /\n default:\n return 0;\n }\n}\n\nstatic void\n```\n\n#### grub_video_gop_fill_real_mode_info() [lines 169-230]\n```c\n}\n\nstatic grub_err_t\ngrub_video_gop_fill_real_mode_info (unsigned mode,\n\t\t\t\t struct grub_efi_gop_mode_info in,\n\t\t\t\t struct grub_video_mode_info out)\n{\n out->mode_number = mode;\n out->number_of_colors = 256;\n out->width = in->width;\n out->height = in->height;\n out->mode_type = GRUB_VIDEO_MODE_TYPE_RGB;\n out->bpp = grub_video_gop_get_bpp (in);\n out->bytes_per_pixel = out->bpp >> 3;\n if (!out->bpp)\n return grub_error (GRUB_ERR_IO, \"unsupported video mode\");\n out->pitch = in->pixels_per_scanline out->bytes_per_pixel;\n\n switch (in->pixel_format)\n {\n case GRUB_EFI_GOT_RGBA8:\n out->red_mask_size = 8;\n out->red_field_pos = 0;\n out->green_mask_size = 8;\n out->green_field_pos = 8;\n out->blue_mask_size = 8;\n out->blue_field_pos = 16;\n out->reserved_mask_size = 8;\n out->reserved_field_pos = 24;\n break;\n\n case GRUB_EFI_GOT_BGRA8:\n out->red_mask_size = 8;\n out->red_field_pos = 16;\n out->green_mask_size = 8;\n out->green_field_pos = 8;\n out->blue_mask_size = 8;\n out->blue_field_pos = 0;\n out->reserved_mask_size = 8;\n out->reserved_field_pos = 24;\n break;\n\n case GRUB_EFI_GOT_BITMASK:\n grub_video_gop_get_bitmask (in->pixel_bitmask.r, &out->red_mask_size,\n\t\t\t\t &out->red_field_pos);\n grub_video_gop_get_bitmask (in->pixel_bitmask.g, &out->green_mask_size,\n\t\t\t\t &out->green_field_pos);\n grub_video_gop_get_bitmask (in->pixel_bitmask.b, &out->blue_mask_size,\n\t\t\t\t &out->blue_field_pos);\n grub_video_gop_get_bitmask (in->pixel_bitmask.a, &out->reserved_mask_size,\n\t\t\t\t &out->reserved_field_pos);\n break;\n\n default:\n return grub_error (GRUB_ERR_IO, \"unsupported video mode\");\n }\n\n out->blit_format = grub_video_get_blit_format (out);\n return GRUB_ERR_NONE;\n}\n\nstatic grub_err_t\n```\n\n### include/grub/efi/graphics_output.h\n\n#### region() [lines 1-86]\n```c\n/\n GRUB -- GRand Unified Bootloader\n * Copyright (C) 2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#ifndef GRUB_EFI_GOP_HEADER\n#define GRUB_EFI_GOP_HEADER\t1\n\n/ Based on UEFI specification. /\n\n#define GRUB_EFI_GOP_GUID \\\n { 0x9042a9de, 0x23dc, 0x4a38, { 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a }}\n\ntypedef enum\n {\n GRUB_EFI_GOT_RGBA8,\n GRUB_EFI_GOT_BGRA8,\n GRUB_EFI_GOT_BITMASK\n }\n grub_efi_gop_pixel_format_t;\n\ntypedef enum\n {\n GRUB_EFI_BLT_VIDEO_FILL,\n GRUB_EFI_BLT_VIDEO_TO_BLT_BUFFER,\n GRUB_EFI_BLT_BUFFER_TO_VIDEO,\n GRUB_EFI_BLT_VIDEO_TO_VIDEO,\n GRUB_EFI_BLT_OPERATION_MAX\n }\n grub_efi_gop_blt_operation_t;\n\nstruct grub_efi_gop_blt_pixel\n{\n grub_uint8_t blue;\n grub_uint8_t green;\n grub_uint8_t red;\n grub_uint8_t reserved;\n};\n\nstruct grub_efi_gop_pixel_bitmask\n{\n grub_uint32_t r;\n grub_uint32_t g;\n grub_uint32_t b;\n grub_uint32_t a;\n};\n\nstruct grub_efi_gop_mode_info\n{\n grub_efi_uint32_t version;\n grub_efi_uint32_t width;\n grub_efi_uint32_t height;\n grub_efi_gop_pixel_format_t pixel_format;\n struct grub_efi_gop_pixel_bitmask pixel_bitmask;\n grub_efi_uint32_t pixels_per_scanline;\n};\n\nstruct grub_efi_gop_mode\n{\n grub_efi_uint32_t max_mode;\n grub_efi_uint32_t mode;\n struct grub_efi_gop_mode_info info;\n grub_efi_uintn_t info_size;\n grub_efi_physical_address_t fb_base;\n grub_efi_uintn_t fb_size;\n};\n\n/* Forward declaration. /\nstruct grub_efi_gop;\n\ntypedef grub_efi_status_t\n(grub_efi_gop_query_mode_t) (struct grub_efi_gop this,\n\t\t\t grub_efi_uint32_t mode_number,\n```\n\n\n## Upstream Fix\n```diff\nFrom dc56925653819582777ddc5c761a56f52dddd8f1 Mon Sep 17 00:00:00 2001\nFrom: Alexander Graf <agraf@suse.de>\nDate: Wed, 1 Feb 2017 23:10:45 +0100\nSubject: [PATCH] grub-core/video/efi_gop.c: Add support for BLT_ONLY adapters\n\nEFI GOP has support for multiple different bitness types of frame buffers\nand for a special \"BLT only\" type which is always defined to be RGBx.\n\nBecause grub2 doesn't ever directly access the frame buffer but instead\nonly renders graphics via the BLT interface anyway, we can easily support\nthese adapters.\n\nThe reason this has come up now is the emerging support for virtio-gpu\nin OVMF. That adapter does not have the notion of a memory mapped frame\nbuffer and thus is BLT only.\n\nSigned-off-by: Alexander Graf <agraf@suse.de>\n---\n grub-core/video/efi_gop.c \| 2 ++\n include/grub/efi/graphics_output.h \| 3 ++-\n 2 files changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c\nindex 7f9d1c2..c9e40e8 100644\n--- a/grub-core/video/efi_gop.c\n+++ b/grub-core/video/efi_gop.c\n@@ -121,6 +121,7 @@ grub_video_gop_get_bpp (struct grub_efi_gop_mode_info in)\n {\n case GRUB_EFI_GOT_BGRA8:\n case GRUB_EFI_GOT_RGBA8:\n+ case GRUB_EFI_GOT_BLT_ONLY:\n return 32;\n \n case GRUB_EFI_GOT_BITMASK:\n@@ -187,6 +188,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode,\n switch (in->pixel_format)\n {\n case GRUB_EFI_GOT_RGBA8:\n+ case GRUB_EFI_GOT_BLT_ONLY:\n out->red_mask_size = 8;\n out->red_field_pos = 0;\n out->green_mask_size = 8;\ndiff --git a/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h\nindex 1297774..e438812 100644\n--- a/include/grub/efi/graphics_output.h\n+++ b/include/grub/efi/graphics_output.h\n@@ -28,7 +28,8 @@ typedef enum\n {\n GRUB_EFI_GOT_RGBA8,\n GRUB_EFI_GOT_BGRA8,\n- GRUB_EFI_GOT_BITMASK\n+ GRUB_EFI_GOT_BITMASK,\n+ GRUB_EFI_GOT_BLT_ONLY,\n }\n grub_efi_gop_pixel_format_t;\n \n-- \n1.8.5.6\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From dc56925653819582777ddc5c761a56f52dddd8f1 Mon Sep 17 00:00:00 2001\nFrom: Alexander Graf <agraf@suse.de>\nDate: Wed, 1 Feb 2017 23:10:45 +0100\nSubject: [PATCH] grub-core/video/efi_gop.c: Add support for BLT_ONLY adapters\n\nEFI GOP has support for multiple different bitness types of frame buffers\nand for a special \"BLT only\" type which is always defined to be RGBx.\n\nBecause grub2 doesn't ever directly access the frame buffer but instead\nonly renders graphics via the BLT interface anyway, we can easily support\nthese adapters.\n\nThe reason this has come up now is the emerging support for virtio-gpu\nin OVMF. That adapter does not have the notion of a memory mapped frame\nbuffer and thus is BLT only.\n\nSigned-off-by: Alexander Graf <agraf@suse.de>\n---\n grub-core/video/efi_gop.c \| 2 ++\n include/grub/efi/graphics_output.h \| 3 ++-\n 2 files changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c\nindex 7f9d1c2..c9e40e8 100644\n--- a/grub-core/video/efi_gop.c\n+++ b/grub-core/video/efi_gop.c\n@@ -121,6 +121,7 @@ grub_video_gop_get_bpp (struct grub_efi_gop_mode_info *in)\n {\n case GRUB_EFI_GOT_BGRA8:\n case GRUB_EFI_GOT_RGBA8:\n+ case GRUB_EFI_GOT_BLT_ONLY:\n return 32;\n \n case GRUB_EFI_GOT_BITMASK:\n@@ -187,6 +188,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode,\n switch (in->pixel_format)\n {\n case GRUB_EFI_GOT_RGBA8:\n+ case GRUB_EFI_GOT_BLT_ONLY:\n out->red_mask_size = 8;\n out->red_field_pos = 0;\n out->green_mask_size = 8;\ndiff --git a/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h\nindex 1297774..e438812 100644\n--- a/include/grub/efi/graphics_output.h\n+++ b/include/grub/efi/graphics_output.h\n@@ -28,7 +28,8 @@ typedef enum\n {\n GRUB_EFI_GOT_RGBA8,\n GRUB_EFI_GOT_BGRA8,\n- GRUB_EFI_GOT_BITMASK\n+ GRUB_EFI_GOT_BITMASK,\n+ GRUB_EFI_GOT_BLT_ONLY,\n }\n grub_efi_gop_pixel_format_t;\n \n-- \n1.8.5.6\n\n" } ]	{ "id": "grub2-15947-grub2-efi-gop-add-blt.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-efi-gop-add-blt.patch", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 2, "total_tokens_est": 1146, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ncommands: Restrict commands that can load BIOS or DT\n\n## Package\ngrub2\n\n## Files to modify\n- docs/grub.texi\n- grub-core/commands/efi/loadbios.c\n- grub-core/loader/arm/linux.c\n- grub-core/loader/efi/fdt.c\n\n## Target Source Code\n\n### grub-core/commands/efi/loadbios.c\n\n#### region() [lines 156-223]\n```c\n\n return 0;\n}\n\nstatic grub_err_t\ngrub_cmd_loadbios (grub_command_t cmd __attribute__ ((unused)),\n\t\t int argc, char argv[])\n{\n grub_file_t file;\n int size;\n\n if (argc == 0)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, N_(\"filename expected\"));\n\n if (argc > 1)\n {\n file = grub_file_open (argv[1], GRUB_FILE_TYPE_VBE_DUMP);\n if (! file)\n\treturn grub_errno;\n\n if (file->size != 4)\n\tgrub_error (GRUB_ERR_BAD_ARGUMENT, \"invalid int10 dump size\");\n else\n\tgrub_file_read (file, (void ) 0x40, 4);\n\n grub_file_close (file);\n if (grub_errno)\n\treturn grub_errno;\n }\n\n file = grub_file_open (argv[0], GRUB_FILE_TYPE_VBE_DUMP);\n if (! file)\n return grub_errno;\n\n size = file->size;\n if ((size < 0x10000) \|\| (size > 0x40000))\n grub_error (GRUB_ERR_BAD_ARGUMENT, \"invalid bios dump size\");\n else if (enable_rom_area ())\n {\n grub_file_read (file, (void ) VBIOS_ADDR, size);\n fake_bios_data (size <= 0x40000);\n lock_rom_area ();\n }\n\n grub_file_close (file);\n return grub_errno;\n}\n\nstatic grub_command_t cmd_fakebios, cmd_loadbios;\n\nGRUB_MOD_INIT(loadbios)\n{\n cmd_fakebios = grub_register_command (\"fakebios\", grub_cmd_fakebios,\n\t\t\t\t\t0, N_(\"Create BIOS-like structures for\"\n\t\t\t\t\t \" backward compatibility with\"\n\t\t\t\t\t \" existing OS.\"));\n\n cmd_loadbios = grub_register_command (\"loadbios\", grub_cmd_loadbios,\n\t\t\t\t\tN_(\"BIOS_DUMP [INT10_DUMP]\"),\n\t\t\t\t\tN_(\"Load BIOS dump.\"));\n}\n\nGRUB_MOD_FINI(loadbios)\n{\n grub_unregister_command (cmd_fakebios);\n grub_unregister_command (cmd_loadbios);\n}\n\n```\n\n### grub-core/loader/arm/linux.c\n\n#### GRUB_MOD_INIT() [lines 487-504]\n```c\n\nstatic grub_command_t cmd_linux, cmd_initrd, cmd_devicetree;\n\nGRUB_MOD_INIT (linux)\n{\n cmd_linux = grub_register_command (\"linux\", grub_cmd_linux,\n\t\t\t\t 0, N_(\"Load Linux.\"));\n cmd_initrd = grub_register_command (\"initrd\", grub_cmd_initrd,\n\t\t\t\t 0, N_(\"Load initrd.\"));\n cmd_devicetree = grub_register_command (\"devicetree\", grub_cmd_devicetree,\n\t\t\t\t\t / TRANSLATORS: DTB stands for device tree blob. /\n\t\t\t\t\t 0, N_(\"Load DTB file.\"));\n my_mod = mod;\n current_fdt = (const void ) grub_arm_firmware_get_boot_data ();\n machine_type = grub_arm_firmware_get_machine_type ();\n}\n\nGRUB_MOD_FINI (linux)\n```\n\n### grub-core/loader/efi/fdt.c\n\n#### region() [lines 116-176]\n```c\n if (loaded_fdt)\n grub_free (loaded_fdt);\n loaded_fdt = NULL;\n\n /* No arguments means \"use firmware FDT\". /\n if (argc == 0)\n {\n return GRUB_ERR_NONE;\n }\n\n dtb = grub_file_open (argv[0], GRUB_FILE_TYPE_DEVICE_TREE_IMAGE);\n if (!dtb)\n goto out;\n\n size = grub_file_size (dtb);\n blob = grub_malloc (size);\n if (!blob)\n goto out;\n\n if (grub_file_read (dtb, blob, size) < size)\n {\n if (!grub_errno)\n\tgrub_error (GRUB_ERR_BAD_OS, N_(\"premature end of file %s\"), argv[0]);\n goto out;\n }\n\n if (grub_fdt_check_header (blob, size) != 0)\n {\n grub_error (GRUB_ERR_BAD_OS, N_(\"invalid device tree\"));\n goto out;\n }\n\nout:\n if (dtb)\n grub_file_close (dtb);\n\n if (blob)\n {\n if (grub_errno == GRUB_ERR_NONE)\n\tloaded_fdt = blob;\n else\n\tgrub_free (blob);\n }\n\n return grub_errno;\n}\n\nstatic grub_command_t cmd_devicetree;\n\nGRUB_MOD_INIT (fdt)\n{\n cmd_devicetree =\n grub_register_command (\"devicetree\", grub_cmd_devicetree, 0,\n\t\t\t N_(\"Load DTB file.\"));\n}\n\nGRUB_MOD_FINI (fdt)\n{\n grub_unregister_command (cmd_devicetree);\n}\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 5dd34b882fcf19708e976572cfc3e2bc01d3cbf3 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 24 Feb 2021 09:00:05 +0100\nSubject: [PATCH 15/45] commands: Restrict commands that can load BIOS or DT\n blobs when locked down\n\nThere are some more commands that should be restricted when the GRUB is\nlocked down. Following is the list of commands and reasons to restrict:\n\n fakebios: creates BIOS-like structures for backward compatibility with\n existing OSes. This should not be allowed when locked down.\n\n * loadbios: reads a BIOS dump from storage and loads it. This action\n should not be allowed when locked down.\n\n * devicetree: loads a Device Tree blob and passes it to the OS. It replaces\n any Device Tree provided by the firmware. This also should\n not be allowed when locked down.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n docs/grub.texi \| 3 +++\n grub-core/commands/efi/loadbios.c \| 16 ++++++++--------\n grub-core/loader/arm/linux.c \| 6 +++---\n grub-core/loader/efi/fdt.c \| 4 ++--\n 4 files changed, 16 insertions(+), 13 deletions(-)\n\ndiff --git a/docs/grub.texi b/docs/grub.texi\nindex c26b6082c..c67675bad 100644\n--- a/docs/grub.texi\n+++ b/docs/grub.texi\n@@ -4236,6 +4236,9 @@ Load a device tree blob (.dtb) from a filesystem, for later use by a Linux\n kernel. Does not perform merging with any device tree supplied by firmware,\n but rather replaces it completely.\n @ref{GNU/Linux}.\n+\n+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}).\n+ This is done to prevent subverting various security mechanisms.\n @end deffn\n \n @node distrust\ndiff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c\nindex d41d521a4..5c7725f8b 100644\n--- a/grub-core/commands/efi/loadbios.c\n+++ b/grub-core/commands/efi/loadbios.c\n@@ -205,14 +205,14 @@ static grub_command_t cmd_fakebios, cmd_loadbios;\n \n GRUB_MOD_INIT(loadbios)\n {\n- cmd_fakebios = grub_register_command (\"fakebios\", grub_cmd_fakebios,\n-\t\t\t\t\t0, N_(\"Create BIOS-like structures for\"\n-\t\t\t\t\t \" backward compatibility with\"\n-\t\t\t\t\t \" existing OS.\"));\n-\n- cmd_loadbios = grub_register_command (\"loadbios\", grub_cmd_loadbios,\n-\t\t\t\t\tN_(\"BIOS_DUMP [INT10_DUMP]\"),\n-\t\t\t\t\tN_(\"Load BIOS dump.\"));\n+ cmd_fakebios = grub_register_command_lockdown (\"fakebios\", grub_cmd_fakebios,\n+\t\t\t\t\t\t 0, N_(\"Create BIOS-like structures for\"\n+\t\t\t\t\t\t \" backward compatibility with\"\n+\t\t\t\t\t\t \" existing OS.\"));\n+\n+ cmd_loadbios = grub_register_command_lockdown (\"loadbios\", grub_cmd_loadbios,\n+\t\t\t\t\t\t N_(\"BIOS_DUMP [INT10_DUMP]\"),\n+\t\t\t\t\t\t N_(\"Load BIOS dump.\"));\n }\n \n GRUB_MOD_FINI(loadbios)\ndiff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c\nindex d70c17486..ed23dc71e 100644\n--- a/grub-core/loader/arm/linux.c\n+++ b/grub-core/loader/arm/linux.c\n@@ -493,9 +493,9 @@ GRUB_MOD_INIT (linux)\n \t\t\t\t 0, N_(\"Load Linux.\"));\n cmd_initrd = grub_register_command (\"initrd\", grub_cmd_initrd,\n \t\t\t\t 0, N_(\"Load initrd.\"));\n- cmd_devicetree = grub_register_command (\"devicetree\", grub_cmd_devicetree,\n-\t\t\t\t\t /* TRANSLATORS: DTB stands for device tree blob. /\n-\t\t\t\t\t 0, N_(\"Load DTB file.\"));\n+ cmd_devicetree = grub_register_command_lockdown (\"devicetree\", grub_cmd_devicetree,\n+\t\t\t\t\t\t / TRANSLATORS: DTB stands for device tree blob. /\n+\t\t\t\t\t\t 0, N_(\"Load DTB file.\"));\n my_mod = mod;\n current_fdt = (const void ) grub_arm_firmware_get_boot_data ();\n machine_type = grub_arm_firmware_get_machine_type ();\ndiff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c\nindex ee9c5592c..003d07cd8 100644\n--- a/grub-core/loader/efi/fdt.c\n+++ b/grub-core/loader/efi/fdt.c\n@@ -165,8 +165,8 @@ static grub_command_t cmd_devicetree;\n GRUB_MOD_INIT (fdt)\n {\n cmd_devicetree =\n- grub_register_command (\"devicetree\", grub_cmd_devicetree, 0,\n-\t\t\t N_(\"Load DTB file.\"));\n+ grub_register_command_lockdown (\"devicetree\", grub_cmd_devicetree, 0,\n+\t\t\t\t N_(\"Load DTB file.\"));\n }\n \n GRUB_MOD_FINI (fdt)\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 5dd34b882fcf19708e976572cfc3e2bc01d3cbf3 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 24 Feb 2021 09:00:05 +0100\nSubject: [PATCH 15/45] commands: Restrict commands that can load BIOS or DT\n blobs when locked down\n\nThere are some more commands that should be restricted when the GRUB is\nlocked down. Following is the list of commands and reasons to restrict:\n\n * fakebios: creates BIOS-like structures for backward compatibility with\n existing OSes. This should not be allowed when locked down.\n\n * loadbios: reads a BIOS dump from storage and loads it. This action\n should not be allowed when locked down.\n\n * devicetree: loads a Device Tree blob and passes it to the OS. It replaces\n any Device Tree provided by the firmware. This also should\n not be allowed when locked down.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n docs/grub.texi \| 3 +++\n grub-core/commands/efi/loadbios.c \| 16 ++++++++--------\n grub-core/loader/arm/linux.c \| 6 +++---\n grub-core/loader/efi/fdt.c \| 4 ++--\n 4 files changed, 16 insertions(+), 13 deletions(-)\n\ndiff --git a/docs/grub.texi b/docs/grub.texi\nindex c26b6082c..c67675bad 100644\n--- a/docs/grub.texi\n+++ b/docs/grub.texi\n@@ -4236,6 +4236,9 @@ Load a device tree blob (.dtb) from a filesystem, for later use by a Linux\n kernel. Does not perform merging with any device tree supplied by firmware,\n but rather replaces it completely.\n @ref{GNU/Linux}.\n+\n+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}).\n+ This is done to prevent subverting various security mechanisms.\n @end deffn\n \n @node distrust\ndiff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c\nindex d41d521a4..5c7725f8b 100644\n--- a/grub-core/commands/efi/loadbios.c\n+++ b/grub-core/commands/efi/loadbios.c\n@@ -205,14 +205,14 @@ static grub_command_t cmd_fakebios, cmd_loadbios;\n \n GRUB_MOD_INIT(loadbios)\n {\n- cmd_fakebios = grub_register_command (\"fakebios\", grub_cmd_fakebios,\n-\t\t\t\t\t0, N_(\"Create BIOS-like structures for\"\n-\t\t\t\t\t \" backward compatibility with\"\n-\t\t\t\t\t \" existing OS.\"));\n-\n- cmd_loadbios = grub_register_command (\"loadbios\", grub_cmd_loadbios,\n-\t\t\t\t\tN_(\"BIOS_DUMP [INT10_DUMP]\"),\n-\t\t\t\t\tN_(\"Load BIOS dump.\"));\n+ cmd_fakebios = grub_register_command_lockdown (\"fakebios\", grub_cmd_fakebios,\n+\t\t\t\t\t\t 0, N_(\"Create BIOS-like structures for\"\n+\t\t\t\t\t\t \" backward compatibility with\"\n+\t\t\t\t\t\t \" existing OS.\"));\n+\n+ cmd_loadbios = grub_register_command_lockdown (\"loadbios\", grub_cmd_loadbios,\n+\t\t\t\t\t\t N_(\"BIOS_DUMP [INT10_DUMP]\"),\n+\t\t\t\t\t\t N_(\"Load BIOS dump.\"));\n }\n \n GRUB_MOD_FINI(loadbios)\ndiff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c\nindex d70c17486..ed23dc71e 100644\n--- a/grub-core/loader/arm/linux.c\n+++ b/grub-core/loader/arm/linux.c\n@@ -493,9 +493,9 @@ GRUB_MOD_INIT (linux)\n \t\t\t\t 0, N_(\"Load Linux.\"));\n cmd_initrd = grub_register_command (\"initrd\", grub_cmd_initrd,\n \t\t\t\t 0, N_(\"Load initrd.\"));\n- cmd_devicetree = grub_register_command (\"devicetree\", grub_cmd_devicetree,\n-\t\t\t\t\t /* TRANSLATORS: DTB stands for device tree blob. /\n-\t\t\t\t\t 0, N_(\"Load DTB file.\"));\n+ cmd_devicetree = grub_register_command_lockdown (\"devicetree\", grub_cmd_devicetree,\n+\t\t\t\t\t\t / TRANSLATORS: DTB stands for device tree blob. /\n+\t\t\t\t\t\t 0, N_(\"Load DTB file.\"));\n my_mod = mod;\n current_fdt = (const void ) grub_arm_firmware_get_boot_data ();\n machine_type = grub_arm_firmware_get_machine_type ();\ndiff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c\nindex ee9c5592c..003d07cd8 100644\n--- a/grub-core/loader/efi/fdt.c\n+++ b/grub-core/loader/efi/fdt.c\n@@ -165,8 +165,8 @@ static grub_command_t cmd_devicetree;\n GRUB_MOD_INIT (fdt)\n {\n cmd_devicetree =\n- grub_register_command (\"devicetree\", grub_cmd_devicetree, 0,\n-\t\t\t N_(\"Load DTB file.\"));\n+ grub_register_command_lockdown (\"devicetree\", grub_cmd_devicetree, 0,\n+\t\t\t\t N_(\"Load DTB file.\"));\n }\n \n GRUB_MOD_FINI (fdt)\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0015-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0015-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch", "tier": "identical", "language": "c", "patch_lines_changed": 30, "patch_files_count": 4, "total_tokens_est": 2261, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nefi/uga: use 64 bit for fb_base\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/video/efi_uga.c\n\n## Target Source Code\n\n### grub-core/video/efi_uga.c\n\n#### GRUB_MOD_LICENSE() [lines 1-92]\n```c\n/\n GRUB -- GRand Unified Bootloader\n * Copyright (C) 2005,2006,2007,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#define grub_video_render_target grub_video_fbrender_target\n\n#include <grub/err.h>\n#include <grub/types.h>\n#include <grub/dl.h>\n#include <grub/misc.h>\n#include <grub/mm.h>\n#include <grub/video.h>\n#include <grub/video_fb.h>\n#include <grub/efi/api.h>\n#include <grub/efi/efi.h>\n#include <grub/efi/uga_draw.h>\n#include <grub/pci.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\nstatic grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;\nstatic struct grub_efi_uga_draw_protocol uga;\nstatic grub_uint32_t uga_fb;\nstatic grub_uint32_t uga_pitch;\n\nstatic struct\n{\n struct grub_video_mode_info mode_info;\n struct grub_video_render_target render_target;\n grub_uint8_t ptr;\n} framebuffer;\n\n#define RGB_MASK\t0xffffff\n#define RGB_MAGIC\t0x121314\n#define LINE_MIN\t800\n#define LINE_MAX\t4096\n#define FBTEST_STEP\t(0x10000 >> 2)\n#define FBTEST_COUNT\t8\n\nstatic int\nfind_line_len (grub_uint32_t fb_base, grub_uint32_t line_len)\n{\n grub_uint32_t base = (grub_uint32_t ) (grub_addr_t) fb_base;\n int i;\n\n for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)\n {\n if ((base & RGB_MASK) == RGB_MAGIC)\n\t{\n\t int j;\n\n\t for (j = LINE_MIN; j <= LINE_MAX; j++)\n\t {\n\t if ((base[j] & RGB_MASK) == RGB_MAGIC)\n\t\t{\n\t\t fb_base = (grub_uint32_t) (grub_addr_t) base;\n\t\t line_len = j << 2;\n\n\t\t return 1;\n\t\t}\n\t }\n\n\t break;\n\t}\n }\n\n return 0;\n}\n\n/* Context for find_framebuf. /\nstruct find_framebuf_ctx\n{\n grub_uint32_t fb_base;\n grub_uint32_t line_len;\n int found;\n};\n\n/ Helper for find_framebuf. /\n```\n\n#### region() [lines 3-110]\n```c\n Copyright (C) 2005,2006,2007,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#define grub_video_render_target grub_video_fbrender_target\n\n#include <grub/err.h>\n#include <grub/types.h>\n#include <grub/dl.h>\n#include <grub/misc.h>\n#include <grub/mm.h>\n#include <grub/video.h>\n#include <grub/video_fb.h>\n#include <grub/efi/api.h>\n#include <grub/efi/efi.h>\n#include <grub/efi/uga_draw.h>\n#include <grub/pci.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\nstatic grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;\nstatic struct grub_efi_uga_draw_protocol uga;\nstatic grub_uint32_t uga_fb;\nstatic grub_uint32_t uga_pitch;\n\nstatic struct\n{\n struct grub_video_mode_info mode_info;\n struct grub_video_render_target render_target;\n grub_uint8_t ptr;\n} framebuffer;\n\n#define RGB_MASK\t0xffffff\n#define RGB_MAGIC\t0x121314\n#define LINE_MIN\t800\n#define LINE_MAX\t4096\n#define FBTEST_STEP\t(0x10000 >> 2)\n#define FBTEST_COUNT\t8\n\nstatic int\nfind_line_len (grub_uint32_t fb_base, grub_uint32_t line_len)\n{\n grub_uint32_t base = (grub_uint32_t ) (grub_addr_t) fb_base;\n int i;\n\n for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)\n {\n if ((base & RGB_MASK) == RGB_MAGIC)\n\t{\n\t int j;\n\n\t for (j = LINE_MIN; j <= LINE_MAX; j++)\n\t {\n\t if ((base[j] & RGB_MASK) == RGB_MAGIC)\n\t\t{\n\t\t fb_base = (grub_uint32_t) (grub_addr_t) base;\n\t\t line_len = j << 2;\n\n\t\t return 1;\n\t\t}\n\t }\n\n\t break;\n\t}\n }\n\n return 0;\n}\n\n/* Context for find_framebuf. /\nstruct find_framebuf_ctx\n{\n grub_uint32_t fb_base;\n grub_uint32_t line_len;\n int found;\n};\n\n/ Helper for find_framebuf. /\nstatic int\nfind_card (grub_pci_device_t dev, grub_pci_id_t pciid, void data)\n{\n struct find_framebuf_ctx ctx = data;\n grub_pci_address_t addr, rcaddr;\n grub_uint32_t subclass;\n\n addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);\n subclass = (grub_pci_read (addr) >> 16) & 0xffff;\n\n if (subclass != GRUB_PCI_CLASS_SUBCLASS_VGA)\n return 0;\n\n / Enable MEM address spaces /\n rcaddr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);\n grub_pci_write_word (rcaddr, grub_pci_read_word (rcaddr) \| GRUB_PCI_COMMAND_MEM_ENABLED);\n\n {\n```\n\n#### find_line_len() [lines 52-84]\n```c\n#define FBTEST_COUNT\t8\n\nstatic int\nfind_line_len (grub_uint32_t fb_base, grub_uint32_t line_len)\n{\n grub_uint32_t base = (grub_uint32_t ) (grub_addr_t) fb_base;\n int i;\n\n for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)\n {\n if ((base & RGB_MASK) == RGB_MAGIC)\n\t{\n\t int j;\n\n\t for (j = LINE_MIN; j <= LINE_MAX; j++)\n\t {\n\t if ((base[j] & RGB_MASK) == RGB_MAGIC)\n\t\t{\n\t\t fb_base = (grub_uint32_t) (grub_addr_t) base;\n\t\t line_len = j << 2;\n\n\t\t return 1;\n\t\t}\n\t }\n\n\t break;\n\t}\n }\n\n return 0;\n}\n\n/ Context for find_framebuf. /\n```\n\n#### find_card() [lines 91-164]\n```c\n\n/ Helper for find_framebuf. /\nstatic int\nfind_card (grub_pci_device_t dev, grub_pci_id_t pciid, void data)\n{\n struct find_framebuf_ctx ctx = data;\n grub_pci_address_t addr, rcaddr;\n grub_uint32_t subclass;\n\n addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);\n subclass = (grub_pci_read (addr) >> 16) & 0xffff;\n\n if (subclass != GRUB_PCI_CLASS_SUBCLASS_VGA)\n return 0;\n\n / Enable MEM address spaces /\n rcaddr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);\n grub_pci_write_word (rcaddr, grub_pci_read_word (rcaddr) \| GRUB_PCI_COMMAND_MEM_ENABLED);\n\n {\n int i;\n\n grub_dprintf (\"fb\", \"Display controller: %d:%d.%d\\nDevice id: %x\\n\",\n\t\t grub_pci_get_bus (dev), grub_pci_get_device (dev),\n\t\t grub_pci_get_function (dev), pciid);\n addr += 8;\n for (i = 0; i < 6; i++, addr += 4)\n\t{\n\t grub_uint32_t old_bar1, old_bar2, type;\n\t grub_uint64_t base64;\n\n\t old_bar1 = grub_pci_read (addr);\n\t if ((! old_bar1) \|\| (old_bar1 & GRUB_PCI_ADDR_SPACE_IO))\n\t continue;\n\n\t type = old_bar1 & GRUB_PCI_ADDR_MEM_TYPE_MASK;\n\t if (type == GRUB_PCI_ADDR_MEM_TYPE_64)\n\t {\n\t if (i == 5)\n\t\tbreak;\n\n\t old_bar2 = grub_pci_read (addr + 4);\n\t }\n\t else\n\t old_bar2 = 0;\n\n\t base64 = old_bar2;\n\t base64 <<= 32;\n\t base64 \|= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);\n\n\t grub_dprintf (\"fb\", \"%s(%d): 0x%llx\\n\",\n\t\t\t((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?\n\t\t\t\"VMEM\" : \"MMIO\"), i,\n\t\t (unsigned long long) base64);\n\n\t if ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) && (! ctx->found))\n\t {\n\t ctx->fb_base = base64;\n\t if (find_line_len (ctx->fb_base, ctx->line_len))\n\t\tctx->found++;\n\t }\n\n\t if (type == GRUB_PCI_ADDR_MEM_TYPE_64)\n\t {\n\t i++;\n\t addr += 4;\n\t }\n\t}\n }\n\n return ctx->found;\n}\n\nstatic int\n```\n\n\n## Upstream Fix\n```diff\nFrom: Andrei Borzenkov <arvidjaar@gmail.com>\nSubject: [PATCH] efi/uga: use 64 bit for fb_base\n\nWe get 64 bit from PCI BAR but then truncate by assigning to 32 bit.\nMake sure to check that pointer does not overflow on 32 bit platform.\n\nCloses: 50931\n\n---\n grub-core/video/efi_uga.c \| 31 ++++++++++++++++---------------\n 1 file changed, 16 insertions(+), 15 deletions(-)\n\nIndex: grub-2.02/grub-core/video/efi_uga.c\n===================================================================\n--- grub-2.02.orig/grub-core/video/efi_uga.c\n+++ grub-2.02/grub-core/video/efi_uga.c\n@@ -34,7 +34,7 @@ GRUB_MOD_LICENSE (\"GPLv3+\");\n \n static grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;\n static struct grub_efi_uga_draw_protocol uga;\n-static grub_uint32_t uga_fb;\n+static grub_uint64_t uga_fb;\n static grub_uint32_t uga_pitch;\n \n static struct\n@@ -52,7 +52,7 @@ static struct\n #define FBTEST_COUNT\t8\n \n static int\n-find_line_len (grub_uint32_t fb_base, grub_uint32_t line_len)\n+find_line_len (grub_uint64_t fb_base, grub_uint32_t line_len)\n {\n grub_uint32_t base = (grub_uint32_t ) (grub_addr_t) fb_base;\n int i;\n@@ -67,7 +67,7 @@ find_line_len (grub_uint32_t fb_base, g\n \t {\n \t if ((base[j] & RGB_MASK) == RGB_MAGIC)\n \t\t{\n-\t\t fb_base = (grub_uint32_t) (grub_addr_t) base;\n+\t\t fb_base = (grub_uint64_t) (grub_addr_t) base;\n \t\t line_len = j << 2;\n \n \t\t return 1;\n@@ -84,7 +84,7 @@ find_line_len (grub_uint32_t fb_base, g\n / Context for find_framebuf. /\n struct find_framebuf_ctx\n {\n- grub_uint32_t fb_base;\n+ grub_uint64_t fb_base;\n grub_uint32_t line_len;\n int found;\n };\n@@ -120,7 +120,9 @@ find_card (grub_pci_device_t dev, grub_p\n \t if (i == 5)\n \t\tbreak;\n \n-\t old_bar2 = grub_pci_read (addr + 4);\n+\t i++;\n+\t addr += 4;\n+\t old_bar2 = grub_pci_read (addr);\n \t }\n \t else\n \t old_bar2 = 0;\n@@ -129,10 +131,15 @@ find_card (grub_pci_device_t dev, grub_p\n \t base64 <<= 32;\n \t base64 \|= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);\n \n-\t grub_dprintf (\"fb\", \"%s(%d): 0x%llx\\n\",\n+\t grub_dprintf (\"fb\", \"%s(%d): 0x%\" PRIxGRUB_UINT64_T \"\\n\",\n \t\t\t((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?\n-\t\t\t\"VMEM\" : \"MMIO\"), i,\n-\t\t (unsigned long long) base64);\n+\t\t\t\"VMEM\" : \"MMIO\"), type == GRUB_PCI_ADDR_MEM_TYPE_64 ? i - 1 : i,\n+\t\t\tbase64);\n+\n+#if GRUB_CPU_SIZEOF_VOID_P == 4\n+\t if (old_bar2)\n+\t continue;\n+#endif\n \n \t if ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) && (! ctx->found))\n \t {\n@@ -140,12 +147,6 @@ find_card (grub_pci_device_t dev, grub_p\n \t if (find_line_len (ctx->fb_base, ctx->line_len))\n \t\tctx->found++;\n \t }\n-\n-\t if (type == GRUB_PCI_ADDR_MEM_TYPE_64)\n-\t {\n-\t i++;\n-\t addr += 4;\n-\t }\n \t}\n }\n \n@@ -153,7 +154,7 @@ find_card (grub_pci_device_t dev, grub_p\n }\n \n static int\n-find_framebuf (grub_uint32_t fb_base, grub_uint32_t line_len)\n+find_framebuf (grub_uint64_t fb_base, grub_uint32_t line_len)\n {\n struct find_framebuf_ctx ctx = {\n .fb_base = fb_base,\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From: Andrei Borzenkov <arvidjaar@gmail.com>\nSubject: [PATCH] efi/uga: use 64 bit for fb_base\n\nWe get 64 bit from PCI BAR but then truncate by assigning to 32 bit.\nMake sure to check that pointer does not overflow on 32 bit platform.\n\nCloses: 50931\n\n---\n grub-core/video/efi_uga.c \| 31 ++++++++++++++++---------------\n 1 file changed, 16 insertions(+), 15 deletions(-)\n\nIndex: grub-2.02/grub-core/video/efi_uga.c\n===================================================================\n--- grub-2.02.orig/grub-core/video/efi_uga.c\n+++ grub-2.02/grub-core/video/efi_uga.c\n@@ -34,7 +34,7 @@ GRUB_MOD_LICENSE (\"GPLv3+\");\n \n static grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;\n static struct grub_efi_uga_draw_protocol uga;\n-static grub_uint32_t uga_fb;\n+static grub_uint64_t uga_fb;\n static grub_uint32_t uga_pitch;\n \n static struct\n@@ -52,7 +52,7 @@ static struct\n #define FBTEST_COUNT\t8\n \n static int\n-find_line_len (grub_uint32_t fb_base, grub_uint32_t line_len)\n+find_line_len (grub_uint64_t fb_base, grub_uint32_t line_len)\n {\n grub_uint32_t base = (grub_uint32_t ) (grub_addr_t) fb_base;\n int i;\n@@ -67,7 +67,7 @@ find_line_len (grub_uint32_t fb_base, g\n \t {\n \t if ((base[j] & RGB_MASK) == RGB_MAGIC)\n \t\t{\n-\t\t fb_base = (grub_uint32_t) (grub_addr_t) base;\n+\t\t fb_base = (grub_uint64_t) (grub_addr_t) base;\n \t\t line_len = j << 2;\n \n \t\t return 1;\n@@ -84,7 +84,7 @@ find_line_len (grub_uint32_t fb_base, g\n / Context for find_framebuf. /\n struct find_framebuf_ctx\n {\n- grub_uint32_t fb_base;\n+ grub_uint64_t fb_base;\n grub_uint32_t line_len;\n int found;\n };\n@@ -120,7 +120,9 @@ find_card (grub_pci_device_t dev, grub_p\n \t if (i == 5)\n \t\tbreak;\n \n-\t old_bar2 = grub_pci_read (addr + 4);\n+\t i++;\n+\t addr += 4;\n+\t old_bar2 = grub_pci_read (addr);\n \t }\n \t else\n \t old_bar2 = 0;\n@@ -129,10 +131,15 @@ find_card (grub_pci_device_t dev, grub_p\n \t base64 <<= 32;\n \t base64 \|= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);\n \n-\t grub_dprintf (\"fb\", \"%s(%d): 0x%llx\\n\",\n+\t grub_dprintf (\"fb\", \"%s(%d): 0x%\" PRIxGRUB_UINT64_T \"\\n\",\n \t\t\t((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?\n-\t\t\t\"VMEM\" : \"MMIO\"), i,\n-\t\t (unsigned long long) base64);\n+\t\t\t\"VMEM\" : \"MMIO\"), type == GRUB_PCI_ADDR_MEM_TYPE_64 ? i - 1 : i,\n+\t\t\tbase64);\n+\n+#if GRUB_CPU_SIZEOF_VOID_P == 4\n+\t if (old_bar2)\n+\t continue;\n+#endif\n \n \t if ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) && (! ctx->found))\n \t {\n@@ -140,12 +147,6 @@ find_card (grub_pci_device_t dev, grub_p\n \t if (find_line_len (ctx->fb_base, ctx->line_len))\n \t\tctx->found++;\n \t }\n-\n-\t if (type == GRUB_PCI_ADDR_MEM_TYPE_64)\n-\t {\n-\t i++;\n-\t addr += 4;\n-\t }\n \t}\n }\n \n@@ -153,7 +154,7 @@ find_card (grub_pci_device_t dev, grub_p\n }\n \n static int\n-find_framebuf (grub_uint32_t fb_base, grub_uint32_t line_len)\n+find_framebuf (grub_uint64_t fb_base, grub_uint32_t line_len)\n {\n struct find_framebuf_ctx ctx = {\n .fb_base = fb_base,\n" } ]	{ "id": "grub2-15947-grub2-efi-uga-64bit-fb.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-efi-uga-64bit-fb.patch", "tier": "identical", "language": "c", "patch_lines_changed": 31, "patch_files_count": 1, "total_tokens_est": 1629, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\n===================================================================\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.02~beta2/grub-core/fs/btrfs.c\n\n## Target Source Code\n\n### grub-core/fs/btrfs.c\n\n#### grub_btrfs_mount() [lines 1154-1194]\n```c\n}\n\nstatic struct grub_btrfs_data \ngrub_btrfs_mount (grub_device_t dev)\n{\n struct grub_btrfs_data data;\n grub_err_t err;\n\n if (!dev->disk)\n {\n grub_error (GRUB_ERR_BAD_FS, \"not BtrFS\");\n return NULL;\n }\n\n data = grub_zalloc (sizeof (data));\n if (!data)\n return NULL;\n\n err = read_sblock (dev->disk, &data->sblock);\n if (err)\n {\n grub_free (data);\n return NULL;\n }\n\n data->n_devices_allocated = 16;\n data->devices_attached = grub_malloc (sizeof (data->devices_attached[0])\n\t\t\t\t\t data->n_devices_allocated);\n if (!data->devices_attached)\n {\n grub_free (data);\n return NULL;\n }\n data->n_devices_attached = 1;\n data->devices_attached[0].dev = dev;\n data->devices_attached[0].id = data->sblock.this_device.device_id;\n\n return data;\n}\n\nstatic void\n```\n\n#### find_path() [lines 1654-1929]\n```c\n}\n\nstatic grub_err_t\nfind_path (struct grub_btrfs_data data,\n\t const char path, struct grub_btrfs_key key,\n\t grub_uint64_t tree, grub_uint8_t type)\n{\n const char slash = path;\n grub_err_t err;\n grub_disk_addr_t elemaddr;\n grub_size_t elemsize;\n grub_size_t allocated = 0;\n struct grub_btrfs_dir_item direl = NULL;\n struct grub_btrfs_key key_out;\n const char ctoken;\n grub_size_t ctokenlen;\n char path_alloc = NULL;\n char origpath = NULL;\n unsigned symlinks_max = 32;\n\n err = get_root (data, key, tree, type);\n if (err)\n return err;\n\n origpath = grub_strdup (path);\n if (!origpath)\n return grub_errno;\n\n while (1)\n {\n while (path[0] == '/')\n\tpath++;\n if (!path[0])\n\tbreak;\n slash = grub_strchr (path, '/');\n if (!slash)\n\tslash = path + grub_strlen (path);\n ctoken = path;\n ctokenlen = slash - path;\n\n if (type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)\n\t{\n\t grub_free (path_alloc);\n\t grub_free (origpath);\n/ ... 212 lines omitted ... /\n\t key = cdirel->key;\n\t if (type == GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)\n\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n\t break;\n\tdefault:\n\t grub_free (path_alloc);\n\t grub_free (origpath);\n\t grub_free (direl);\n\t return grub_error (GRUB_ERR_BAD_FS, \"unrecognised object type 0x%x\",\n\t\t\t cdirel->key.type);\n\t}\n }\n\n grub_free (direl);\n grub_free (origpath);\n grub_free (path_alloc);\n return GRUB_ERR_NONE;\n}\n\nstatic grub_err_t\n```\n\n#### GRUB_MOD_INIT() [lines 2185-2193]\n```c\n#endif\n};\n\nGRUB_MOD_INIT (btrfs)\n{\n grub_fs_register (&grub_btrfs_fs);\n}\n\nGRUB_MOD_FINI (btrfs)\n```\n\n\n## Upstream Fix\n```diff\nIndex: grub-2.02~beta2/grub-core/fs/btrfs.c\n===================================================================\n--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c\n+++ grub-2.02~beta2/grub-core/fs/btrfs.c\n@@ -913,6 +913,7 @@ grub_btrfs_mount (grub_device_t dev)\n {\n struct grub_btrfs_data data;\n grub_err_t err;\n+ const char relpath = grub_env_get (\"btrfs_relative_path\");\n \n if (!dev->disk)\n {\n@@ -943,11 +944,14 @@ grub_btrfs_mount (grub_device_t dev)\n data->devices_attached[0].dev = dev;\n data->devices_attached[0].id = data->sblock.this_device.device_id;\n \n- err = btrfs_handle_subvol (data);\n- if (err)\n+ if (relpath && (relpath[0] == '1' \|\| relpath[0] == 'y'))\n {\n- grub_free (data);\n- return NULL;\n+ err = btrfs_handle_subvol (data);\n+ if (err)\n+ {\n+ grub_free (data);\n+ return NULL;\n+ }\n }\n \n return data;\n@@ -1407,24 +1411,39 @@ find_path (struct grub_btrfs_data data,\n grub_size_t allocated = 0;\n struct grub_btrfs_dir_item direl = NULL;\n struct grub_btrfs_key key_out;\n+ int follow_default;\n const char ctoken;\n grub_size_t ctokenlen;\n char path_alloc = NULL;\n char origpath = NULL;\n unsigned symlinks_max = 32;\n+ const char relpath = grub_env_get (\"btrfs_relative_path\");\n \n+ follow_default = 0;\n origpath = grub_strdup (path);\n if (!origpath)\n return grub_errno;\n \n- if (data->fs_tree)\n+ if (relpath && (relpath[0] == '1' \|\| relpath[0] == 'y'))\n {\n- type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n- tree = data->fs_tree;\n- / This is a tree root, so everything starts at objectid 256 /\n- key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n- key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n- key->offset = 0;\n+ if (data->fs_tree)\n+ {\n+ type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+ tree = data->fs_tree;\n+ / This is a tree root, so everything starts at objectid 256 /\n+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+ key->offset = 0;\n+ }\n+ else\n+ {\n+ type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+ tree = data->sblock.root_tree;\n+ key->object_id = data->sblock.root_dir_objectid;\n+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+ key->offset = 0;\n+ follow_default = 1;\n+ }\n }\n else\n {\n@@ -1435,15 +1454,23 @@ find_path (struct grub_btrfs_data data,\n \n while (1)\n {\n- while (path[0] == '/')\n-\tpath++;\n- if (!path[0])\n-\tbreak;\n- slash = grub_strchr (path, '/');\n- if (!slash)\n-\tslash = path + grub_strlen (path);\n- ctoken = path;\n- ctokenlen = slash - path;\n+ if (!follow_default)\n+\t{\n+\t while (path[0] == '/')\n+\t path++;\n+\t if (!path[0])\n+\t break;\n+\t slash = grub_strchr (path, '/');\n+\t if (!slash)\n+\t slash = path + grub_strlen (path);\n+\t ctoken = path;\n+\t ctokenlen = slash - path;\n+\t}\n+ else\n+\t{\n+\t ctoken = \"default\";\n+\t ctokenlen = sizeof (\"default\") - 1;\n+\t}\n \n if (type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)\n \t{\n@@ -1454,7 +1481,9 @@ find_path (struct grub_btrfs_data data,\n \n if (ctokenlen == 1 && ctoken[0] == '.')\n \t{\n-\t path = slash;\n+\t if (!follow_default)\n+\t path = slash;\n+\t follow_default = 0;\n \t continue;\n \t}\n if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')\n@@ -1485,8 +1514,9 @@ find_path (struct grub_btrfs_data data,\n \t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n \t key->object_id = key_out.offset;\n \n-\t path = slash;\n-\n+\t if (!follow_default)\n+\t path = slash;\n+\t follow_default = 0;\n \t continue;\n \t}\n \n@@ -1555,7 +1585,9 @@ find_path (struct grub_btrfs_data data,\n \t return err;\n \t}\n \n- path = slash;\n+ if (!follow_default)\n+\tpath = slash;\n+ follow_default = 0;\n if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)\n \t{\n \t struct grub_btrfs_inode inode;\n@@ -1605,14 +1637,26 @@ find_path (struct grub_btrfs_data data,\n \t path = path_alloc = tmp;\n \t if (path[0] == '/')\n \t {\n-\t if (data->fs_tree)\n+ if (relpath && (relpath[0] == '1' \|\| relpath[0] == 'y'))\n \t\t{\n-\t\t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n-\t\t tree = data->fs_tree;\n-\t\t /* This is a tree root, so everything starts at objectid 256 /\n-\t\t key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n-\t\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n-\t\t key->offset = 0;\n+\t if (data->fs_tree)\n+\t\t {\n+\t\t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+\t\t tree = data->fs_tree;\n+\t\t / This is a tree root, so everything starts at objectid 256 /\n+\t\t key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n+\t\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+\t\t key->offset = 0;\n+\t\t }\n+\t\t else\n+\t\t {\n+\t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+\t tree = data->sblock.root_tree;\n+\t key->object_id = data->sblock.root_dir_objectid;\n+\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+\t key->offset = 0;\n+\t follow_default = 1;\n+\t\t }\n \t\t}\n \t else\n \t\t{\n@@ -2268,6 +2312,7 @@ GRUB_MOD_INIT (btrfs)\n subvolid_set_env);\n grub_env_export (\"btrfs_subvol\");\n grub_env_export (\"btrfs_subvolid\");\n+ grub_env_export (\"btrfs_relative_path\");\n }\n \n GRUB_MOD_FINI (btrfs)\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: grub-2.02~beta2/grub-core/fs/btrfs.c\n===================================================================\n--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c\n+++ grub-2.02~beta2/grub-core/fs/btrfs.c\n@@ -913,6 +913,7 @@ grub_btrfs_mount (grub_device_t dev)\n {\n struct grub_btrfs_data data;\n grub_err_t err;\n+ const char relpath = grub_env_get (\"btrfs_relative_path\");\n \n if (!dev->disk)\n {\n@@ -943,11 +944,14 @@ grub_btrfs_mount (grub_device_t dev)\n data->devices_attached[0].dev = dev;\n data->devices_attached[0].id = data->sblock.this_device.device_id;\n \n- err = btrfs_handle_subvol (data);\n- if (err)\n+ if (relpath && (relpath[0] == '1' \|\| relpath[0] == 'y'))\n {\n- grub_free (data);\n- return NULL;\n+ err = btrfs_handle_subvol (data);\n+ if (err)\n+ {\n+ grub_free (data);\n+ return NULL;\n+ }\n }\n \n return data;\n@@ -1407,24 +1411,39 @@ find_path (struct grub_btrfs_data data,\n grub_size_t allocated = 0;\n struct grub_btrfs_dir_item direl = NULL;\n struct grub_btrfs_key key_out;\n+ int follow_default;\n const char ctoken;\n grub_size_t ctokenlen;\n char path_alloc = NULL;\n char origpath = NULL;\n unsigned symlinks_max = 32;\n+ const char relpath = grub_env_get (\"btrfs_relative_path\");\n \n+ follow_default = 0;\n origpath = grub_strdup (path);\n if (!origpath)\n return grub_errno;\n \n- if (data->fs_tree)\n+ if (relpath && (relpath[0] == '1' \|\| relpath[0] == 'y'))\n {\n- type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n- tree = data->fs_tree;\n- / This is a tree root, so everything starts at objectid 256 /\n- key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n- key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n- key->offset = 0;\n+ if (data->fs_tree)\n+ {\n+ type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+ tree = data->fs_tree;\n+ / This is a tree root, so everything starts at objectid 256 /\n+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+ key->offset = 0;\n+ }\n+ else\n+ {\n+ type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+ tree = data->sblock.root_tree;\n+ key->object_id = data->sblock.root_dir_objectid;\n+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+ key->offset = 0;\n+ follow_default = 1;\n+ }\n }\n else\n {\n@@ -1435,15 +1454,23 @@ find_path (struct grub_btrfs_data data,\n \n while (1)\n {\n- while (path[0] == '/')\n-\tpath++;\n- if (!path[0])\n-\tbreak;\n- slash = grub_strchr (path, '/');\n- if (!slash)\n-\tslash = path + grub_strlen (path);\n- ctoken = path;\n- ctokenlen = slash - path;\n+ if (!follow_default)\n+\t{\n+\t while (path[0] == '/')\n+\t path++;\n+\t if (!path[0])\n+\t break;\n+\t slash = grub_strchr (path, '/');\n+\t if (!slash)\n+\t slash = path + grub_strlen (path);\n+\t ctoken = path;\n+\t ctokenlen = slash - path;\n+\t}\n+ else\n+\t{\n+\t ctoken = \"default\";\n+\t ctokenlen = sizeof (\"default\") - 1;\n+\t}\n \n if (type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)\n \t{\n@@ -1454,7 +1481,9 @@ find_path (struct grub_btrfs_data data,\n \n if (ctokenlen == 1 && ctoken[0] == '.')\n \t{\n-\t path = slash;\n+\t if (!follow_default)\n+\t path = slash;\n+\t follow_default = 0;\n \t continue;\n \t}\n if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')\n@@ -1485,8 +1514,9 @@ find_path (struct grub_btrfs_data data,\n \t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n \t key->object_id = key_out.offset;\n \n-\t path = slash;\n-\n+\t if (!follow_default)\n+\t path = slash;\n+\t follow_default = 0;\n \t continue;\n \t}\n \n@@ -1555,7 +1585,9 @@ find_path (struct grub_btrfs_data data,\n \t return err;\n \t}\n \n- path = slash;\n+ if (!follow_default)\n+\tpath = slash;\n+ follow_default = 0;\n if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)\n \t{\n \t struct grub_btrfs_inode inode;\n@@ -1605,14 +1637,26 @@ find_path (struct grub_btrfs_data data,\n \t path = path_alloc = tmp;\n \t if (path[0] == '/')\n \t {\n-\t if (data->fs_tree)\n+ if (relpath && (relpath[0] == '1' \|\| relpath[0] == 'y'))\n \t\t{\n-\t\t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n-\t\t tree = data->fs_tree;\n-\t\t /* This is a tree root, so everything starts at objectid 256 /\n-\t\t key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n-\t\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n-\t\t key->offset = 0;\n+\t if (data->fs_tree)\n+\t\t {\n+\t\t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+\t\t tree = data->fs_tree;\n+\t\t / This is a tree root, so everything starts at objectid 256 /\n+\t\t key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);\n+\t\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+\t\t key->offset = 0;\n+\t\t }\n+\t\t else\n+\t\t {\n+\t type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;\n+\t *tree = data->sblock.root_tree;\n+\t key->object_id = data->sblock.root_dir_objectid;\n+\t key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;\n+\t key->offset = 0;\n+\t follow_default = 1;\n+\t\t }\n \t\t}\n \t else\n \t\t{\n@@ -2268,6 +2312,7 @@ GRUB_MOD_INIT (btrfs)\n subvolid_set_env);\n grub_env_export (\"btrfs_subvol\");\n grub_env_export (\"btrfs_subvolid\");\n+ grub_env_export (\"btrfs_relative_path\");\n }\n \n GRUB_MOD_FINI (btrfs)\n" } ]	{ "id": "grub2-15947-grub2-btrfs-03-follow_default.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-btrfs-03-follow_default.patch", "tier": "identical", "language": "c", "patch_lines_changed": 107, "patch_files_count": 1, "total_tokens_est": 2914, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nDon't allow insmod when secure boot is enabled.\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.04~rc1/grub-core/kern/dl.c\n- grub-2.04~rc1/grub-core/kern/efi/efi.c\n- grub-2.04~rc1/include/grub/efi/efi.h\n\n## Target Source Code\n\n### grub-core/kern/dl.c\n\n#### region() [lines 1-95]\n```c\n/* dl.c - loadable module support /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2002,2003,2004,2005,2007,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n/ Force native word size /\n#define GRUB_TARGET_WORDSIZE (8 GRUB_CPU_SIZEOF_VOID_P)\n\n#include <config.h>\n#include <grub/elf.h>\n#include <grub/dl.h>\n#include <grub/misc.h>\n#include <grub/mm.h>\n#include <grub/err.h>\n#include <grub/types.h>\n#include <grub/symbol.h>\n#include <grub/file.h>\n#include <grub/env.h>\n#include <grub/cache.h>\n#include <grub/i18n.h>\n\n/* Platforms where modules are in a readonly area of memory. /\n#if defined(GRUB_MACHINE_QEMU)\n#define GRUB_MODULES_MACHINE_READONLY\n#endif\n\n\f\n\n#pragma GCC diagnostic ignored \"-Wcast-align\"\n\ngrub_dl_t grub_dl_head = 0;\n\ngrub_err_t\ngrub_dl_add (grub_dl_t mod);\n\n/ Keep global so that GDB scripts work. /\ngrub_err_t\ngrub_dl_add (grub_dl_t mod)\n{\n if (grub_dl_get (mod->name))\n return grub_error (GRUB_ERR_BAD_MODULE,\n\t\t \"`%s' is already loaded\", mod->name);\n\n return GRUB_ERR_NONE;\n}\n\nstatic void\ngrub_dl_remove (grub_dl_t mod)\n{\n grub_dl_t p, q;\n\n for (p = &grub_dl_head, q = p; q; p = &q->next, q = p)\n if (q == mod)\n {\n\tp = q->next;\n\treturn;\n }\n}\n\n\f\n\nstruct grub_symbol\n{\n struct grub_symbol next;\n const char name;\n void addr;\n int isfunc;\n grub_dl_t mod;\t/* The module to which this symbol belongs. /\n};\ntypedef struct grub_symbol grub_symbol_t;\n\n/* The size of the symbol table. /\n#define GRUB_SYMTAB_SIZE\t509\n\n/ The symbol table (using an open-hash). /\nstatic struct grub_symbol grub_symtab[GRUB_SYMTAB_SIZE];\n\n/* Simple hash function. /\nstatic unsigned\ngrub_symbol_hash (const char s)\n{\n```\n\n#### grub_dl_load_file() [lines 679-724]\n```c\n\n/* Load a module from the file FILENAME. /\ngrub_dl_t\ngrub_dl_load_file (const char filename)\n{\n grub_file_t file = NULL;\n grub_ssize_t size;\n void core = 0;\n grub_dl_t mod = 0;\n\n grub_boot_time (\"Loading module %s\", filename);\n\n file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);\n if (! file)\n return 0;\n\n size = grub_file_size (file);\n core = grub_malloc (size);\n if (! core)\n {\n grub_file_close (file);\n return 0;\n }\n\n if (grub_file_read (file, core, size) != (int) size)\n {\n grub_file_close (file);\n grub_free (core);\n return 0;\n }\n\n / We must close this before we try to process dependencies.\n Some disk backends do not handle gracefully multiple concurrent\n opens of the same device. /\n grub_file_close (file);\n\n mod = grub_dl_load_core (core, size);\n grub_free (core);\n if (! mod)\n return 0;\n\n mod->ref_count--;\n return mod;\n}\n\n/ Load a module using a symbolic name. /\n```\n\n### grub-core/kern/efi/efi.c\n\n#### grub_efi_get_variable() [lines 223-276]\n```c\n}\n\nvoid \ngrub_efi_get_variable (const char var, const grub_efi_guid_t guid,\n\t\t grub_size_t datasize_out)\n{\n grub_efi_status_t status;\n grub_efi_uintn_t datasize = 0;\n grub_efi_runtime_services_t r;\n grub_efi_char16_t var16;\n void data;\n grub_size_t len, len16;\n\n datasize_out = 0;\n\n len = grub_strlen (var);\n len16 = len GRUB_MAX_UTF16_PER_UTF8;\n var16 = grub_malloc ((len16 + 1) * sizeof (var16[0]));\n if (!var16)\n return NULL;\n len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t ) var, len, NULL);\n var16[len16] = 0;\n\n r = grub_efi_system_table->runtime_services;\n\n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, NULL);\n\n if (status != GRUB_EFI_BUFFER_TOO_SMALL \|\| !datasize)\n {\n grub_free (var16);\n return NULL;\n }\n\n data = grub_malloc (datasize);\n if (!data)\n {\n grub_free (var16);\n return NULL;\n }\n\n status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data);\n grub_free (var16);\n\n if (status == GRUB_EFI_SUCCESS)\n {\n datasize_out = datasize;\n return data;\n }\n\n grub_free (data);\n return NULL;\n}\n\n#pragma GCC diagnostic ignored \"-Wcast-align\"\n```\n\n### include/grub/efi/efi.h\n\n#### EXPORT_FUNC() [lines 36-122]\n```c\n\t\t\t\t\t grub_efi_guid_t protocol,\n\t\t\t\t\t grub_efi_uint32_t attributes);\nint EXPORT_FUNC(grub_efi_set_text_mode) (int on);\nvoid EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);\nvoid \nEXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages,\n\t\t\t\t\t grub_efi_allocate_type_t alloctype,\n\t\t\t\t\t grub_efi_memory_type_t memtype);\nvoid \nEXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages);\nvoid \nEXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);\nvoid EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,\n\t\t\t\t grub_efi_uintn_t pages);\ngrub_efi_uintn_t EXPORT_FUNC(grub_efi_find_mmap_size) (void);\nint\nEXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t memory_map_size,\n\t\t\t\t grub_efi_memory_descriptor_t memory_map,\n\t\t\t\t grub_efi_uintn_t map_key,\n\t\t\t\t grub_efi_uintn_t descriptor_size,\n\t\t\t\t grub_efi_uint32_t descriptor_version);\nvoid grub_efi_memory_fini (void);\ngrub_efi_loaded_image_t EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);\nvoid EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t dp);\nchar EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t dp);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_get_device_path) (grub_efi_handle_t handle);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_find_last_device_path) (const grub_efi_device_path_t dp);\ngrub_efi_device_path_t \nEXPORT_FUNC(grub_efi_duplicate_device_path) (const grub_efi_device_path_t dp);\ngrub_err_t EXPORT_FUNC (grub_efi_finish_boot_services) (grub_efi_uintn_t outbuf_size, void outbuf,\n\t\t\t\t\t\t\tgrub_efi_uintn_t map_key,\n\t\t\t\t\t\t\tgrub_efi_uintn_t efi_desc_size,\n\t\t\t\t\t\t\tgrub_efi_uint32_t efi_desc_version);\ngrub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memory_map_size,\n\t\t\t\t\t\t\t grub_efi_uintn_t descriptor_size,\n\t\t\t\t\t\t\t grub_efi_uint32_t descriptor_version,\n\t\t\t\t\t\t\t grub_efi_memory_descriptor_t virtual_map);\nvoid EXPORT_FUNC (grub_efi_get_variable) (const char variable,\n\t\t\t\t\t const grub_efi_guid_t guid,\n\t\t\t\t\t grub_size_t datasize_out);\ngrub_err_t\nEXPORT_FUNC (grub_efi_set_variable) (const char var,\n\t\t\t\t const grub_efi_guid_t guid,\n\t\t\t\t void data,\n\t\t\t\t grub_size_t datasize);\nint\nEXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n\t\t\t\t\t const grub_efi_device_path_t dp2);\n\nextern void (EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, \n\t\t\t\t\t\tchar device,\n\t\t\t\t\t\tchar path);\n\n#if defined(__arm__) \|\| defined(__aarch64__) \|\| defined(__riscv)\nvoid EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);\ngrub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t );\n#include <grub/cpu/linux.h>\ngrub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header lh);\ngrub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,\n char args);\n#endif\n\ngrub_addr_t grub_efi_modules_addr (void);\n\nvoid grub_efi_mm_init (void);\nvoid grub_efi_mm_fini (void);\nvoid grub_efi_init (void);\nvoid grub_efi_fini (void);\nvoid grub_efi_set_prefix (void);\n\n/* Variables. /\nextern grub_efi_system_table_t EXPORT_VAR(grub_efi_system_table);\nextern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);\n\nextern int EXPORT_VAR(grub_efi_is_finished);\n\nstruct grub_net_card;\n\ngrub_efi_handle_t\ngrub_efinet_get_device_handle (struct grub_net_card card);\n\n#endif / ! GRUB_EFI_EFI_HEADER /\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 29c89e27805f7a6a22bce11ed9bb430e19c972a9 Mon Sep 17 00:00:00 2001\nFrom: Colin Watson <cjwatson@ubuntu.com>\nDate: Tue, 23 Oct 2012 10:40:49 -0400\nSubject: [PATCH 449/482] Don't allow insmod when secure boot is enabled.\n\nReferences: fate#314485\nPatch-Mainline: no\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n---\n grub-core/kern/dl.c \| 17 +++++++++++++++++\n grub-core/kern/efi/efi.c \| 28 ++++++++++++++++++++++++++++\n include/grub/efi/efi.h \| 1 +\n 3 files changed, 46 insertions(+)\n\nIndex: grub-2.04~rc1/grub-core/kern/dl.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/dl.c\n+++ grub-2.04~rc1/grub-core/kern/dl.c\n@@ -38,6 +38,10 @@\n #define GRUB_MODULES_MACHINE_READONLY\n #endif\n \n+#ifdef GRUB_MACHINE_EFI\n+#include <grub/efi/efi.h>\n+#endif\n+\n \f\n \n #pragma GCC diagnostic ignored \"-Wcast-align\"\n@@ -688,6 +692,19 @@ grub_dl_load_file (const char filename)\n \n grub_boot_time (\"Loading module %s\", filename);\n \n+#ifdef GRUB_MACHINE_EFI\n+ if (grub_efi_secure_boot ())\n+ {\n+#if 0\n+ /* This is an error, but grub2-mkconfig still generates a pile of\n+ * insmod commands, so emitting it would be mostly just obnoxious. /\n+ grub_error (GRUB_ERR_ACCESS_DENIED,\n+\t\t \"Secure Boot forbids loading module from %s\", filename);\n+#endif\n+ return 0;\n+ }\n+#endif\n+\n file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);\n if (! file)\n return 0;\nIndex: grub-2.04~rc1/grub-core/kern/efi/efi.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/efi/efi.c\n+++ grub-2.04~rc1/grub-core/kern/efi/efi.c\n@@ -273,6 +273,34 @@ grub_efi_get_variable (const char var,\n return NULL;\n }\n \n+grub_efi_boolean_t\n+grub_efi_secure_boot (void)\n+{\n+ grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n+ grub_size_t datasize;\n+ char secure_boot = NULL;\n+ char setup_mode = NULL;\n+ grub_efi_boolean_t ret = 0;\n+\n+ secure_boot = grub_efi_get_variable(\"SecureBoot\", &efi_var_guid, &datasize);\n+\n+ if (datasize != 1 \|\| !secure_boot)\n+ goto out;\n+\n+ setup_mode = grub_efi_get_variable(\"SetupMode\", &efi_var_guid, &datasize);\n+\n+ if (datasize != 1 \|\| !setup_mode)\n+ goto out;\n+\n+ if (secure_boot && !setup_mode)\n+ ret = 1;\n+\n+ out:\n+ grub_free (secure_boot);\n+ grub_free (setup_mode);\n+ return ret;\n+}\n+\n #pragma GCC diagnostic ignored \"-Wcast-align\"\n \n /* Search the mods section from the PE32/PE32+ image. This code uses\nIndex: grub-2.04~rc1/include/grub/efi/efi.h\n===================================================================\n--- grub-2.04~rc1.orig/include/grub/efi/efi.h\n+++ grub-2.04~rc1/include/grub/efi/efi.h\n@@ -85,6 +85,7 @@ EXPORT_FUNC (grub_efi_set_variable) (con\n \t\t\t\t const grub_efi_guid_t guid,\n \t\t\t\t void data,\n \t\t\t\t grub_size_t datasize);\n+grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);\n int\n EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n \t\t\t\t\t const grub_efi_device_path_t dp2);\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 29c89e27805f7a6a22bce11ed9bb430e19c972a9 Mon Sep 17 00:00:00 2001\nFrom: Colin Watson <cjwatson@ubuntu.com>\nDate: Tue, 23 Oct 2012 10:40:49 -0400\nSubject: [PATCH 449/482] Don't allow insmod when secure boot is enabled.\n\nReferences: fate#314485\nPatch-Mainline: no\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n---\n grub-core/kern/dl.c \| 17 +++++++++++++++++\n grub-core/kern/efi/efi.c \| 28 ++++++++++++++++++++++++++++\n include/grub/efi/efi.h \| 1 +\n 3 files changed, 46 insertions(+)\n\nIndex: grub-2.04~rc1/grub-core/kern/dl.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/dl.c\n+++ grub-2.04~rc1/grub-core/kern/dl.c\n@@ -38,6 +38,10 @@\n #define GRUB_MODULES_MACHINE_READONLY\n #endif\n \n+#ifdef GRUB_MACHINE_EFI\n+#include <grub/efi/efi.h>\n+#endif\n+\n \f\n \n #pragma GCC diagnostic ignored \"-Wcast-align\"\n@@ -688,6 +692,19 @@ grub_dl_load_file (const char filename)\n \n grub_boot_time (\"Loading module %s\", filename);\n \n+#ifdef GRUB_MACHINE_EFI\n+ if (grub_efi_secure_boot ())\n+ {\n+#if 0\n+ / This is an error, but grub2-mkconfig still generates a pile of\n+ * insmod commands, so emitting it would be mostly just obnoxious. /\n+ grub_error (GRUB_ERR_ACCESS_DENIED,\n+\t\t \"Secure Boot forbids loading module from %s\", filename);\n+#endif\n+ return 0;\n+ }\n+#endif\n+\n file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);\n if (! file)\n return 0;\nIndex: grub-2.04~rc1/grub-core/kern/efi/efi.c\n===================================================================\n--- grub-2.04~rc1.orig/grub-core/kern/efi/efi.c\n+++ grub-2.04~rc1/grub-core/kern/efi/efi.c\n@@ -273,6 +273,34 @@ grub_efi_get_variable (const char var,\n return NULL;\n }\n \n+grub_efi_boolean_t\n+grub_efi_secure_boot (void)\n+{\n+ grub_efi_guid_t efi_var_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID;\n+ grub_size_t datasize;\n+ char secure_boot = NULL;\n+ char setup_mode = NULL;\n+ grub_efi_boolean_t ret = 0;\n+\n+ secure_boot = grub_efi_get_variable(\"SecureBoot\", &efi_var_guid, &datasize);\n+\n+ if (datasize != 1 \|\| !secure_boot)\n+ goto out;\n+\n+ setup_mode = grub_efi_get_variable(\"SetupMode\", &efi_var_guid, &datasize);\n+\n+ if (datasize != 1 \|\| !setup_mode)\n+ goto out;\n+\n+ if (secure_boot && !setup_mode)\n+ ret = 1;\n+\n+ out:\n+ grub_free (secure_boot);\n+ grub_free (setup_mode);\n+ return ret;\n+}\n+\n #pragma GCC diagnostic ignored \"-Wcast-align\"\n \n /* Search the mods section from the PE32/PE32+ image. This code uses\nIndex: grub-2.04~rc1/include/grub/efi/efi.h\n===================================================================\n--- grub-2.04~rc1.orig/include/grub/efi/efi.h\n+++ grub-2.04~rc1/include/grub/efi/efi.h\n@@ -85,6 +85,7 @@ EXPORT_FUNC (grub_efi_set_variable) (con\n \t\t\t\t const grub_efi_guid_t guid,\n \t\t\t\t void data,\n \t\t\t\t grub_size_t datasize);\n+grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);\n int\n EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t dp1,\n \t\t\t\t\t const grub_efi_device_path_t dp2);\n" } ]	{ "id": "grub2-15947-grub2-secureboot-no-insmod-on-sb.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-secureboot-no-insmod-on-sb.patch", "tier": "identical", "language": "c", "patch_lines_changed": 46, "patch_files_count": 3, "total_tokens_est": 1693, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nkern/parser: Introduce process_char() helper\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/kern/parser.c\n\n## Target Source Code\n\n### grub-core/kern/parser.c\n\n#### region() [lines 1-59]\n```c\n/* parser.c - the part of the parser that can return partial tokens /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2005,2007,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#include <grub/parser.h>\n#include <grub/env.h>\n#include <grub/misc.h>\n#include <grub/mm.h>\n\n\n/ All the possible state transitions on the command line. If a\n transition can not be found, it is assumed that there is no\n transition and keep_value is assumed to be 1. /\nstatic struct grub_parser_state_transition state_transitions[] = {\n {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_QUOTE, '\\'', 0},\n {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_DQUOTE, '\\\"', 0},\n {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_VAR, '$', 0},\n {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_ESC, '\\\\', 0},\n\n {GRUB_PARSER_STATE_ESC, GRUB_PARSER_STATE_TEXT, 0, 1},\n\n {GRUB_PARSER_STATE_QUOTE, GRUB_PARSER_STATE_TEXT, '\\'', 0},\n\n {GRUB_PARSER_STATE_DQUOTE, GRUB_PARSER_STATE_TEXT, '\\\"', 0},\n {GRUB_PARSER_STATE_DQUOTE, GRUB_PARSER_STATE_QVAR, '$', 0},\n\n {GRUB_PARSER_STATE_VAR, GRUB_PARSER_STATE_VARNAME2, '{', 0},\n {GRUB_PARSER_STATE_VAR, GRUB_PARSER_STATE_VARNAME, 0, 1},\n {GRUB_PARSER_STATE_VARNAME, GRUB_PARSER_STATE_TEXT, ' ', 1},\n {GRUB_PARSER_STATE_VARNAME, GRUB_PARSER_STATE_TEXT, '\\t', 1},\n {GRUB_PARSER_STATE_VARNAME2, GRUB_PARSER_STATE_TEXT, '}', 0},\n\n {GRUB_PARSER_STATE_QVAR, GRUB_PARSER_STATE_QVARNAME2, '{', 0},\n {GRUB_PARSER_STATE_QVAR, GRUB_PARSER_STATE_QVARNAME, 0, 1},\n {GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_TEXT, '\\\"', 0},\n {GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_DQUOTE, ' ', 1},\n {GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_DQUOTE, '\\t', 1},\n {GRUB_PARSER_STATE_QVARNAME2, GRUB_PARSER_STATE_DQUOTE, '}', 0},\n\n {0, 0, 0, 0}\n};\n\n\n/ Determines the state following STATE, determined by C. /\n```\n\n#### add_var() [lines 108-132]\n```c\n\n\nstatic void\nadd_var (char varname, char bp, char vp,\n\t grub_parser_state_t state, grub_parser_state_t newstate)\n{\n const char val;\n\n / Check if a variable was being read in and the end of the name\n was reached. /\n if (!(check_varstate (state) && !check_varstate (newstate)))\n return;\n\n ((vp)++) = '\\0';\n val = grub_env_get (varname);\n vp = varname;\n if (!val)\n return;\n\n /* Insert the contents of the variable in the buffer. /\n for (; val; val++)\n ((bp)++) = val;\n}\n\ngrub_err_t\n```\n\n#### grub_parser_split_cmdline() [lines 130-237]\n```c\n}\n\ngrub_err_t\ngrub_parser_split_cmdline (const char cmdline,\n\t\t\t grub_reader_getline_t getline, void getline_data,\n\t\t\t int argc, char **argv)\n{\n grub_parser_state_t state = GRUB_PARSER_STATE_TEXT;\n / XXX: Fixed size buffer, perhaps this buffer should be dynamically\n allocated. /\n char buffer[1024];\n char bp = buffer;\n char rd = (char ) cmdline;\n char varname[200];\n char vp = varname;\n char args;\n int i;\n\n argc = 0;\n do\n {\n if (!rd \|\| !rd)\n\t{\n\t if (getline)\n\t getline (&rd, 1, getline_data);\n\t else\n\t break;\n\t}\n\n if (!rd)\n\tbreak;\n\n for (; rd; rd++)\n\t{\n\t grub_parser_state_t newstate;\n\t char use;\n\n\t newstate = grub_parser_cmdline_state (state, rd, &use);\n\n\t /* If a variable was being processed and this character does\n\t not describe the variable anymore, write the variable to\n\t the buffer. /\n\t add_var (varname, &bp, &vp, state, newstate);\n\n\t if (check_varstate (newstate))\n\t {\n\t if (use)\n\t\t(vp++) = use;\n\t }\n\t else\n\t {\n\t if (newstate == GRUB_PARSER_STATE_TEXT\n\t\t && state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n\t\t{\n\t\t /* Don't add more than one argument if multiple\n\t\t spaces are used. /\n\t\t if (bp != buffer && (bp - 1))\n\t\t {\n\t\t (bp++) = '\\0';\n\t\t (argc)++;\n\t\t }\n\t\t}\n\t else if (use)\n\t\t(bp++) = use;\n\t }\n\t state = newstate;\n\t}\n }\n while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));\n\n / A special case for when the last character was part of a\n variable. /\n add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT);\n\n if (bp != buffer && (bp - 1))\n {\n (bp++) = '\\0';\n (argc)++;\n }\n\n /* Reserve memory for the return values. /\n args = grub_malloc (bp - buffer);\n if (!args)\n return grub_errno;\n grub_memcpy (args, buffer, bp - buffer);\n\n argv = grub_malloc (sizeof (char ) (argc + 1));\n if (!argv)\n {\n grub_free (args);\n return grub_errno;\n }\n\n /* The arguments are separated with 0's, setup argv so it points to\n the right values. /\n bp = args;\n for (i = 0; i < argc; i++)\n {\n (argv)[i] = bp;\n while (bp)\n\tbp++;\n bp++;\n }\n\n return 0;\n}\n\n/* Helper for grub_parser_execute. /\n```\n\n\n## Upstream Fix\n```diff\nFrom a166721755348e3b6850007a35784d70a2e9843f Mon Sep 17 00:00:00 2001\nFrom: Chris Coulson <chris.coulson@canonical.com>\nDate: Tue, 5 Jan 2021 22:17:28 +0000\nSubject: [PATCH 26/45] kern/parser: Introduce process_char() helper\n\ngrub_parser_split_cmdline() iterates over each command line character.\nIn order to add error checking and to simplify the subsequent error\nhandling, split the character processing in to a separate function.\n\nSigned-off-by: Chris Coulson <chris.coulson@canonical.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/kern/parser.c \| 74 +++++++++++++++++++++++++----------------\n 1 file changed, 46 insertions(+), 28 deletions(-)\n\ndiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c\nindex 39e4df65b..0d3582bd8 100644\n--- a/grub-core/kern/parser.c\n+++ b/grub-core/kern/parser.c\n@@ -1,7 +1,7 @@\n / parser.c - the part of the parser that can return partial tokens /\n /\n * GRUB -- GRand Unified Bootloader\n- * Copyright (C) 2005,2007,2009 Free Software Foundation, Inc.\n+ * Copyright (C) 2005,2007,2009,2021 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n@@ -129,6 +129,46 @@ add_var (char varname, char bp, char vp,\n ((bp)++) = val;\n }\n \n+static grub_err_t\n+process_char (char c, char buffer, char bp, char varname, char *vp,\n+\t grub_parser_state_t state, int argc,\n+\t grub_parser_state_t newstate)\n+{\n+ char use;\n+\n+ newstate = grub_parser_cmdline_state (state, c, &use);\n+\n+ /\n+ If a variable was being processed and this character does\n+ * not describe the variable anymore, write the variable to\n+ * the buffer.\n+ /\n+ add_var (varname, bp, vp, state, newstate);\n+\n+ if (check_varstate (newstate))\n+ {\n+ if (use)\n+\t((vp)++) = use;\n+ }\n+ else if (newstate == GRUB_PARSER_STATE_TEXT &&\n+\t state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n+ {\n+ /\n+ Don't add more than one argument if multiple\n+ * spaces are used.\n+ /\n+ if (bp != buffer && ((bp) - 1) != '\\0')\n+\t{\n+\t ((bp)++) = '\\0';\n+\t (argc)++;\n+\t}\n+ }\n+ else if (use)\n+ ((bp)++) = use;\n+\n+ return GRUB_ERR_NONE;\n+}\n+\n grub_err_t\n grub_parser_split_cmdline (const char cmdline,\n \t\t\t grub_reader_getline_t getline, void getline_data,\n@@ -172,35 +212,13 @@ grub_parser_split_cmdline (const char cmdline,\n for (; rp != '\\0'; rp++)\n \t{\n \t grub_parser_state_t newstate;\n-\t char use;\n-\n-\t newstate = grub_parser_cmdline_state (state, rp, &use);\n \n-\t /* If a variable was being processed and this character does\n-\t not describe the variable anymore, write the variable to\n-\t the buffer. /\n-\t add_var (varname, &bp, &vp, state, newstate);\n-\n-\t if (check_varstate (newstate))\n-\t {\n-\t if (use)\n-\t\t(vp++) = use;\n-\t }\n-\t else\n+\t if (process_char (rp, buffer, &bp, varname, &vp, state, argc,\n+\t\t\t &newstate) != GRUB_ERR_NONE)\n \t {\n-\t if (newstate == GRUB_PARSER_STATE_TEXT\n-\t\t && state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n-\t\t{\n-\t\t / Don't add more than one argument if multiple\n-\t\t spaces are used. /\n-\t\t if (bp != buffer && (bp - 1))\n-\t\t {\n-\t\t (bp++) = '\\0';\n-\t\t (argc)++;\n-\t\t }\n-\t\t}\n-\t else if (use)\n-\t\t(bp++) = use;\n+\t if (rd != cmdline)\n+\t\tgrub_free (rd);\n+\t return grub_errno;\n \t }\n \t state = newstate;\n \t}\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From a166721755348e3b6850007a35784d70a2e9843f Mon Sep 17 00:00:00 2001\nFrom: Chris Coulson <chris.coulson@canonical.com>\nDate: Tue, 5 Jan 2021 22:17:28 +0000\nSubject: [PATCH 26/45] kern/parser: Introduce process_char() helper\n\ngrub_parser_split_cmdline() iterates over each command line character.\nIn order to add error checking and to simplify the subsequent error\nhandling, split the character processing in to a separate function.\n\nSigned-off-by: Chris Coulson <chris.coulson@canonical.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/kern/parser.c \| 74 +++++++++++++++++++++++++----------------\n 1 file changed, 46 insertions(+), 28 deletions(-)\n\ndiff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c\nindex 39e4df65b..0d3582bd8 100644\n--- a/grub-core/kern/parser.c\n+++ b/grub-core/kern/parser.c\n@@ -1,7 +1,7 @@\n / parser.c - the part of the parser that can return partial tokens /\n /\n * GRUB -- GRand Unified Bootloader\n- * Copyright (C) 2005,2007,2009 Free Software Foundation, Inc.\n+ * Copyright (C) 2005,2007,2009,2021 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n@@ -129,6 +129,46 @@ add_var (char varname, char bp, char vp,\n ((bp)++) = val;\n }\n \n+static grub_err_t\n+process_char (char c, char buffer, char bp, char varname, char *vp,\n+\t grub_parser_state_t state, int argc,\n+\t grub_parser_state_t newstate)\n+{\n+ char use;\n+\n+ newstate = grub_parser_cmdline_state (state, c, &use);\n+\n+ /\n+ If a variable was being processed and this character does\n+ * not describe the variable anymore, write the variable to\n+ * the buffer.\n+ /\n+ add_var (varname, bp, vp, state, newstate);\n+\n+ if (check_varstate (newstate))\n+ {\n+ if (use)\n+\t((vp)++) = use;\n+ }\n+ else if (newstate == GRUB_PARSER_STATE_TEXT &&\n+\t state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n+ {\n+ /\n+ Don't add more than one argument if multiple\n+ * spaces are used.\n+ /\n+ if (bp != buffer && ((bp) - 1) != '\\0')\n+\t{\n+\t ((bp)++) = '\\0';\n+\t (argc)++;\n+\t}\n+ }\n+ else if (use)\n+ ((bp)++) = use;\n+\n+ return GRUB_ERR_NONE;\n+}\n+\n grub_err_t\n grub_parser_split_cmdline (const char cmdline,\n \t\t\t grub_reader_getline_t getline, void getline_data,\n@@ -172,35 +212,13 @@ grub_parser_split_cmdline (const char cmdline,\n for (; rp != '\\0'; rp++)\n \t{\n \t grub_parser_state_t newstate;\n-\t char use;\n-\n-\t newstate = grub_parser_cmdline_state (state, rp, &use);\n \n-\t /* If a variable was being processed and this character does\n-\t not describe the variable anymore, write the variable to\n-\t the buffer. /\n-\t add_var (varname, &bp, &vp, state, newstate);\n-\n-\t if (check_varstate (newstate))\n-\t {\n-\t if (use)\n-\t\t(vp++) = use;\n-\t }\n-\t else\n+\t if (process_char (rp, buffer, &bp, varname, &vp, state, argc,\n+\t\t\t &newstate) != GRUB_ERR_NONE)\n \t {\n-\t if (newstate == GRUB_PARSER_STATE_TEXT\n-\t\t && state != GRUB_PARSER_STATE_ESC && grub_isspace (use))\n-\t\t{\n-\t\t / Don't add more than one argument if multiple\n-\t\t spaces are used. /\n-\t\t if (bp != buffer && (bp - 1))\n-\t\t {\n-\t\t (bp++) = '\\0';\n-\t\t (argc)++;\n-\t\t }\n-\t\t}\n-\t else if (use)\n-\t\t*(bp++) = use;\n+\t if (rd != cmdline)\n+\t\tgrub_free (rd);\n+\t return grub_errno;\n \t }\n \t state = newstate;\n \t}\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0026-kern-parser-Introduce-process_char-helper.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0026-kern-parser-Introduce-process_char-helper.patch", "tier": "identical", "language": "c", "patch_lines_changed": 75, "patch_files_count": 1, "total_tokens_est": 1897, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nutil/mkimage: Remove unused code to add BSS section\n\n## Package\ngrub2\n\n## Files to modify\n- util/mkimage.c\n\n## Target Source Code\n\n### util/mkimage.c\n\n#### grub_install_generate_image() [lines 1160-1754]\n```c\n break;\n }\n\n switch (image_target->id)\n {\n case IMAGE_I386_PC:\n case IMAGE_I386_PC_PXE:\n case IMAGE_I386_PC_ELTORITO:\n {\n\tunsigned num;\n\tchar boot_path, boot_img;\n\tsize_t boot_size;\n\n\tnum = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);\n\tif (image_target->id == IMAGE_I386_PC_PXE)\n\t {\n\t char pxeboot_path, pxeboot_img;\n\t size_t pxeboot_size;\n\t grub_uint32_t ptr;\n\t \n\t pxeboot_path = grub_util_get_path (dir, \"pxeboot.img\");\n\t pxeboot_size = grub_util_get_image_size (pxeboot_path);\n\t pxeboot_img = grub_util_read_image (pxeboot_path);\n\t \n\t grub_util_write_image (pxeboot_img, pxeboot_size, out,\n\t\t\t\t outname);\n\t free (pxeboot_img);\n\t free (pxeboot_path);\n\n\t / Remove Multiboot header to avoid confusing ipxe. /\n\t for (ptr = (grub_uint32_t ) core_img;\n\t\t ptr < (grub_uint32_t ) (core_img + MULTIBOOT_SEARCH); ptr++)\n\t if (ptr == grub_host_to_target32 (MULTIBOOT_HEADER_MAGIC)\n\t\t && grub_target_to_host32 (ptr[0])\n\t\t + grub_target_to_host32 (ptr[1])\n\t\t + grub_target_to_host32 (ptr[2]) == 0)\n\t\t{\n\t\t ptr = 0;\n\t\t break;\n\t\t}\n/ ... 95 lines omitted ... /\n\t {\n\t struct grub_pe32_optional_header o;\n\n\t c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header));\n\n\t o = (struct grub_pe32_optional_header )\n\t (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE\n\t + sizeof (struct grub_pe32_coff_header));\n\t o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);\n\t o->code_size = grub_host_to_target32 (layout.exec_size);\n\t o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size\n\t\t\t\t\t - header_size);\n\t o->bss_size = grub_cpu_to_le32 (layout.bss_size);\n\t o->entry_addr = grub_cpu_to_le32 (layout.start_address);\n\t o->code_base = grub_cpu_to_le32 (header_size);\n\n\t o->data_base = grub_host_to_target32 (header_size + layout.exec_size);\n\n\t o->image_base = 0;\n\t o->section_alignment = grub_host_to_target32 (image_target->section_align);\n\t o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT);\n\t o->image_size = grub_host_to_target32 (pe_size);\n\t o->header_size = grub_host_to_target32 (header_size);\n\t o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);\n\n\t / Do these really matter? /\n\t o->stack_reserve_size = grub_host_to_target32 (0x10000);\n/ ... 413 lines omitted ... /\n\t {\n\t if (comp == GRUB_COMPRESSION_NONE)\n\t target_addr = (image_target->link_addr - decompress_size);\n\t else\n\t target_addr = ALIGN_UP (image_target->link_addr\n\t\t\t\t + layout.kernel_size + total_module_size, 32);\n\t }\n\telse\n\t target_addr = image_target->link_addr;\n\tif (image_target->voidp_sizeof == 4)\n\t grub_mkimage_generate_elf32 (image_target, note, &core_img, &core_size,\n\t\t\t\t target_addr, &layout);\n\telse\n\t grub_mkimage_generate_elf64 (image_target, note, &core_img, &core_size,\n\t\t\t\t target_addr, &layout);\n }\n break;\n }\n\n grub_util_write_image (core_img, core_size, out, outname);\n```\n\n#### grub_install_generate_image() [lines 1338-1459]\n```c\n\t o = (struct grub_pe64_optional_header ) \n\t (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE\n\t + sizeof (struct grub_pe32_coff_header));\n\t o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC);\n\t o->code_size = grub_host_to_target32 (layout.exec_size);\n\t o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size\n\t\t\t\t\t - header_size);\n\t o->bss_size = grub_cpu_to_le32 (layout.bss_size);\n\t o->entry_addr = grub_cpu_to_le32 (layout.start_address);\n\t o->code_base = grub_cpu_to_le32 (header_size);\n\t o->image_base = 0;\n\t o->section_alignment = grub_host_to_target32 (image_target->section_align);\n\t o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT);\n\t o->image_size = grub_host_to_target32 (pe_size);\n\t o->header_size = grub_host_to_target32 (header_size);\n\t o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);\n\n\t /* Do these really matter? /\n\t o->stack_reserve_size = grub_host_to_target64 (0x10000);\n\t o->stack_commit_size = grub_host_to_target64 (0x10000);\n\t o->heap_reserve_size = grub_host_to_target64 (0x10000);\n\t o->heap_commit_size = grub_host_to_target64 (0x10000);\n \n\t o->num_data_directories\n\t = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);\n\n\t o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);\n\t o->base_relocation_table.size = grub_host_to_target32 (layout.reloc_size);\n\t sections = o + 1;\n\t }\n\t/ The sections. /\n\ttext_section = sections;\n\tstrcpy (text_section->name, \".text\");\n\ttext_section->virtual_size = grub_cpu_to_le32 (layout.exec_size);\n\ttext_section->virtual_address = grub_cpu_to_le32 (header_size);\n\ttext_section->raw_data_size = grub_cpu_to_le32 (layout.exec_size);\n\ttext_section->raw_data_offset = grub_cpu_to_le32 (header_size);\n\ttext_section->characteristics = grub_cpu_to_le32_compile_time (\n\t\t\t\t\t\t GRUB_PE32_SCN_CNT_CODE\n\t\t\t\t\t\t\| GRUB_PE32_SCN_MEM_EXECUTE\n\t\t\t\t\t\t\| GRUB_PE32_SCN_MEM_READ);\n\n\tdata_section = text_section + 1;\n\tstrcpy (data_section->name, \".data\");\n\tdata_section->virtual_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size);\n\tdata_section->virtual_address = grub_cpu_to_le32 (header_size + layout.exec_size);\n\tdata_section->raw_data_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size);\n\tdata_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.exec_size);\n\tdata_section->characteristics\n\t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n\t\t\t \| GRUB_PE32_SCN_MEM_READ\n\t\t\t \| GRUB_PE32_SCN_MEM_WRITE);\n\n#if 0\n\tbss_section = data_section + 1;\n\tstrcpy (bss_section->name, \".bss\");\n\tbss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size);\n\tbss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size);\n\tbss_section->raw_data_size = 0;\n\tbss_section->raw_data_offset = 0;\n\tbss_section->characteristics\n\t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ\n\t\t\t \| GRUB_PE32_SCN_MEM_WRITE\n\t\t\t \| GRUB_PE32_SCN_ALIGN_64BYTES\n\t\t\t \| GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n\t\t\t \| 0x80);\n#endif\n \n\tmods_section = data_section + 1;\n\tstrcpy (mods_section->name, \"mods\");\n\tmods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size);\n\tmods_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size + layout.bss_size);\n\tmods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size);\n\tmods_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.kernel_size);\n\tmods_section->characteristics\n\t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n\t\t\t \| GRUB_PE32_SCN_MEM_READ\n\t\t\t \| GRUB_PE32_SCN_MEM_WRITE);\n\n\treloc_section = mods_section + 1;\n\tstrcpy (reloc_section->name, \".reloc\");\n/ ... 21 lines omitted ... /\n\tboot_size = grub_util_get_image_size (boot_path);\n\tboot_img = grub_util_read_image (boot_path);\n\n\t/ Rom sizes must be 64k-aligned. /\n\trom_size = ALIGN_UP (core_size + boot_size, 64 1024);\n\n\trom_img = xmalloc (rom_size);\n\tmemset (rom_img, 0, rom_size);\n\n\t((grub_int32_t ) (core_img + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR))\n\t = grub_host_to_target32 ((grub_uint32_t) -rom_size);\n\n\tmemcpy (rom_img, core_img, core_size);\n\n\t((grub_int32_t ) (boot_img + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR))\n\t = grub_host_to_target32 ((grub_uint32_t) -rom_size);\n\n\tmemcpy (rom_img + rom_size - boot_size, boot_img, boot_size);\n\n\tfree (core_img);\n```\n\n\n## Upstream Fix\n```diff\nFrom 158c4e03ccee6e86fb15c6fd98008e4fc9071b7c Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Thu, 11 Feb 2021 17:06:49 +0100\nSubject: [PATCH 31/45] util/mkimage: Remove unused code to add BSS section\n\nThe code is compiled out so there is no reason to keep it.\n\nAdditionally, don't set bss_size field since we do not add a BSS section.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n util/mkimage.c \| 17 -----------------\n 1 file changed, 17 deletions(-)\n\ndiff --git a/util/mkimage.c b/util/mkimage.c\nindex 37d6249f1..32bb8ea68 100644\n--- a/util/mkimage.c\n+++ b/util/mkimage.c\n@@ -1304,7 +1304,6 @@ grub_install_generate_image (const char dir, const char prefix,\n \t o->code_size = grub_host_to_target32 (layout.exec_size);\n \t o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size\n \t\t\t\t\t - header_size);\n-\t o->bss_size = grub_cpu_to_le32 (layout.bss_size);\n \t o->entry_addr = grub_cpu_to_le32 (layout.start_address);\n \t o->code_base = grub_cpu_to_le32 (header_size);\n \n@@ -1342,7 +1341,6 @@ grub_install_generate_image (const char dir, const char prefix,\n \t o->code_size = grub_host_to_target32 (layout.exec_size);\n \t o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size\n \t\t\t\t\t - header_size);\n-\t o->bss_size = grub_cpu_to_le32 (layout.bss_size);\n \t o->entry_addr = grub_cpu_to_le32 (layout.start_address);\n \t o->code_base = grub_cpu_to_le32 (header_size);\n \t o->image_base = 0;\n@@ -1387,21 +1385,6 @@ grub_install_generate_image (const char dir, const char prefix,\n \t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n \t\t\t \| GRUB_PE32_SCN_MEM_READ\n \t\t\t \| GRUB_PE32_SCN_MEM_WRITE);\n-\n-#if 0\n-\tbss_section = data_section + 1;\n-\tstrcpy (bss_section->name, \".bss\");\n-\tbss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size);\n-\tbss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size);\n-\tbss_section->raw_data_size = 0;\n-\tbss_section->raw_data_offset = 0;\n-\tbss_section->characteristics\n-\t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ\n-\t\t\t \| GRUB_PE32_SCN_MEM_WRITE\n-\t\t\t \| GRUB_PE32_SCN_ALIGN_64BYTES\n-\t\t\t \| GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n-\t\t\t \| 0x80);\n-#endif\n \n \tmods_section = data_section + 1;\n \tstrcpy (mods_section->name, \"mods\");\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 158c4e03ccee6e86fb15c6fd98008e4fc9071b7c Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Thu, 11 Feb 2021 17:06:49 +0100\nSubject: [PATCH 31/45] util/mkimage: Remove unused code to add BSS section\n\nThe code is compiled out so there is no reason to keep it.\n\nAdditionally, don't set bss_size field since we do not add a BSS section.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n util/mkimage.c \| 17 -----------------\n 1 file changed, 17 deletions(-)\n\ndiff --git a/util/mkimage.c b/util/mkimage.c\nindex 37d6249f1..32bb8ea68 100644\n--- a/util/mkimage.c\n+++ b/util/mkimage.c\n@@ -1304,7 +1304,6 @@ grub_install_generate_image (const char dir, const char prefix,\n \t o->code_size = grub_host_to_target32 (layout.exec_size);\n \t o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size\n \t\t\t\t\t - header_size);\n-\t o->bss_size = grub_cpu_to_le32 (layout.bss_size);\n \t o->entry_addr = grub_cpu_to_le32 (layout.start_address);\n \t o->code_base = grub_cpu_to_le32 (header_size);\n \n@@ -1342,7 +1341,6 @@ grub_install_generate_image (const char dir, const char prefix,\n \t o->code_size = grub_host_to_target32 (layout.exec_size);\n \t o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size\n \t\t\t\t\t - header_size);\n-\t o->bss_size = grub_cpu_to_le32 (layout.bss_size);\n \t o->entry_addr = grub_cpu_to_le32 (layout.start_address);\n \t o->code_base = grub_cpu_to_le32 (header_size);\n \t o->image_base = 0;\n@@ -1387,21 +1385,6 @@ grub_install_generate_image (const char dir, const char prefix,\n \t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n \t\t\t \| GRUB_PE32_SCN_MEM_READ\n \t\t\t \| GRUB_PE32_SCN_MEM_WRITE);\n-\n-#if 0\n-\tbss_section = data_section + 1;\n-\tstrcpy (bss_section->name, \".bss\");\n-\tbss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size);\n-\tbss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size);\n-\tbss_section->raw_data_size = 0;\n-\tbss_section->raw_data_offset = 0;\n-\tbss_section->characteristics\n-\t = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ\n-\t\t\t \| GRUB_PE32_SCN_MEM_WRITE\n-\t\t\t \| GRUB_PE32_SCN_ALIGN_64BYTES\n-\t\t\t \| GRUB_PE32_SCN_CNT_INITIALIZED_DATA\n-\t\t\t \| 0x80);\n-#endif\n \n \tmods_section = data_section + 1;\n \tstrcpy (mods_section->name, \"mods\");\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0031-util-mkimage-Remove-unused-code-to-add-BSS-section.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0031-util-mkimage-Remove-unused-code-to-add-BSS-section.patch", "tier": "identical", "language": "c", "patch_lines_changed": 18, "patch_files_count": 1, "total_tokens_est": 1358, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\n===================================================================\n\n## Package\ngrub2\n\n## Files to modify\n- grub-2.02~beta2/util/editenv.c\n\n## Target Source Code\n\n### util/editenv.c\n\n#### region() [lines 1-67]\n```c\n/* editenv.c - tool to edit environment block. /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2008,2009,2010,2013 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#include <config.h>\n#include <grub/types.h>\n#include <grub/emu/misc.h>\n#include <grub/util/misc.h>\n#include <grub/util/install.h>\n#include <grub/lib/envblk.h>\n#include <grub/i18n.h>\n#include <grub/emu/hostfile.h>\n\n#include <errno.h>\n#include <string.h>\n\n#define DEFAULT_ENVBLK_SIZE\t1024\n\nvoid\ngrub_util_create_envblk_file (const char name)\n{\n FILE fp;\n char buf;\n char namenew;\n\n buf = xmalloc (DEFAULT_ENVBLK_SIZE);\n\n namenew = xasprintf (\"%s.new\", name);\n fp = grub_util_fopen (namenew, \"wb\");\n if (! fp)\n grub_util_error (_(\"cannot open `%s': %s\"), namenew,\n\t\t strerror (errno));\n\n memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);\n memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',\n DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);\n\n if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)\n grub_util_error (_(\"cannot write to `%s': %s\"), namenew,\n\t\t strerror (errno));\n\n\n if (grub_util_file_sync (fp) < 0)\n grub_util_error (_(\"cannot sync `%s': %s\"), namenew, strerror (errno));\n free (buf);\n fclose (fp);\n\n if (grub_util_rename (namenew, name) < 0)\n grub_util_error (_(\"cannot rename the file %s to %s\"), namenew, name);\n free (namenew);\n}\n\n```\n\n#### grub_util_create_envblk_file() [lines 32-67]\n```c\n#define DEFAULT_ENVBLK_SIZE\t1024\n\nvoid\ngrub_util_create_envblk_file (const char name)\n{\n FILE fp;\n char buf;\n char namenew;\n\n buf = xmalloc (DEFAULT_ENVBLK_SIZE);\n\n namenew = xasprintf (\"%s.new\", name);\n fp = grub_util_fopen (namenew, \"wb\");\n if (! fp)\n grub_util_error (_(\"cannot open `%s': %s\"), namenew,\n\t\t strerror (errno));\n\n memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);\n memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',\n DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);\n\n if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)\n grub_util_error (_(\"cannot write to `%s': %s\"), namenew,\n\t\t strerror (errno));\n\n\n if (grub_util_file_sync (fp) < 0)\n grub_util_error (_(\"cannot sync `%s': %s\"), namenew, strerror (errno));\n free (buf);\n fclose (fp);\n\n if (grub_util_rename (namenew, name) < 0)\n grub_util_error (_(\"cannot rename the file %s to %s\"), namenew, name);\n free (namenew);\n}\n\n```\n\n\n## Upstream Fix\n```diff\nIndex: grub-2.02~beta2/util/editenv.c\n===================================================================\n--- grub-2.02~beta2.orig/util/editenv.c\n+++ grub-2.02~beta2/util/editenv.c\n@@ -30,12 +30,14 @@\n #include <string.h>\n \n #define DEFAULT_ENVBLK_SIZE\t1024\n+#define GRUB_ENVBLK_MESSAGE\t\"# WARNING: Do not edit this file other than by grub2-editenv\\n\"\n \n void\n grub_util_create_envblk_file (const char name)\n {\n FILE fp;\n char buf;\n+ char pbuf;\n char namenew;\n \n buf = xmalloc (DEFAULT_ENVBLK_SIZE);\n@@ -46,9 +48,13 @@ grub_util_create_envblk_file (const char\n grub_util_error (_(\"cannot open `%s': %s\"), namenew,\n \t\t strerror (errno));\n \n- memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);\n- memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',\n- DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);\n+ pbuf = buf;\n+ memcpy (pbuf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);\n+ pbuf += sizeof (GRUB_ENVBLK_SIGNATURE) - 1;\n+ memcpy (pbuf, GRUB_ENVBLK_MESSAGE, sizeof (GRUB_ENVBLK_MESSAGE) - 1);\n+ pbuf += sizeof (GRUB_ENVBLK_MESSAGE) - 1;\n+ memset (pbuf , '#',\n+ DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) - sizeof (GRUB_ENVBLK_MESSAGE) + 2);\n \n if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)\n grub_util_error (_(\"cannot write to `%s': %s\"), namenew,\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: grub-2.02~beta2/util/editenv.c\n===================================================================\n--- grub-2.02~beta2.orig/util/editenv.c\n+++ grub-2.02~beta2/util/editenv.c\n@@ -30,12 +30,14 @@\n #include <string.h>\n \n #define DEFAULT_ENVBLK_SIZE\t1024\n+#define GRUB_ENVBLK_MESSAGE\t\"# WARNING: Do not edit this file other than by grub2-editenv\\n\"\n \n void\n grub_util_create_envblk_file (const char name)\n {\n FILE fp;\n char buf;\n+ char pbuf;\n char *namenew;\n \n buf = xmalloc (DEFAULT_ENVBLK_SIZE);\n@@ -46,9 +48,13 @@ grub_util_create_envblk_file (const char\n grub_util_error (_(\"cannot open `%s': %s\"), namenew,\n \t\t strerror (errno));\n \n- memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);\n- memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',\n- DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);\n+ pbuf = buf;\n+ memcpy (pbuf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);\n+ pbuf += sizeof (GRUB_ENVBLK_SIGNATURE) - 1;\n+ memcpy (pbuf, GRUB_ENVBLK_MESSAGE, sizeof (GRUB_ENVBLK_MESSAGE) - 1);\n+ pbuf += sizeof (GRUB_ENVBLK_MESSAGE) - 1;\n+ memset (pbuf , '#',\n+ DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) - sizeof (GRUB_ENVBLK_MESSAGE) + 2);\n \n if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)\n grub_util_error (_(\"cannot write to `%s': %s\"), namenew,\n" } ]	{ "id": "grub2-15947-grub2-editenv-add-warning-message.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "grub2-editenv-add-warning-message.patch", "tier": "identical", "language": "c", "patch_lines_changed": 12, "patch_files_count": 1, "total_tokens_est": 848, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nverifiers: Move verifiers API to kernel image\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/Makefile.am\n- grub-core/Makefile.core.def\n- grub-core/kern/main.c\n- grub-core/commands/verifiers.c\n- include/grub/verify.h\n\n## Target Source Code\n\n### grub-core/kern/main.c\n\n#### region() [lines 1-86]\n```c\n/* main.c - the kernel main routine /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2002,2003,2005,2006,2008,2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#include <grub/kernel.h>\n#include <grub/misc.h>\n#include <grub/symbol.h>\n#include <grub/dl.h>\n#include <grub/term.h>\n#include <grub/file.h>\n#include <grub/device.h>\n#include <grub/env.h>\n#include <grub/mm.h>\n#include <grub/command.h>\n#include <grub/reader.h>\n#include <grub/parser.h>\n\n#ifdef GRUB_MACHINE_PCBIOS\n#include <grub/machine/memory.h>\n#endif\n\ngrub_addr_t\ngrub_modules_get_end (void)\n{\n struct grub_module_info modinfo;\n\n modinfo = (struct grub_module_info ) grub_modbase;\n\n / Check if there are any modules. /\n if ((modinfo == 0) \|\| modinfo->magic != GRUB_MODULE_MAGIC)\n return grub_modbase;\n\n return grub_modbase + modinfo->size;\n}\n\n/ Load all modules in core. /\nstatic void\ngrub_load_modules (void)\n{\n struct grub_module_header header;\n FOR_MODULES (header)\n {\n /* Not an ELF module, skip. /\n if (header->type != OBJ_TYPE_ELF)\n continue;\n\n if (! grub_dl_load_core ((char ) header + sizeof (struct grub_module_header),\n\t\t\t (header->size - sizeof (struct grub_module_header))))\n grub_fatal (\"%s\", grub_errmsg);\n\n if (grub_errno)\n grub_print_error ();\n }\n}\n\nstatic char load_config;\n\nstatic void\ngrub_load_config (void)\n{\n struct grub_module_header header;\n FOR_MODULES (header)\n {\n /* Not an embedded config, skip. /\n if (header->type != OBJ_TYPE_CONFIG)\n continue;\n\n load_config = grub_malloc (header->size - sizeof (struct grub_module_header) + 1);\n if (!load_config)\n {\n\tgrub_print_error ();\n```\n\n### grub-core/commands/verifiers.c\n\n#### grub_verify_string() [lines 204-220]\n```c\n}\n\ngrub_err_t\ngrub_verify_string (char str, enum grub_verify_string_type type)\n{\n struct grub_file_verifier ver;\n FOR_LIST_ELEMENTS(ver, grub_file_verifiers)\n {\n grub_err_t err;\n err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE;\n if (err)\n\treturn err;\n }\n return GRUB_ERR_NONE;\n}\n\nGRUB_MOD_INIT(verifiers)\n```\n\n### include/grub/verify.h\n\n#### region() [lines 15-85]\n```c\n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#ifndef GRUB_VERIFY_HEADER\n#define GRUB_VERIFY_HEADER 1\n\n#include <grub/file.h>\n#include <grub/list.h>\n\nenum grub_verify_flags\n {\n GRUB_VERIFY_FLAGS_SKIP_VERIFICATION\t= 1,\n GRUB_VERIFY_FLAGS_SINGLE_CHUNK\t= 2,\n / Defer verification to another authority. /\n GRUB_VERIFY_FLAGS_DEFER_AUTH\t= 4\n };\n\nenum grub_verify_string_type\n {\n GRUB_VERIFY_KERNEL_CMDLINE,\n GRUB_VERIFY_MODULE_CMDLINE,\n GRUB_VERIFY_COMMAND,\n };\n\nstruct grub_file_verifier\n{\n struct grub_file_verifier next;\n struct grub_file_verifier *prev;\n\n const char name;\n\n /\n Check if file needs to be verified and set up context.\n * init/read/fini is structured in the same way as hash interface.\n /\n grub_err_t (init) (grub_file_t io, enum grub_file_type type,\n\t\t void *context, enum grub_verify_flags flags);\n\n /\n Right now we pass the whole file in one call but it may\n * change in the future. If you insist on single buffer you\n * need to set GRUB_VERIFY_FLAGS_SINGLE_CHUNK in verify_flags.\n /\n grub_err_t (write) (void context, void buf, grub_size_t size);\n\n grub_err_t (fini) (void context);\n void (close) (void context);\n\n grub_err_t (verify_string) (char str, enum grub_verify_string_type type);\n};\n\nextern struct grub_file_verifier grub_file_verifiers;\n\nstatic inline void\ngrub_verifier_register (struct grub_file_verifier ver)\n{\n grub_list_push (GRUB_AS_LIST_P (&grub_file_verifiers), GRUB_AS_LIST (ver));\n}\n\nstatic inline void\ngrub_verifier_unregister (struct grub_file_verifier ver)\n{\n grub_list_remove (GRUB_AS_LIST (ver));\n}\n\ngrub_err_t\ngrub_verify_string (char str, enum grub_verify_string_type type);\n\n#endif /* ! GRUB_VERIFY_HEADER /\n\n```\n\n#### grub_verifier_unregister() [lines 73-81]\n```c\n}\n\nstatic inline void\ngrub_verifier_unregister (struct grub_file_verifier ver)\n{\n grub_list_remove (GRUB_AS_LIST (ver));\n}\n\ngrub_err_t\n```\n\n\n## Upstream Fix\n```diff\nFrom 4d299c2fe05d39ad1b544d47afe79d71cc00bafa Mon Sep 17 00:00:00 2001\nFrom: Marco A Benatto <mbenatto@redhat.com>\nDate: Wed, 23 Sep 2020 11:33:33 -0400\nSubject: [PATCH 07/45] verifiers: Move verifiers API to kernel image\n\nMove verifiers API from a module to the kernel image, so it can be\nused there as well. There are no functional changes in this patch.\n\nSigned-off-by: Marco A Benatto <mbenatto@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/Makefile.am \| 1 +\n grub-core/Makefile.core.def \| 6 +-----\n grub-core/kern/main.c \| 4 ++++\n grub-core/{commands => kern}/verifiers.c \| 8 ++------\n include/grub/verify.h \| 9 ++++++---\n 5 files changed, 14 insertions(+), 14 deletions(-)\n rename grub-core/{commands => kern}/verifiers.c (97%)\n\ndiff --git a/grub-core/Makefile.am b/grub-core/Makefile.am\nindex 5ff3afd62..3569b7101 100644\n--- a/grub-core/Makefile.am\n+++ b/grub-core/Makefile.am\n@@ -91,6 +91,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h\n+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h\ndiff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def\nindex 9ee37f56d..5184aea24 100644\n--- a/grub-core/Makefile.core.def\n+++ b/grub-core/Makefile.core.def\n@@ -140,6 +140,7 @@ kernel = {\n common = kern/rescue_parser.c;\n common = kern/rescue_reader.c;\n common = kern/term.c;\n+ common = kern/verifiers.c;\n \n noemu = kern/compiler-rt.c;\n noemu = kern/mm.c;\n@@ -943,11 +944,6 @@ module = {\n cppflags = '-I$(srcdir)/lib/posix_wrap';\n };\n \n-module = {\n- name = verifiers;\n- common = commands/verifiers.c;\n-};\n-\n module = {\n name = shim_lock;\n common = commands/efi/shim_lock.c;\ndiff --git a/grub-core/kern/main.c b/grub-core/kern/main.c\nindex 9cad0c448..73967e2f5 100644\n--- a/grub-core/kern/main.c\n+++ b/grub-core/kern/main.c\n@@ -29,6 +29,7 @@\n #include <grub/command.h>\n #include <grub/reader.h>\n #include <grub/parser.h>\n+#include <grub/verify.h>\n \n #ifdef GRUB_MACHINE_PCBIOS\n #include <grub/machine/memory.h>\n@@ -274,6 +275,9 @@ grub_main (void)\n grub_printf (\"Welcome to GRUB!\\n\\n\");\n grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);\n \n+ /* Init verifiers API. /\n+ grub_verifiers_init ();\n+\n grub_load_config ();\n \n grub_boot_time (\"Before loading embedded modules.\");\ndiff --git a/grub-core/commands/verifiers.c b/grub-core/kern/verifiers.c\nsimilarity index 97%\nrename from grub-core/commands/verifiers.c\nrename to grub-core/kern/verifiers.c\nindex 7b9297cd3..3d19bffd1 100644\n--- a/grub-core/commands/verifiers.c\n+++ b/grub-core/kern/verifiers.c\n@@ -218,12 +218,8 @@ grub_verify_string (char str, enum grub_verify_string_type type)\n return GRUB_ERR_NONE;\n }\n \n-GRUB_MOD_INIT(verifiers)\n+void\n+grub_verifiers_init (void)\n {\n grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open);\n }\n-\n-GRUB_MOD_FINI(verifiers)\n-{\n- grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY);\n-}\ndiff --git a/include/grub/verify.h b/include/grub/verify.h\nindex ea0491433..cd129c398 100644\n--- a/include/grub/verify.h\n+++ b/include/grub/verify.h\n@@ -64,7 +64,10 @@ struct grub_file_verifier\n grub_err_t (verify_string) (char str, enum grub_verify_string_type type);\n };\n \n-extern struct grub_file_verifier grub_file_verifiers;\n+extern struct grub_file_verifier EXPORT_VAR (grub_file_verifiers);\n+\n+extern void\n+grub_verifiers_init (void);\n \n static inline void\n grub_verifier_register (struct grub_file_verifier ver)\n@@ -78,7 +81,7 @@ grub_verifier_unregister (struct grub_file_verifier ver)\n grub_list_remove (GRUB_AS_LIST (ver));\n }\n \n-grub_err_t\n-grub_verify_string (char str, enum grub_verify_string_type type);\n+extern grub_err_t\n+EXPORT_FUNC (grub_verify_string) (char str, enum grub_verify_string_type type);\n \n #endif /* ! GRUB_VERIFY_HEADER /\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 4d299c2fe05d39ad1b544d47afe79d71cc00bafa Mon Sep 17 00:00:00 2001\nFrom: Marco A Benatto <mbenatto@redhat.com>\nDate: Wed, 23 Sep 2020 11:33:33 -0400\nSubject: [PATCH 07/45] verifiers: Move verifiers API to kernel image\n\nMove verifiers API from a module to the kernel image, so it can be\nused there as well. There are no functional changes in this patch.\n\nSigned-off-by: Marco A Benatto <mbenatto@redhat.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/Makefile.am \| 1 +\n grub-core/Makefile.core.def \| 6 +-----\n grub-core/kern/main.c \| 4 ++++\n grub-core/{commands => kern}/verifiers.c \| 8 ++------\n include/grub/verify.h \| 9 ++++++---\n 5 files changed, 14 insertions(+), 14 deletions(-)\n rename grub-core/{commands => kern}/verifiers.c (97%)\n\ndiff --git a/grub-core/Makefile.am b/grub-core/Makefile.am\nindex 5ff3afd62..3569b7101 100644\n--- a/grub-core/Makefile.am\n+++ b/grub-core/Makefile.am\n@@ -91,6 +91,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h\n+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h\n KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h\ndiff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def\nindex 9ee37f56d..5184aea24 100644\n--- a/grub-core/Makefile.core.def\n+++ b/grub-core/Makefile.core.def\n@@ -140,6 +140,7 @@ kernel = {\n common = kern/rescue_parser.c;\n common = kern/rescue_reader.c;\n common = kern/term.c;\n+ common = kern/verifiers.c;\n \n noemu = kern/compiler-rt.c;\n noemu = kern/mm.c;\n@@ -943,11 +944,6 @@ module = {\n cppflags = '-I$(srcdir)/lib/posix_wrap';\n };\n \n-module = {\n- name = verifiers;\n- common = commands/verifiers.c;\n-};\n-\n module = {\n name = shim_lock;\n common = commands/efi/shim_lock.c;\ndiff --git a/grub-core/kern/main.c b/grub-core/kern/main.c\nindex 9cad0c448..73967e2f5 100644\n--- a/grub-core/kern/main.c\n+++ b/grub-core/kern/main.c\n@@ -29,6 +29,7 @@\n #include <grub/command.h>\n #include <grub/reader.h>\n #include <grub/parser.h>\n+#include <grub/verify.h>\n \n #ifdef GRUB_MACHINE_PCBIOS\n #include <grub/machine/memory.h>\n@@ -274,6 +275,9 @@ grub_main (void)\n grub_printf (\"Welcome to GRUB!\\n\\n\");\n grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);\n \n+ / Init verifiers API. /\n+ grub_verifiers_init ();\n+\n grub_load_config ();\n \n grub_boot_time (\"Before loading embedded modules.\");\ndiff --git a/grub-core/commands/verifiers.c b/grub-core/kern/verifiers.c\nsimilarity index 97%\nrename from grub-core/commands/verifiers.c\nrename to grub-core/kern/verifiers.c\nindex 7b9297cd3..3d19bffd1 100644\n--- a/grub-core/commands/verifiers.c\n+++ b/grub-core/kern/verifiers.c\n@@ -218,12 +218,8 @@ grub_verify_string (char str, enum grub_verify_string_type type)\n return GRUB_ERR_NONE;\n }\n \n-GRUB_MOD_INIT(verifiers)\n+void\n+grub_verifiers_init (void)\n {\n grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open);\n }\n-\n-GRUB_MOD_FINI(verifiers)\n-{\n- grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY);\n-}\ndiff --git a/include/grub/verify.h b/include/grub/verify.h\nindex ea0491433..cd129c398 100644\n--- a/include/grub/verify.h\n+++ b/include/grub/verify.h\n@@ -64,7 +64,10 @@ struct grub_file_verifier\n grub_err_t (verify_string) (char str, enum grub_verify_string_type type);\n };\n \n-extern struct grub_file_verifier grub_file_verifiers;\n+extern struct grub_file_verifier EXPORT_VAR (grub_file_verifiers);\n+\n+extern void\n+grub_verifiers_init (void);\n \n static inline void\n grub_verifier_register (struct grub_file_verifier ver)\n@@ -78,7 +81,7 @@ grub_verifier_unregister (struct grub_file_verifier ver)\n grub_list_remove (GRUB_AS_LIST (ver));\n }\n \n-grub_err_t\n-grub_verify_string (char str, enum grub_verify_string_type type);\n+extern grub_err_t\n+EXPORT_FUNC (grub_verify_string) (char str, enum grub_verify_string_type type);\n \n #endif /* ! GRUB_VERIFY_HEADER */\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0007-verifiers-Move-verifiers-API-to-kernel-image.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0007-verifiers-Move-verifiers-API-to-kernel-image.patch", "tier": "identical", "language": "c", "patch_lines_changed": 29, "patch_files_count": 5, "total_tokens_est": 2312, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nefi/linux: provide linux command\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/Makefile.core.def\n- grub-core/gensyminfo.sh.in\n- grub-core/loader/i386/efi/linux.c\n\n## Target Source Code\n\n### grub-core/loader/i386/efi/linux.c\n\n#### grub_cmd_linux() [lines 298-303]\n```c\n }\n free_dir (root);\n root = 0;\n return GRUB_ERR_NONE;\n}\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 987ab0dfbe7ef42bb6386fb7b428d3b965ba6d2b Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Mon, 7 Sep 2020 17:02:57 +0800\nSubject: [PATCH] efi/linux: provide linux command\n\nThe linux kernel's efi handover entry point is used to boot efistub of\nthe linux kernel. Since then the efistub has been improved with many new\nfeatures and fixes that ordinary 32-bit entry point cannot provide.\n\nBesides, nearly every x86 efi kernel is built with efistub enabled so it\nis of little value to keep 32-bit entry as default to boot kernel\nwithout needed kconfig options enabled.\n\nFor all good reasons, making efi handover the default entry point for\nbooting kernel in x86 efi platform so that linux command works in the\nsame way to linuxefi. This can also reduce the complexity of providing\ngeneral grub configuation for x86 system due to the linux command may\nnot be available in signed image for UEFI Secure Boot and linuxefi is\nnot available for leagcy bios booting.\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n---\n grub-core/Makefile.core.def \| 6 ++++--\n grub-core/gensyminfo.sh.in \| 3 +++\n grub-core/loader/i386/efi/linux.c \| 17 +++++++++++++----\n 3 files changed, 20 insertions(+), 6 deletions(-)\n\ndiff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def\nindex 6045da47b..3ea9dace0 100644\n--- a/grub-core/Makefile.core.def\n+++ b/grub-core/Makefile.core.def\n@@ -1773,7 +1773,9 @@ module = {\n \n module = {\n name = linux;\n- x86 = loader/i386/linux.c;\n+ i386_pc = loader/i386/linux.c;\n+ i386_efi = loader/i386/efi/linux.c;\n+ x86_64_efi = loader/i386/efi/linux.c;\n i386_xen_pvh = loader/i386/linux.c;\n xen = loader/i386/xen.c;\n i386_pc = lib/i386/pc/vesa_modes_table.c;\n@@ -1852,7 +1854,7 @@ module = {\n \n module = {\n name = linuxefi;\n- efi = loader/i386/efi/linux.c;\n+ efi = lib/fake_module.c;\n enable = i386_efi;\n enable = x86_64_efi;\n };\ndiff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in\nindex 9bc767532..098de9258 100644\n--- a/grub-core/gensyminfo.sh.in\n+++ b/grub-core/gensyminfo.sh.in\n@@ -35,3 +35,6 @@ fi\n \n # Print all undefined symbols used by module\n @TARGET_NM@ -u @TARGET_NMFLAGS_MINUS_P@ -p $module \| sed \"s@^\$[^ ]\$.@undefined $modname \\1@g\"\n+\n+# Specify linuxefi module should load default linux\n+test \"$modname\" = \"linuxefi\" && echo \"undefined $modname grub_initrd_init\" \|\| true\ndiff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c\nindex 8017e8c05..3f6d51519 100644\n--- a/grub-core/loader/i386/efi/linux.c\n+++ b/grub-core/loader/i386/efi/linux.c\n@@ -347,20 +347,29 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),\n }\n \n static grub_command_t cmd_linux, cmd_initrd;\n+static grub_command_t cmd_linuxefi, cmd_initrdefi;\n \n-GRUB_MOD_INIT(linuxefi)\n+GRUB_MOD_INIT(linux)\n {\n- cmd_linux =\n+ cmd_linuxefi =\n grub_register_command (\"linuxefi\", grub_cmd_linux,\n 0, N_(\"Load Linux.\"));\n- cmd_initrd =\n+ cmd_initrdefi =\n grub_register_command (\"initrdefi\", grub_cmd_initrd,\n 0, N_(\"Load initrd.\"));\n+ cmd_linux =\n+ grub_register_command (\"linux\", grub_cmd_linux,\n+ 0, N_(\"Load Linux.\"));\n+ cmd_initrd =\n+ grub_register_command (\"initrd\", grub_cmd_initrd,\n+ 0, N_(\"Load initrd.\"));\n my_mod = mod;\n }\n \n-GRUB_MOD_FINI(linuxefi)\n+GRUB_MOD_FINI(linux)\n {\n+ grub_unregister_command (cmd_linuxefi);\n+ grub_unregister_command (cmd_initrdefi);\n grub_unregister_command (cmd_linux);\n grub_unregister_command (cmd_initrd);\n }\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 987ab0dfbe7ef42bb6386fb7b428d3b965ba6d2b Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Mon, 7 Sep 2020 17:02:57 +0800\nSubject: [PATCH] efi/linux: provide linux command\n\nThe linux kernel's efi handover entry point is used to boot efistub of\nthe linux kernel. Since then the efistub has been improved with many new\nfeatures and fixes that ordinary 32-bit entry point cannot provide.\n\nBesides, nearly every x86 efi kernel is built with efistub enabled so it\nis of little value to keep 32-bit entry as default to boot kernel\nwithout needed kconfig options enabled.\n\nFor all good reasons, making efi handover the default entry point for\nbooting kernel in x86 efi platform so that linux command works in the\nsame way to linuxefi. This can also reduce the complexity of providing\ngeneral grub configuation for x86 system due to the linux command may\nnot be available in signed image for UEFI Secure Boot and linuxefi is\nnot available for leagcy bios booting.\n\nSigned-off-by: Michael Chang <mchang@suse.com>\n---\n grub-core/Makefile.core.def \| 6 ++++--\n grub-core/gensyminfo.sh.in \| 3 +++\n grub-core/loader/i386/efi/linux.c \| 17 +++++++++++++----\n 3 files changed, 20 insertions(+), 6 deletions(-)\n\ndiff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def\nindex 6045da47b..3ea9dace0 100644\n--- a/grub-core/Makefile.core.def\n+++ b/grub-core/Makefile.core.def\n@@ -1773,7 +1773,9 @@ module = {\n \n module = {\n name = linux;\n- x86 = loader/i386/linux.c;\n+ i386_pc = loader/i386/linux.c;\n+ i386_efi = loader/i386/efi/linux.c;\n+ x86_64_efi = loader/i386/efi/linux.c;\n i386_xen_pvh = loader/i386/linux.c;\n xen = loader/i386/xen.c;\n i386_pc = lib/i386/pc/vesa_modes_table.c;\n@@ -1852,7 +1854,7 @@ module = {\n \n module = {\n name = linuxefi;\n- efi = loader/i386/efi/linux.c;\n+ efi = lib/fake_module.c;\n enable = i386_efi;\n enable = x86_64_efi;\n };\ndiff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in\nindex 9bc767532..098de9258 100644\n--- a/grub-core/gensyminfo.sh.in\n+++ b/grub-core/gensyminfo.sh.in\n@@ -35,3 +35,6 @@ fi\n \n # Print all undefined symbols used by module\n @TARGET_NM@ -u @TARGET_NMFLAGS_MINUS_P@ -p $module \| sed \"s@^\$[^ ]\$.@undefined $modname \\1@g\"\n+\n+# Specify linuxefi module should load default linux\n+test \"$modname\" = \"linuxefi\" && echo \"undefined $modname grub_initrd_init\" \|\| true\ndiff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c\nindex 8017e8c05..3f6d51519 100644\n--- a/grub-core/loader/i386/efi/linux.c\n+++ b/grub-core/loader/i386/efi/linux.c\n@@ -347,20 +347,29 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),\n }\n \n static grub_command_t cmd_linux, cmd_initrd;\n+static grub_command_t cmd_linuxefi, cmd_initrdefi;\n \n-GRUB_MOD_INIT(linuxefi)\n+GRUB_MOD_INIT(linux)\n {\n- cmd_linux =\n+ cmd_linuxefi =\n grub_register_command (\"linuxefi\", grub_cmd_linux,\n 0, N_(\"Load Linux.\"));\n- cmd_initrd =\n+ cmd_initrdefi =\n grub_register_command (\"initrdefi\", grub_cmd_initrd,\n 0, N_(\"Load initrd.\"));\n+ cmd_linux =\n+ grub_register_command (\"linux\", grub_cmd_linux,\n+ 0, N_(\"Load Linux.\"));\n+ cmd_initrd =\n+ grub_register_command (\"initrd\", grub_cmd_initrd,\n+ 0, N_(\"Load initrd.\"));\n my_mod = mod;\n }\n \n-GRUB_MOD_FINI(linuxefi)\n+GRUB_MOD_FINI(linux)\n {\n+ grub_unregister_command (cmd_linuxefi);\n+ grub_unregister_command (cmd_initrdefi);\n grub_unregister_command (cmd_linux);\n grub_unregister_command (cmd_initrd);\n }\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0001-efi-linux-provide-linux-command.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0001-efi-linux-provide-linux-command.patch", "tier": "identical", "language": "c", "patch_lines_changed": 27, "patch_files_count": 3, "total_tokens_est": 1963, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\ndl: Only allow unloading modules that are not\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/commands/minicmd.c\n- grub-core/kern/dl.c\n- include/grub/dl.h\n\n## Target Source Code\n\n### grub-core/commands/minicmd.c\n\n#### grub_mini_cmd_rmmod() [lines 125-149]\n```c\n\n/* rmmod MODULE /\nstatic grub_err_t\ngrub_mini_cmd_rmmod (struct grub_command cmd __attribute__ ((unused)),\n\t\t int argc, char argv[])\n{\n grub_dl_t mod;\n\n if (argc == 0)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"no module specified\");\n\n mod = grub_dl_get (argv[0]);\n if (! mod)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"no such module\");\n\n if (grub_dl_is_persistent (mod))\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"cannot unload persistent module\");\n\n if (grub_dl_unref (mod) <= 0)\n grub_dl_unload (mod);\n\n return 0;\n}\n\n/ lsmod /\n```\n\n### grub-core/kern/dl.c\n\n#### grub_dl_unref() [lines 536-552]\n```c\n}\n\nint\ngrub_dl_unref (grub_dl_t mod)\n{\n grub_dl_dep_t dep;\n\n if (!mod)\n return 0;\n\n for (dep = mod->dep; dep; dep = dep->next)\n grub_dl_unref (dep->mod);\n\n return --mod->ref_count;\n}\n\nstatic void\n```\n\n### include/grub/dl.h\n\n#### EXPORT_FUNC() [lines 154-263]\n```c\n\nstruct grub_dl_segment\n{\n struct grub_dl_segment next;\n void addr;\n grub_size_t size;\n unsigned section;\n};\ntypedef struct grub_dl_segment grub_dl_segment_t;\n\nstruct grub_dl;\n\nstruct grub_dl_dep\n{\n struct grub_dl_dep next;\n struct grub_dl mod;\n};\ntypedef struct grub_dl_dep grub_dl_dep_t;\n\n#ifndef GRUB_UTIL\nstruct grub_dl\n{\n char name;\n int ref_count;\n int persistent;\n grub_dl_dep_t dep;\n grub_dl_segment_t segment;\n Elf_Sym symtab;\n grub_size_t symsize;\n void (init) (struct grub_dl mod);\n void (fini) (void);\n#if !defined (__i386__) && !defined (__x86_64__)\n void got;\n void gotptr;\n void tramp;\n void trampptr;\n#endif\n#ifdef __mips__\n grub_uint32_t reginfo;\n#endif\n void base;\n grub_size_t sz;\n struct grub_dl next;\n};\n#endif\ntypedef struct grub_dl grub_dl_t;\n\ngrub_dl_t grub_dl_load_file (const char filename);\ngrub_dl_t EXPORT_FUNC(grub_dl_load) (const char name);\ngrub_dl_t grub_dl_load_core (void addr, grub_size_t size);\ngrub_dl_t EXPORT_FUNC(grub_dl_load_core_noinit) (void addr, grub_size_t size);\nint EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);\nvoid grub_dl_unload_unneeded (void);\nint EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);\nint EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);\nextern grub_dl_t EXPORT_VAR(grub_dl_head);\n\n#ifndef GRUB_UTIL\n\n#define FOR_DL_MODULES(var) FOR_LIST_ELEMENTS ((var), (grub_dl_head))\n\n#ifdef GRUB_MACHINE_EMU\nvoid \ngrub_osdep_dl_memalign (grub_size_t align, grub_size_t size);\nvoid\ngrub_dl_osdep_dl_free (void ptr);\n#endif\n\nstatic inline void\ngrub_dl_init (grub_dl_t mod)\n{\n if (mod->init)\n (mod->init) (mod);\n\n mod->next = grub_dl_head;\n grub_dl_head = mod;\n}\n\nstatic inline grub_dl_t\ngrub_dl_get (const char name)\n{\n grub_dl_t l;\n\n FOR_DL_MODULES(l)\n if (grub_strcmp (name, l->name) == 0)\n return l;\n\n return 0;\n}\n\nstatic inline void\ngrub_dl_set_persistent (grub_dl_t mod)\n{\n mod->persistent = 1;\n}\n\nstatic inline int\ngrub_dl_is_persistent (grub_dl_t mod)\n{\n return mod->persistent;\n}\n\n#endif\n\ngrub_err_t grub_dl_register_symbol (const char name, void addr,\n\t\t\t\t int isfunc, grub_dl_t mod);\n\ngrub_err_t grub_arch_dl_check_header (void ehdr);\n#ifndef GRUB_UTIL\ngrub_err_t\n```\n\n\n## Upstream Fix\n```diff\nFrom 3f67ccf5cf8921269fed1a9c605350cbcc650007 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Tue, 29 Sep 2020 14:08:55 +0200\nSubject: [PATCH 20/45] dl: Only allow unloading modules that are not\n dependencies\n\nWhen a module is attempted to be removed its reference counter is always\ndecremented. This means that repeated rmmod invocations will cause the\nmodule to be unloaded even if another module depends on it.\n\nThis may lead to a use-after-free scenario allowing an attacker to execute\narbitrary code and by-pass the UEFI Secure Boot protection.\n\nWhile being there, add the extern keyword to some function declarations in\nthat header file.\n\nFixes: CVE-2020-25632\n\nReported-by: Chris Coulson <chris.coulson@canonical.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/minicmd.c \| 7 +++++--\n grub-core/kern/dl.c \| 9 +++++++++\n include/grub/dl.h \| 8 +++++---\n 3 files changed, 19 insertions(+), 5 deletions(-)\n\ndiff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c\nindex 6bbce3128..fa498931e 100644\n--- a/grub-core/commands/minicmd.c\n+++ b/grub-core/commands/minicmd.c\n@@ -140,8 +140,11 @@ grub_mini_cmd_rmmod (struct grub_command cmd __attribute__ ((unused)),\n if (grub_dl_is_persistent (mod))\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"cannot unload persistent module\");\n \n- if (grub_dl_unref (mod) <= 0)\n- grub_dl_unload (mod);\n+ if (grub_dl_ref_count (mod) > 1)\n+ return grub_error (GRUB_ERR_BAD_ARGUMENT, \"cannot unload referenced module\");\n+\n+ grub_dl_unref (mod);\n+ grub_dl_unload (mod);\n \n return 0;\n }\ndiff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c\nindex 2a8372e14..e02f2afc5 100644\n--- a/grub-core/kern/dl.c\n+++ b/grub-core/kern/dl.c\n@@ -553,6 +553,15 @@ grub_dl_unref (grub_dl_t mod)\n return --mod->ref_count;\n }\n \n+int\n+grub_dl_ref_count (grub_dl_t mod)\n+{\n+ if (mod == NULL)\n+ return 0;\n+\n+ return mod->ref_count;\n+}\n+\n static void\n grub_dl_flush_cache (grub_dl_t mod)\n {\ndiff --git a/include/grub/dl.h b/include/grub/dl.h\nindex f03c03561..b3753c9ca 100644\n--- a/include/grub/dl.h\n+++ b/include/grub/dl.h\n@@ -203,9 +203,11 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char name);\n grub_dl_t grub_dl_load_core (void addr, grub_size_t size);\n grub_dl_t EXPORT_FUNC(grub_dl_load_core_noinit) (void addr, grub_size_t size);\n int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);\n-void grub_dl_unload_unneeded (void);\n-int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);\n-int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);\n+extern void grub_dl_unload_unneeded (void);\n+extern int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);\n+extern int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);\n+extern int EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod);\n+\n extern grub_dl_t EXPORT_VAR(grub_dl_head);\n \n #ifndef GRUB_UTIL\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 3f67ccf5cf8921269fed1a9c605350cbcc650007 Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Tue, 29 Sep 2020 14:08:55 +0200\nSubject: [PATCH 20/45] dl: Only allow unloading modules that are not\n dependencies\n\nWhen a module is attempted to be removed its reference counter is always\ndecremented. This means that repeated rmmod invocations will cause the\nmodule to be unloaded even if another module depends on it.\n\nThis may lead to a use-after-free scenario allowing an attacker to execute\narbitrary code and by-pass the UEFI Secure Boot protection.\n\nWhile being there, add the extern keyword to some function declarations in\nthat header file.\n\nFixes: CVE-2020-25632\n\nReported-by: Chris Coulson <chris.coulson@canonical.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n grub-core/commands/minicmd.c \| 7 +++++--\n grub-core/kern/dl.c \| 9 +++++++++\n include/grub/dl.h \| 8 +++++---\n 3 files changed, 19 insertions(+), 5 deletions(-)\n\ndiff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c\nindex 6bbce3128..fa498931e 100644\n--- a/grub-core/commands/minicmd.c\n+++ b/grub-core/commands/minicmd.c\n@@ -140,8 +140,11 @@ grub_mini_cmd_rmmod (struct grub_command cmd __attribute__ ((unused)),\n if (grub_dl_is_persistent (mod))\n return grub_error (GRUB_ERR_BAD_ARGUMENT, \"cannot unload persistent module\");\n \n- if (grub_dl_unref (mod) <= 0)\n- grub_dl_unload (mod);\n+ if (grub_dl_ref_count (mod) > 1)\n+ return grub_error (GRUB_ERR_BAD_ARGUMENT, \"cannot unload referenced module\");\n+\n+ grub_dl_unref (mod);\n+ grub_dl_unload (mod);\n \n return 0;\n }\ndiff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c\nindex 2a8372e14..e02f2afc5 100644\n--- a/grub-core/kern/dl.c\n+++ b/grub-core/kern/dl.c\n@@ -553,6 +553,15 @@ grub_dl_unref (grub_dl_t mod)\n return --mod->ref_count;\n }\n \n+int\n+grub_dl_ref_count (grub_dl_t mod)\n+{\n+ if (mod == NULL)\n+ return 0;\n+\n+ return mod->ref_count;\n+}\n+\n static void\n grub_dl_flush_cache (grub_dl_t mod)\n {\ndiff --git a/include/grub/dl.h b/include/grub/dl.h\nindex f03c03561..b3753c9ca 100644\n--- a/include/grub/dl.h\n+++ b/include/grub/dl.h\n@@ -203,9 +203,11 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char name);\n grub_dl_t grub_dl_load_core (void addr, grub_size_t size);\n grub_dl_t EXPORT_FUNC(grub_dl_load_core_noinit) (void addr, grub_size_t size);\n int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);\n-void grub_dl_unload_unneeded (void);\n-int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);\n-int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);\n+extern void grub_dl_unload_unneeded (void);\n+extern int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);\n+extern int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);\n+extern int EXPORT_FUNC(grub_dl_ref_count) (grub_dl_t mod);\n+\n extern grub_dl_t EXPORT_VAR(grub_dl_head);\n \n #ifndef GRUB_UTIL\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0020-dl-Only-allow-unloading-modules-that-are-not-depende.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0020-dl-Only-allow-unloading-modules-that-are-not-depende.patch", "tier": "identical", "language": "c", "patch_lines_changed": 25, "patch_files_count": 3, "total_tokens_est": 1620, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nRISC-V: Add __clzdi2 symbol\n\n## Package\ngrub2\n\n## Files to modify\n- configure.ac\n- include/grub/compiler-rt-emu.h\n\n## Target Source Code\n\n### include/grub/compiler-rt-emu.h\n\n#### region() [lines 25-131]\n```c\n#include <grub/symbol.h>\n\n#ifdef HAVE___UDIVSI3\ngrub_uint32_t\nEXPORT_FUNC (__udivsi3) (grub_uint32_t a, grub_uint32_t b);\n#endif\n\n#ifdef HAVE___UMODSI3\ngrub_uint32_t\nEXPORT_FUNC (__umodsi3) (grub_uint32_t a, grub_uint32_t b);\n#endif\n\n#ifdef HAVE___DIVSI3\ngrub_int32_t\nEXPORT_FUNC (__divsi3) (grub_int32_t a, grub_int32_t b);\n#endif\n\n#ifdef HAVE___MODSI3\ngrub_int32_t\nEXPORT_FUNC (__modsi3) (grub_int32_t a, grub_int32_t b);\n#endif\n\n#ifdef HAVE___DIVDI3\ngrub_int64_t\nEXPORT_FUNC (__divdi3) (grub_int64_t a, grub_int64_t b);\n#endif\n\n#ifdef HAVE___MODDI3\ngrub_int64_t\nEXPORT_FUNC (__moddi3) (grub_int64_t a, grub_int64_t b);\n#endif\n\n#ifdef HAVE___UDIVDI3\ngrub_uint64_t\nEXPORT_FUNC (__udivdi3) (grub_uint64_t a, grub_uint64_t b);\n#endif\n\n#ifdef HAVE___UMODDI3\ngrub_uint64_t\nEXPORT_FUNC (__umoddi3) (grub_uint64_t a, grub_uint64_t b);\n#endif\n\n#ifdef HAVE___CTZDI2\nunsigned\nEXPORT_FUNC (__ctzdi2) (grub_uint64_t x);\n#endif\n\n#ifdef HAVE___CTZSI2\nunsigned\nEXPORT_FUNC (__ctzsi2) (grub_uint32_t x);\n#endif\n\n#ifdef HAVE___AEABI_UIDIV\ngrub_uint32_t\nEXPORT_FUNC (__aeabi_uidiv) (grub_uint32_t a, grub_uint32_t b);\n#endif\n\n#ifdef HAVE___AEABI_UIDIVMOD\ngrub_uint32_t\nEXPORT_FUNC (__aeabi_uidivmod) (grub_uint32_t a, grub_uint32_t b);\n#endif\n\n#ifdef HAVE___AEABI_IDIV\ngrub_int32_t\nEXPORT_FUNC (__aeabi_idiv) (grub_int32_t a, grub_int32_t b);\n#endif\n\n#ifdef HAVE___AEABI_IDIVMOD\ngrub_int32_t\nEXPORT_FUNC (__aeabi_idivmod) (grub_int32_t a, grub_int32_t b);\n#endif\n\n#ifdef HAVE___AEABI_ULCMP\nint\nEXPORT_FUNC (__aeabi_ulcmp) (grub_uint64_t a, grub_uint64_t b);\n#endif\n\n/* Needed for allowing modules to be compiled as thumb. /\n#ifdef HAVE___MULDI3\ngrub_uint64_t\nEXPORT_FUNC (__muldi3) (grub_uint64_t a, grub_uint64_t b);\n#endif\n\n#ifdef HAVE___AEABI_LMUL\ngrub_uint64_t\nEXPORT_FUNC (__aeabi_lmul) (grub_uint64_t a, grub_uint64_t b);\n#endif\n\n#ifdef HAVE___AEABI_MEMCPY\nvoid \nEXPORT_FUNC (__aeabi_memcpy) (void dest, const void src, grub_size_t n);\n#endif\n\n#ifdef HAVE___AEABI_MEMCPY4\nvoid \nEXPORT_FUNC (__aeabi_memcpy4) (void dest, const void src, grub_size_t n);\n#endif\n\n#ifdef HAVE___AEABI_MEMCPY8\nvoid \nEXPORT_FUNC (__aeabi_memcpy8) (void dest, const void src, grub_size_t n);\n#endif\n\n#ifdef HAVE___AEABI_MEMSET\nvoid \nEXPORT_FUNC(__aeabi_memset) (void s, int c, grub_size_t n);\n#endif\n```\n\n\n## Upstream Fix\n```diff\nFrom a57977b5faf800ac68f7dfe6b84138208c7e6072 Mon Sep 17 00:00:00 2001\nFrom: Andreas Schwab <schwab@suse.de>\nDate: Thu, 19 Sep 2019 09:39:04 +0200\nSubject: [PATCH] RISC-V: Add __clzdi2 symbol\n\nThis is needed for the zstd module build for riscv64-emu.\n\nSigned-off-by: Andreas Schwab <schwab@suse.de>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n configure.ac \| 2 +-\n include/grub/compiler-rt-emu.h \| 5 +++++\n 2 files changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/configure.ac b/configure.ac\nindex e07ba4b56..7d74eba66 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -1370,7 +1370,7 @@ fi\n \n # Check for libgcc symbols\n if test x\"$platform\" = xemu; then\n-AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)\n+AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __clzdi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)\n fi\n \n if test \"x$TARGET_APPLE_LINKER\" = x1 ; then\ndiff --git a/include/grub/compiler-rt-emu.h b/include/grub/compiler-rt-emu.h\nindex b21425d9e..fde620ac1 100644\n--- a/include/grub/compiler-rt-emu.h\n+++ b/include/grub/compiler-rt-emu.h\n@@ -74,6 +74,11 @@ unsigned\n EXPORT_FUNC (__ctzsi2) (grub_uint32_t x);\n #endif\n \n+#ifdef HAVE___CLZDI2\n+int\n+EXPORT_FUNC (__clzdi2) (grub_uint64_t x);\n+#endif\n+\n #ifdef HAVE___AEABI_UIDIV\n grub_uint32_t\n EXPORT_FUNC (__aeabi_uidiv) (grub_uint32_t a, grub_uint32_t b);\n-- \n2.23.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From a57977b5faf800ac68f7dfe6b84138208c7e6072 Mon Sep 17 00:00:00 2001\nFrom: Andreas Schwab <schwab@suse.de>\nDate: Thu, 19 Sep 2019 09:39:04 +0200\nSubject: [PATCH] RISC-V: Add __clzdi2 symbol\n\nThis is needed for the zstd module build for riscv64-emu.\n\nSigned-off-by: Andreas Schwab <schwab@suse.de>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n configure.ac \| 2 +-\n include/grub/compiler-rt-emu.h \| 5 +++++\n 2 files changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/configure.ac b/configure.ac\nindex e07ba4b56..7d74eba66 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -1370,7 +1370,7 @@ fi\n \n # Check for libgcc symbols\n if test x\"$platform\" = xemu; then\n-AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)\n+AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __clzdi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)\n fi\n \n if test \"x$TARGET_APPLE_LINKER\" = x1 ; then\ndiff --git a/include/grub/compiler-rt-emu.h b/include/grub/compiler-rt-emu.h\nindex b21425d9e..fde620ac1 100644\n--- a/include/grub/compiler-rt-emu.h\n+++ b/include/grub/compiler-rt-emu.h\n@@ -74,6 +74,11 @@ unsigned\n EXPORT_FUNC (__ctzsi2) (grub_uint32_t x);\n #endif\n \n+#ifdef HAVE___CLZDI2\n+int\n+EXPORT_FUNC (__clzdi2) (grub_uint64_t x);\n+#endif\n+\n #ifdef HAVE___AEABI_UIDIV\n grub_uint32_t\n EXPORT_FUNC (__aeabi_uidiv) (grub_uint32_t a, grub_uint32_t b);\n-- \n2.23.0\n\n" } ]	{ "id": "grub2-15947-risc-v-add-clzdi2-symbol.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "risc-v-add-clzdi2-symbol.patch", "tier": "identical", "language": "c", "patch_lines_changed": 8, "patch_files_count": 2, "total_tokens_est": 1268, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nsquash! kern: Add lockdown support\n\n## Package\ngrub2\n\n## Files to modify\n- grub-core/commands/extcmd.c\n- grub-core/kern/command.c\n- include/grub/command.h\n- include/grub/extcmd.h\n\n## Target Source Code\n\n### grub-core/commands/extcmd.c\n\n#### grub_register_extcmd() [lines 101-113]\n```c\n}\n\ngrub_extcmd_t\ngrub_register_extcmd (const char name, grub_extcmd_func_t func,\n\t\t grub_command_flags_t flags, const char summary,\n\t\t const char description,\n\t\t const struct grub_arg_option parser)\n{\n return grub_register_extcmd_prio (name, func, flags,\n\t\t\t\t summary, description, parser, 1);\n}\n\nvoid\n```\n\n#### grub_register_extcmd_lockdown() [lines 83-119]\n```c\n\n cmd = grub_register_command_prio (name, grub_extcmd_dispatch,\n\t\t\t\t summary, description, prio);\n if (! cmd)\n {\n grub_free (ext);\n return 0;\n }\n\n cmd->flags = (flags \| GRUB_COMMAND_FLAG_EXTCMD);\n cmd->data = ext;\n\n ext->cmd = cmd;\n ext->func = func;\n ext->options = parser;\n ext->data = 0;\n\n return ext;\n}\n\ngrub_extcmd_t\ngrub_register_extcmd (const char name, grub_extcmd_func_t func,\n\t\t grub_command_flags_t flags, const char summary,\n\t\t const char description,\n\t\t const struct grub_arg_option parser)\n{\n return grub_register_extcmd_prio (name, func, flags,\n\t\t\t\t summary, description, parser, 1);\n}\n\nvoid\ngrub_unregister_extcmd (grub_extcmd_t ext)\n{\n grub_unregister_command (ext->cmd);\n grub_free (ext);\n}\n\n```\n\n### grub-core/kern/command.c\n\n#### grub_register_command_prio() [lines 29-88]\n```c\n\t\t\t const char description,\n\t\t\t int prio)\n{\n grub_command_t cmd;\n int inactive = 0;\n\n grub_command_t p, q;\n\n cmd = (grub_command_t) grub_zalloc (sizeof (cmd));\n if (! cmd)\n return 0;\n\n cmd->name = name;\n cmd->func = func;\n cmd->summary = (summary) ? summary : \"\";\n cmd->description = description;\n\n cmd->flags = 0;\n cmd->prio = prio;\n \n for (p = &grub_command_list, q = p; q; p = &(q->next), q = q->next)\n {\n int r;\n\n r = grub_strcmp (cmd->name, q->name);\n if (r < 0)\n\tbreak;\n if (r > 0)\n\tcontinue;\n\n if (cmd->prio >= (q->prio & GRUB_COMMAND_PRIO_MASK))\n\t{\n\t q->prio &= ~GRUB_COMMAND_FLAG_ACTIVE;\n\t break;\n\t}\n\n inactive = 1;\n }\n\n p = cmd;\n cmd->next = q;\n if (q)\n q->prev = &cmd->next;\n cmd->prev = p;\n\n if (! inactive)\n cmd->prio \|= GRUB_COMMAND_FLAG_ACTIVE;\n\n return cmd;\n}\n\nvoid\ngrub_unregister_command (grub_command_t cmd)\n{\n if ((cmd->prio & GRUB_COMMAND_FLAG_ACTIVE) && (cmd->next))\n cmd->next->prio \|= GRUB_COMMAND_FLAG_ACTIVE;\n grub_list_remove (GRUB_AS_LIST (cmd));\n grub_free (cmd);\n}\n\n```\n\n#### grub_register_command_lockdown() [lines 51-88]\n```c\n int r;\n\n r = grub_strcmp (cmd->name, q->name);\n if (r < 0)\n\tbreak;\n if (r > 0)\n\tcontinue;\n\n if (cmd->prio >= (q->prio & GRUB_COMMAND_PRIO_MASK))\n\t{\n\t q->prio &= ~GRUB_COMMAND_FLAG_ACTIVE;\n\t break;\n\t}\n\n inactive = 1;\n }\n\n p = cmd;\n cmd->next = q;\n if (q)\n q->prev = &cmd->next;\n cmd->prev = p;\n\n if (! inactive)\n cmd->prio \|= GRUB_COMMAND_FLAG_ACTIVE;\n\n return cmd;\n}\n\nvoid\ngrub_unregister_command (grub_command_t cmd)\n{\n if ((cmd->prio & GRUB_COMMAND_FLAG_ACTIVE) && (cmd->next))\n cmd->next->prio \|= GRUB_COMMAND_FLAG_ACTIVE;\n grub_list_remove (GRUB_AS_LIST (cmd));\n grub_free (cmd);\n}\n\n```\n\n### include/grub/command.h\n\n#### EXPORT_FUNC() [lines 37-130]\n```c\n /* This command accepts only options preceding direct arguments. /\n GRUB_COMMAND_OPTIONS_AT_START = 0x100,\n / Can be executed in an entries extractor. /\n GRUB_COMMAND_FLAG_EXTRACTOR = 0x200\n } grub_command_flags_t;\n\nstruct grub_command;\n\ntypedef grub_err_t (grub_command_func_t) (struct grub_command cmd,\n\t\t\t\t\t int argc, char argv);\n\n#define GRUB_COMMAND_PRIO_MASK\t0xff\n#define GRUB_COMMAND_FLAG_ACTIVE\t0x100\n\n/ The command description. /\nstruct grub_command\n{\n / The next element. /\n struct grub_command next;\n struct grub_command *prev;\n\n / The name. /\n const char name;\n\n /* The priority. /\n int prio;\n\n / The callback function. /\n grub_command_func_t func;\n\n / The flags. /\n grub_command_flags_t flags;\n\n / The summary of the command usage. /\n const char summary;\n\n /* The description of the command. /\n const char description;\n\n /* Arbitrary data. /\n void data;\n};\ntypedef struct grub_command grub_command_t;\n\nextern grub_command_t EXPORT_VAR(grub_command_list);\n\ngrub_command_t\nEXPORT_FUNC(grub_register_command_prio) (const char name,\n\t\t\t\t\t grub_command_func_t func,\n\t\t\t\t\t const char summary,\n\t\t\t\t\t const char description,\n\t\t\t\t\t int prio);\nvoid EXPORT_FUNC(grub_unregister_command) (grub_command_t cmd);\n\nstatic inline grub_command_t\ngrub_register_command (const char name,\n\t\t grub_command_func_t func,\n\t\t const char summary,\n\t\t const char description)\n{\n return grub_register_command_prio (name, func, summary, description, 0);\n}\n\nstatic inline grub_command_t\ngrub_register_command_p1 (const char name,\n\t\t\t grub_command_func_t func,\n\t\t\t const char summary,\n\t\t\t const char description)\n{\n return grub_register_command_prio (name, func, summary, description, 1);\n}\n\nstatic inline grub_command_t\ngrub_command_find (const char name)\n{\n return grub_named_list_find (GRUB_AS_NAMED_LIST (grub_command_list), name);\n}\n\nstatic inline grub_err_t\ngrub_command_execute (const char name, int argc, char *argv)\n{\n grub_command_t cmd;\n\n cmd = grub_command_find (name);\n return (cmd) ? cmd->func (cmd, argc, argv) : GRUB_ERR_FILE_NOT_FOUND;\n}\n\n#define FOR_COMMANDS(var) FOR_LIST_ELEMENTS((var), grub_command_list)\n#define FOR_COMMANDS_SAFE(var, next) FOR_LIST_ELEMENTS_SAFE((var), (next), grub_command_list)\n\nvoid grub_register_core_commands (void);\n\n#endif / ! GRUB_COMMAND_HEADER /\n\n```\n\n### include/grub/extcmd.h\n\n#### EXPORT_FUNC() [lines 13-80]\n```c\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#ifndef GRUB_EXTCMD_HEADER\n#define GRUB_EXTCMD_HEADER\t1\n\n#include <grub/lib/arg.h>\n#include <grub/command.h>\n#include <grub/script_sh.h>\n\nstruct grub_extcmd;\nstruct grub_extcmd_context;\n\ntypedef grub_err_t (grub_extcmd_func_t) (struct grub_extcmd_context ctxt,\n\t\t\t\t\t int argc, char args);\n\n/ The argcmd description. /\nstruct grub_extcmd\n{\n grub_command_t cmd;\n\n grub_extcmd_func_t func;\n\n / The argument parser optionlist. /\n const struct grub_arg_option options;\n\n void data;\n};\ntypedef struct grub_extcmd grub_extcmd_t;\n\n/* Command context for each instance of execution. /\nstruct grub_extcmd_context\n{\n struct grub_extcmd extcmd;\n\n struct grub_arg_list state;\n\n / Script parameter, if any. /\n struct grub_script script;\n};\ntypedef struct grub_extcmd_context grub_extcmd_context_t;\n\ngrub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char name,\n\t\t\t\t\t\t grub_extcmd_func_t func,\n\t\t\t\t\t\t grub_command_flags_t flags,\n\t\t\t\t\t\t const char summary,\n\t\t\t\t\t\t const char description,\n\t\t\t\t\t\t const struct grub_arg_option parser);\n\ngrub_extcmd_t EXPORT_FUNC(grub_register_extcmd_prio) (const char name,\n\t\t\t\t\t\t grub_extcmd_func_t func,\n\t\t\t\t\t\t grub_command_flags_t flags,\n\t\t\t\t\t\t const char summary,\n\t\t\t\t\t\t const char description,\n\t\t\t\t\t\t const struct grub_arg_option parser,\n\t\t\t\t\t\t int prio);\n\nvoid EXPORT_FUNC(grub_unregister_extcmd) (grub_extcmd_t cmd);\n\ngrub_err_t EXPORT_FUNC(grub_extcmd_dispatcher) (struct grub_command cmd,\n\t\t\t\t\t\tint argc, char *args,\n\t\t\t\t\t\tstruct grub_script script);\n\n#endif /* ! GRUB_EXTCMD_HEADER /\n\n```\n\n\n## Upstream Fix\n```diff\nFrom 997ea2b01d2fbfa0895343275215e00633a35d0f Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Wed, 24 Feb 2021 23:51:38 +0800\nSubject: [PATCH 44/45] squash! kern: Add lockdown support\n\nSince the lockdown feature is efi specific, the\ngrub_{command,extcmd}_lockdown functions can be removed from other\nplatform for not taking up space in kernel image.\n---\n grub-core/commands/extcmd.c \| 2 ++\n grub-core/kern/command.c \| 2 ++\n include/grub/command.h \| 11 +++++++++++\n include/grub/extcmd.h \| 13 +++++++++++++\n 4 files changed, 28 insertions(+)\n\ndiff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c\nindex 90a5ca24a..4ac111a99 100644\n--- a/grub-core/commands/extcmd.c\n+++ b/grub-core/commands/extcmd.c\n@@ -111,6 +111,7 @@ grub_register_extcmd (const char name, grub_extcmd_func_t func,\n \t\t\t\t summary, description, parser, 1);\n }\n \n+#ifdef GRUB_MACHINE_EFI\n static grub_err_t\n grub_extcmd_lockdown (grub_extcmd_context_t ctxt __attribute__ ((unused)),\n int argc __attribute__ ((unused)),\n@@ -132,6 +133,7 @@ grub_register_extcmd_lockdown (const char name, grub_extcmd_func_t func,\n \n return grub_register_extcmd (name, func, flags, summary, description, parser);\n }\n+#endif\n \n void\n grub_unregister_extcmd (grub_extcmd_t ext)\ndiff --git a/grub-core/kern/command.c b/grub-core/kern/command.c\nindex 4aabcd4b5..17363af7b 100644\n--- a/grub-core/kern/command.c\n+++ b/grub-core/kern/command.c\n@@ -78,6 +78,7 @@ grub_register_command_prio (const char name,\n return cmd;\n }\n \n+#ifdef GRUB_MACHINE_EFI\n static grub_err_t\n grub_cmd_lockdown (grub_command_t cmd __attribute__ ((unused)),\n int argc __attribute__ ((unused)),\n@@ -100,6 +101,7 @@ grub_register_command_lockdown (const char name,\n \n return grub_register_command_prio (name, func, summary, description, 0);\n }\n+#endif\n \n void\n grub_unregister_command (grub_command_t cmd)\ndiff --git a/include/grub/command.h b/include/grub/command.h\nindex 2a6f7f846..b518e262e 100644\n--- a/include/grub/command.h\n+++ b/include/grub/command.h\n@@ -86,11 +86,22 @@ EXPORT_FUNC(grub_register_command_prio) (const char name,\n \t\t\t\t\t const char summary,\n \t\t\t\t\t const char description,\n \t\t\t\t\t int prio);\n+#ifdef GRUB_MACHINE_EFI\n grub_command_t\n EXPORT_FUNC(grub_register_command_lockdown) (const char name,\n grub_command_func_t func,\n const char summary,\n const char description);\n+#else\n+static inline grub_command_t\n+grub_register_command_lockdown (const char name,\n+ grub_command_func_t func,\n+ const char summary,\n+ const char description)\n+{\n+ return grub_register_command_prio (name, func, summary, description, 0);\n+}\n+#endif\n void EXPORT_FUNC(grub_unregister_command) (grub_command_t cmd);\n \n static inline grub_command_t\ndiff --git a/include/grub/extcmd.h b/include/grub/extcmd.h\nindex fe9248b8b..fa1328ea5 100644\n--- a/include/grub/extcmd.h\n+++ b/include/grub/extcmd.h\n@@ -62,12 +62,25 @@ grub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char name,\n \t\t\t\t\t\t const char description,\n \t\t\t\t\t\t const struct grub_arg_option parser);\n \n+#ifdef GRUB_MACHINE_EFI\n grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_lockdown) (const char name,\n grub_extcmd_func_t func,\n grub_command_flags_t flags,\n const char summary,\n const char description,\n const struct grub_arg_option parser);\n+#else\n+static inline grub_extcmd_t\n+grub_register_extcmd_lockdown (const char name,\n+ grub_extcmd_func_t func,\n+ grub_command_flags_t flags,\n+ const char summary,\n+ const char description,\n+ const struct grub_arg_option parser)\n+{\n+ return grub_register_extcmd (name, func, flags, summary, description, parser);\n+}\n+#endif\n \n grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_prio) (const char name,\n \t\t\t\t\t\t grub_extcmd_func_t func,\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 997ea2b01d2fbfa0895343275215e00633a35d0f Mon Sep 17 00:00:00 2001\nFrom: Michael Chang <mchang@suse.com>\nDate: Wed, 24 Feb 2021 23:51:38 +0800\nSubject: [PATCH 44/45] squash! kern: Add lockdown support\n\nSince the lockdown feature is efi specific, the\ngrub_{command,extcmd}_lockdown functions can be removed from other\nplatform for not taking up space in kernel image.\n---\n grub-core/commands/extcmd.c \| 2 ++\n grub-core/kern/command.c \| 2 ++\n include/grub/command.h \| 11 +++++++++++\n include/grub/extcmd.h \| 13 +++++++++++++\n 4 files changed, 28 insertions(+)\n\ndiff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c\nindex 90a5ca24a..4ac111a99 100644\n--- a/grub-core/commands/extcmd.c\n+++ b/grub-core/commands/extcmd.c\n@@ -111,6 +111,7 @@ grub_register_extcmd (const char name, grub_extcmd_func_t func,\n \t\t\t\t summary, description, parser, 1);\n }\n \n+#ifdef GRUB_MACHINE_EFI\n static grub_err_t\n grub_extcmd_lockdown (grub_extcmd_context_t ctxt __attribute__ ((unused)),\n int argc __attribute__ ((unused)),\n@@ -132,6 +133,7 @@ grub_register_extcmd_lockdown (const char name, grub_extcmd_func_t func,\n \n return grub_register_extcmd (name, func, flags, summary, description, parser);\n }\n+#endif\n \n void\n grub_unregister_extcmd (grub_extcmd_t ext)\ndiff --git a/grub-core/kern/command.c b/grub-core/kern/command.c\nindex 4aabcd4b5..17363af7b 100644\n--- a/grub-core/kern/command.c\n+++ b/grub-core/kern/command.c\n@@ -78,6 +78,7 @@ grub_register_command_prio (const char name,\n return cmd;\n }\n \n+#ifdef GRUB_MACHINE_EFI\n static grub_err_t\n grub_cmd_lockdown (grub_command_t cmd __attribute__ ((unused)),\n int argc __attribute__ ((unused)),\n@@ -100,6 +101,7 @@ grub_register_command_lockdown (const char name,\n \n return grub_register_command_prio (name, func, summary, description, 0);\n }\n+#endif\n \n void\n grub_unregister_command (grub_command_t cmd)\ndiff --git a/include/grub/command.h b/include/grub/command.h\nindex 2a6f7f846..b518e262e 100644\n--- a/include/grub/command.h\n+++ b/include/grub/command.h\n@@ -86,11 +86,22 @@ EXPORT_FUNC(grub_register_command_prio) (const char name,\n \t\t\t\t\t const char summary,\n \t\t\t\t\t const char description,\n \t\t\t\t\t int prio);\n+#ifdef GRUB_MACHINE_EFI\n grub_command_t\n EXPORT_FUNC(grub_register_command_lockdown) (const char name,\n grub_command_func_t func,\n const char summary,\n const char description);\n+#else\n+static inline grub_command_t\n+grub_register_command_lockdown (const char name,\n+ grub_command_func_t func,\n+ const char summary,\n+ const char description)\n+{\n+ return grub_register_command_prio (name, func, summary, description, 0);\n+}\n+#endif\n void EXPORT_FUNC(grub_unregister_command) (grub_command_t cmd);\n \n static inline grub_command_t\ndiff --git a/include/grub/extcmd.h b/include/grub/extcmd.h\nindex fe9248b8b..fa1328ea5 100644\n--- a/include/grub/extcmd.h\n+++ b/include/grub/extcmd.h\n@@ -62,12 +62,25 @@ grub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char name,\n \t\t\t\t\t\t const char description,\n \t\t\t\t\t\t const struct grub_arg_option parser);\n \n+#ifdef GRUB_MACHINE_EFI\n grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_lockdown) (const char name,\n grub_extcmd_func_t func,\n grub_command_flags_t flags,\n const char summary,\n const char description,\n const struct grub_arg_option parser);\n+#else\n+static inline grub_extcmd_t\n+grub_register_extcmd_lockdown (const char name,\n+ grub_extcmd_func_t func,\n+ grub_command_flags_t flags,\n+ const char summary,\n+ const char description,\n+ const struct grub_arg_option parser)\n+{\n+ return grub_register_extcmd (name, func, flags, summary, description, parser);\n+}\n+#endif\n \n grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_prio) (const char *name,\n \t\t\t\t\t\t grub_extcmd_func_t func,\n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0044-squash-kern-Add-lockdown-support.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0044-squash-kern-Add-lockdown-support.patch", "tier": "identical", "language": "c", "patch_lines_changed": 29, "patch_files_count": 4, "total_tokens_est": 2395, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-27749, CVE-2020-27779, CVE-2020-14372, CVE-2020-25632, CVE-2021-20233, CVE-2021-20225, CVE-2020-25647\n\nmmap: Don't register cutmem and badram commands when\n\n## Package\ngrub2\n\n## Files to modify\n- docs/grub.texi\n- grub-core/mmap/mmap.c\n\n## Target Source Code\n\n### grub-core/mmap/mmap.c\n\n#### region() [lines 1-77]\n```c\n/* Mmap management. /\n/\n * GRUB -- GRand Unified Bootloader\n * Copyright (C) 2009 Free Software Foundation, Inc.\n \n GRUB is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation, either version 3 of the License, or\n * (at your option) any later version.\n \n GRUB is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n * along with GRUB. If not, see <http://www.gnu.org/licenses/>.\n /\n\n#include <grub/memory.h>\n#include <grub/machine/memory.h>\n#include <grub/err.h>\n#include <grub/misc.h>\n#include <grub/mm.h>\n#include <grub/command.h>\n#include <grub/dl.h>\n#include <grub/i18n.h>\n\nGRUB_MOD_LICENSE (\"GPLv3+\");\n\n#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE\n\nstruct grub_mmap_region grub_mmap_overlays = 0;\nstatic int curhandle = 1;\n\n#endif\n\nstatic int current_priority = 1;\n\n/* Scanline events. /\nstruct grub_mmap_scan\n{\n / At which memory address. /\n grub_uint64_t pos;\n / 0 = region starts, 1 = region ends. /\n int type;\n / Which type of memory region? /\n grub_memory_type_t memtype;\n / Priority. 0 means coming from firmware. /\n int priority;\n};\n\n/ Context for grub_mmap_iterate. /\nstruct grub_mmap_iterate_ctx\n{\n struct grub_mmap_scan scanline_events;\n int i;\n};\n\n/* Helper for grub_mmap_iterate. /\nstatic int\ncount_hook (grub_uint64_t addr __attribute__ ((unused)),\n\t grub_uint64_t size __attribute__ ((unused)),\n\t grub_memory_type_t type __attribute__ ((unused)), void data)\n{\n int mmap_num = data;\n\n (mmap_num)++;\n return 0;\n}\n\n/* Helper for grub_mmap_iterate. /\nstatic int\nfill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,\n\t void data)\n{\n struct grub_mmap_iterate_ctx ctx = data;\n```\n\n#### region() [lines 485-552]\n```c\n\nstruct cutmem_range {\n grub_uint64_t from, to;\n};\n\n/ Helper for grub_cmd_cutmem. /\nstatic int\ncutmem_iter (grub_uint64_t addr, grub_uint64_t size,\n\t grub_memory_type_t type __attribute__ ((unused)), void data)\n{\n struct cutmem_range range = data;\n grub_uint64_t end = addr + size;\n\n if (addr <= range->from)\n addr = range->from;\n if (end >= range->to)\n end = range->to;\n\n if (end <= addr)\n return 0;\n\n grub_mmap_register (addr, end - addr, GRUB_MEMORY_HOLE);\n return 0;\n}\n\nstatic grub_err_t\ngrub_cmd_cutmem (grub_command_t cmd __attribute__ ((unused)),\n\t\t int argc, char *args)\n{\n struct cutmem_range range;\n\n if (argc != 2)\n return grub_error (GRUB_ERR_BAD_ARGUMENT, N_(\"two arguments expected\"));\n\n range.from = parsemem (args[0]);\n if (grub_errno)\n return grub_errno;\n\n range.to = parsemem (args[1]);\n if (grub_errno)\n return grub_errno;\n\n grub_mmap_iterate (cutmem_iter, &range);\n\n return GRUB_ERR_NONE;\n}\n\nstatic grub_command_t cmd, cmd_cut;\n\n\f\nGRUB_MOD_INIT(mmap)\n{\n cmd = grub_register_command (\"badram\", grub_cmd_badram,\n\t\t\t N_(\"ADDR1,MASK1[,ADDR2,MASK2[,...]]\"),\n\t\t\t N_(\"Declare memory regions as faulty (badram).\"));\n cmd_cut = grub_register_command (\"cutmem\", grub_cmd_cutmem,\n\t\t\t\t N_(\"FROM[K\|M\|G] TO[K\|M\|G]\"),\n\t\t\t\t N_(\"Remove any memory regions in specified range.\"));\n\n}\n\nGRUB_MOD_FINI(mmap)\n{\n grub_unregister_command (cmd);\n grub_unregister_command (cmd_cut);\n}\n\n\n```\n\n\n## Upstream Fix\n```diff\nFrom b163604ed982813e36d38fe100b325c579e0dace Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 14 Oct 2020 16:33:42 +0200\nSubject: [PATCH 14/45] mmap: Don't register cutmem and badram commands when\n lockdown is enforced\n\nThe cutmem and badram commands can be used to remove EFI memory regions\nand potentially disable the UEFI Secure Boot. Prevent the commands to be\nregistered if the GRUB is locked down.\n\nFixes: CVE-2020-27779\n\nReported-by: Teddy Reed <teddy.reed@gmail.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n docs/grub.texi \| 4 ++++\n grub-core/mmap/mmap.c \| 13 +++++++------\n 2 files changed, 11 insertions(+), 6 deletions(-)\n\ndiff --git a/docs/grub.texi b/docs/grub.texi\nindex 0b29febaa..c26b6082c 100644\n--- a/docs/grub.texi\n+++ b/docs/grub.texi\n@@ -4051,6 +4051,10 @@ this page is to be filtered. This syntax makes it easy to represent patterns\n that are often result of memory damage, due to physical distribution of memory\n cells.\n \n+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}).\n+ This prevents removing EFI memory regions to potentially subvert the\n+ security mechanisms provided by the UEFI secure boot.\n+\n @node blocklist\n @subsection blocklist\n \ndiff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c\nindex 57b4e9a72..7ebf32e1e 100644\n--- a/grub-core/mmap/mmap.c\n+++ b/grub-core/mmap/mmap.c\n@@ -20,6 +20,7 @@\n #include <grub/memory.h>\n #include <grub/machine/memory.h>\n #include <grub/err.h>\n+#include <grub/lockdown.h>\n #include <grub/misc.h>\n #include <grub/mm.h>\n #include <grub/command.h>\n@@ -534,12 +535,12 @@ static grub_command_t cmd, cmd_cut;\n \f\n GRUB_MOD_INIT(mmap)\n {\n- cmd = grub_register_command (\"badram\", grub_cmd_badram,\n-\t\t\t N_(\"ADDR1,MASK1[,ADDR2,MASK2[,...]]\"),\n-\t\t\t N_(\"Declare memory regions as faulty (badram).\"));\n- cmd_cut = grub_register_command (\"cutmem\", grub_cmd_cutmem,\n-\t\t\t\t N_(\"FROM[K\|M\|G] TO[K\|M\|G]\"),\n-\t\t\t\t N_(\"Remove any memory regions in specified range.\"));\n+ cmd = grub_register_command_lockdown (\"badram\", grub_cmd_badram,\n+ N_(\"ADDR1,MASK1[,ADDR2,MASK2[,...]]\"),\n+ N_(\"Declare memory regions as faulty (badram).\"));\n+ cmd_cut = grub_register_command_lockdown (\"cutmem\", grub_cmd_cutmem,\n+ N_(\"FROM[K\|M\|G] TO[K\|M\|G]\"),\n+ N_(\"Remove any memory regions in specified range.\"));\n \n }\n \n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From b163604ed982813e36d38fe100b325c579e0dace Mon Sep 17 00:00:00 2001\nFrom: Javier Martinez Canillas <javierm@redhat.com>\nDate: Wed, 14 Oct 2020 16:33:42 +0200\nSubject: [PATCH 14/45] mmap: Don't register cutmem and badram commands when\n lockdown is enforced\n\nThe cutmem and badram commands can be used to remove EFI memory regions\nand potentially disable the UEFI Secure Boot. Prevent the commands to be\nregistered if the GRUB is locked down.\n\nFixes: CVE-2020-27779\n\nReported-by: Teddy Reed <teddy.reed@gmail.com>\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\nReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>\n---\n docs/grub.texi \| 4 ++++\n grub-core/mmap/mmap.c \| 13 +++++++------\n 2 files changed, 11 insertions(+), 6 deletions(-)\n\ndiff --git a/docs/grub.texi b/docs/grub.texi\nindex 0b29febaa..c26b6082c 100644\n--- a/docs/grub.texi\n+++ b/docs/grub.texi\n@@ -4051,6 +4051,10 @@ this page is to be filtered. This syntax makes it easy to represent patterns\n that are often result of memory damage, due to physical distribution of memory\n cells.\n \n+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}).\n+ This prevents removing EFI memory regions to potentially subvert the\n+ security mechanisms provided by the UEFI secure boot.\n+\n @node blocklist\n @subsection blocklist\n \ndiff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c\nindex 57b4e9a72..7ebf32e1e 100644\n--- a/grub-core/mmap/mmap.c\n+++ b/grub-core/mmap/mmap.c\n@@ -20,6 +20,7 @@\n #include <grub/memory.h>\n #include <grub/machine/memory.h>\n #include <grub/err.h>\n+#include <grub/lockdown.h>\n #include <grub/misc.h>\n #include <grub/mm.h>\n #include <grub/command.h>\n@@ -534,12 +535,12 @@ static grub_command_t cmd, cmd_cut;\n \f\n GRUB_MOD_INIT(mmap)\n {\n- cmd = grub_register_command (\"badram\", grub_cmd_badram,\n-\t\t\t N_(\"ADDR1,MASK1[,ADDR2,MASK2[,...]]\"),\n-\t\t\t N_(\"Declare memory regions as faulty (badram).\"));\n- cmd_cut = grub_register_command (\"cutmem\", grub_cmd_cutmem,\n-\t\t\t\t N_(\"FROM[K\|M\|G] TO[K\|M\|G]\"),\n-\t\t\t\t N_(\"Remove any memory regions in specified range.\"));\n+ cmd = grub_register_command_lockdown (\"badram\", grub_cmd_badram,\n+ N_(\"ADDR1,MASK1[,ADDR2,MASK2[,...]]\"),\n+ N_(\"Declare memory regions as faulty (badram).\"));\n+ cmd_cut = grub_register_command_lockdown (\"cutmem\", grub_cmd_cutmem,\n+ N_(\"FROM[K\|M\|G] TO[K\|M\|G]\"),\n+ N_(\"Remove any memory regions in specified range.\"));\n \n }\n \n-- \n2.26.2\n\n" } ]	{ "id": "grub2-15947-0014-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch", "cves": [ "CVE-2020-14372", "CVE-2020-25632", "CVE-2020-25647", "CVE-2020-27749", "CVE-2020-27779", "CVE-2021-20225", "CVE-2021-20233" ], "package": "grub2", "incident_id": 15947, "patch_name": "0014-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch", "tier": "identical", "language": "c", "patch_lines_changed": 18, "patch_files_count": 2, "total_tokens_est": 1458, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": "CVE-2020-27749", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- gcc/fortran/simplify.c\n- gcc/ubsan.c\n\n## Upstream Fix\n```diff\nIndex: configure.ac\n===================================================================\n--- configure.ac\t(revision 216911)\n+++ configure.ac\t(working copy)\n@@ -1454,7 +1454,7 @@ if test -d ${srcdir}/gcc && test \"x$have\n AC_MSG_CHECKING([for the correct version of mpfr.h])\n AC_TRY_COMPILE([#include <gmp.h>\n #include <mpfr.h>],[\n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n ], [AC_TRY_COMPILE([#include <gmp.h>\nIndex: configure\n===================================================================\n--- configure\t(revision 216911)\n+++ configure\t(working copy)\n@@ -5524,7 +5524,7 @@ int\n main ()\n {\n \n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n \nIndex: gcc/fortran/simplify.c\n===================================================================\n--- gcc/fortran/simplify.c\t(revision 216911)\n+++ gcc/fortran/simplify.c\t(working copy)\n@@ -4278,10 +4278,7 @@ gfc_simplify_mod (gfc_expr a, gfc_expr\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_mod(): Bad arguments\");\n@@ -4327,19 +4324,7 @@ gfc_simplify_modulo (gfc_expr a, gfc_ex\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tif (mpfr_cmp_ui (result->value.real, 0) != 0)\n-\t {\n-\t if (mpfr_signbit (a->value.real) != mpfr_signbit (p->value.real))\n-\t mpfr_add (result->value.real, result->value.real, p->value.real,\n-\t\t\tGFC_RND_MODE);\n-\t }\n-\telse\n-\t mpfr_copysign (result->value.real, result->value.real,\n-\t\t\t p->value.real, GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_modulo(): Bad arguments\");\nIndex: gcc/ubsan.c\n===================================================================\n--- gcc/ubsan.c.orig\t2015-06-01 14:52:11.717105684 +0200\n+++ gcc/ubsan.c\t2015-06-01 14:52:26.945253071 +0200\n@@ -1564,40 +1564,6 @@\n \t min = build_real (expr_type, minval2);\n \t}\n }\n- else if (REAL_MODE_FORMAT (mode)->b == 10)\n- {\n- /* For _Decimal128 up to 34 decimal digits, - sign,\n-\t dot, e, exponent. /\n- char buf[64];\n- mpfr_t m;\n- int p = REAL_MODE_FORMAT (mode)->p;\n- REAL_VALUE_TYPE maxval, minval;\n-\n- / Use mpfr_snprintf rounding to compute the smallest\n-\t representable decimal number greater or equal than\n-\t 1 << (prec - !uns_p). /\n- mpfr_init2 (m, prec + 2);\n- mpfr_set_ui_2exp (m, 1, prec - !uns_p, GMP_RNDN);\n- mpfr_snprintf (buf, sizeof buf, \"%.RUe\", p - 1, m);\n- decimal_real_from_string (&maxval, buf);\n- max = build_real (expr_type, maxval);\n-\n- /* For unsigned, assume -1.0 is always representable. /\n- if (uns_p)\n-\tmin = build_minus_one_cst (expr_type);\n- else\n-\t{\n-\t / Use mpfr_snprintf rounding to compute the largest\n-\t representable decimal number less or equal than\n-\t (-1 << (prec - 1)) - 1. /\n-\t mpfr_set_si_2exp (m, -1, prec - 1, GMP_RNDN);\n-\t mpfr_sub_ui (m, m, 1, GMP_RNDN);\n-\t mpfr_snprintf (buf, sizeof buf, \"%.RDe\", p - 1, m);\n-\t decimal_real_from_string (&minval, buf);\n-\t min = build_real (expr_type, minval);\n-\t}\n- mpfr_clear (m);\n- }\n else\n return NULL_TREE;\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: configure.ac\n===================================================================\n--- configure.ac\t(revision 216911)\n+++ configure.ac\t(working copy)\n@@ -1454,7 +1454,7 @@ if test -d ${srcdir}/gcc && test \"x$have\n AC_MSG_CHECKING([for the correct version of mpfr.h])\n AC_TRY_COMPILE([#include <gmp.h>\n #include <mpfr.h>],[\n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n ], [AC_TRY_COMPILE([#include <gmp.h>\nIndex: configure\n===================================================================\n--- configure\t(revision 216911)\n+++ configure\t(working copy)\n@@ -5524,7 +5524,7 @@ int\n main ()\n {\n \n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n \nIndex: gcc/fortran/simplify.c\n===================================================================\n--- gcc/fortran/simplify.c\t(revision 216911)\n+++ gcc/fortran/simplify.c\t(working copy)\n@@ -4278,10 +4278,7 @@ gfc_simplify_mod (gfc_expr a, gfc_expr\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_mod(): Bad arguments\");\n@@ -4327,19 +4324,7 @@ gfc_simplify_modulo (gfc_expr a, gfc_ex\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tif (mpfr_cmp_ui (result->value.real, 0) != 0)\n-\t {\n-\t if (mpfr_signbit (a->value.real) != mpfr_signbit (p->value.real))\n-\t mpfr_add (result->value.real, result->value.real, p->value.real,\n-\t\t\tGFC_RND_MODE);\n-\t }\n-\telse\n-\t mpfr_copysign (result->value.real, result->value.real,\n-\t\t\t p->value.real, GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_modulo(): Bad arguments\");\nIndex: gcc/ubsan.c\n===================================================================\n--- gcc/ubsan.c.orig\t2015-06-01 14:52:11.717105684 +0200\n+++ gcc/ubsan.c\t2015-06-01 14:52:26.945253071 +0200\n@@ -1564,40 +1564,6 @@\n \t min = build_real (expr_type, minval2);\n \t}\n }\n- else if (REAL_MODE_FORMAT (mode)->b == 10)\n- {\n- /* For _Decimal128 up to 34 decimal digits, - sign,\n-\t dot, e, exponent. /\n- char buf[64];\n- mpfr_t m;\n- int p = REAL_MODE_FORMAT (mode)->p;\n- REAL_VALUE_TYPE maxval, minval;\n-\n- / Use mpfr_snprintf rounding to compute the smallest\n-\t representable decimal number greater or equal than\n-\t 1 << (prec - !uns_p). /\n- mpfr_init2 (m, prec + 2);\n- mpfr_set_ui_2exp (m, 1, prec - !uns_p, GMP_RNDN);\n- mpfr_snprintf (buf, sizeof buf, \"%.RUe\", p - 1, m);\n- decimal_real_from_string (&maxval, buf);\n- max = build_real (expr_type, maxval);\n-\n- /* For unsigned, assume -1.0 is always representable. /\n- if (uns_p)\n-\tmin = build_minus_one_cst (expr_type);\n- else\n-\t{\n-\t / Use mpfr_snprintf rounding to compute the largest\n-\t representable decimal number less or equal than\n-\t (-1 << (prec - 1)) - 1. /\n-\t mpfr_set_si_2exp (m, -1, prec - 1, GMP_RNDN);\n-\t mpfr_sub_ui (m, m, 1, GMP_RNDN);\n-\t mpfr_snprintf (buf, sizeof buf, \"%.RDe\", p - 1, m);\n-\t decimal_real_from_string (&minval, buf);\n-\t min = build_real (expr_type, minval);\n-\t}\n- mpfr_clear (m);\n- }\n else\n return NULL_TREE;" } ]	{ "id": "gcc5-4931-gcc48-remove-mpfr-2.4.0-requir", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 57, "patch_files_count": 4, "total_tokens_est": 1913, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- gcc/gcc.c\n\n## Upstream Fix\n```diff\nIndex: gcc/gcc.c\n===================================================================\n--- gcc/gcc.c.orig\t2013-11-26 15:41:59.000000000 +0100\n+++ gcc/gcc.c\t2013-11-26 16:40:35.780548125 +0100\n@@ -258,6 +258,7 @@ static const char replace_outfile_spec_\n static const char remove_outfile_spec_function (int, const char *);\n static const char version_compare_spec_function (int, const char *);\n static const char include_spec_function (int, const char *);\n+static const char include_noerr_spec_function (int, const char *);\n static const char find_file_spec_function (int, const char *);\n static const char find_plugindir_spec_function (int, const char *);\n static const char print_asm_header_spec_function (int, const char );\n@@ -1357,6 +1358,7 @@ static const struct spec_function static\n { \"remove-outfile\",\t\tremove_outfile_spec_function },\n { \"version-compare\",\t\tversion_compare_spec_function },\n { \"include\",\t\t\tinclude_spec_function },\n+ { \"include_noerr\", include_noerr_spec_function },\n { \"find-file\",\t\tfind_file_spec_function },\n { \"find-plugindir\",\t\tfind_plugindir_spec_function },\n { \"print-asm-header\",\t\tprint_asm_header_spec_function },\n@@ -6480,6 +6482,8 @@ main (int argc, char argv)\n if (access (specs_file, R_OK) == 0)\n read_specs (specs_file, true, false);\n \n+ do_self_spec (\"%:include_noerr(defaults.spec)%(default_spec)\");\n+\n /* Process any configure-time defaults specified for the command line\n options, via OPTION_DEFAULT_SPECS. /\n for (i = 0; i < ARRAY_SIZE (option_default_specs); i++)\n@@ -8401,6 +8405,21 @@ get_random_number (void)\n return ret ^ getpid ();\n }\n \n+static const char \n+include_noerr_spec_function (int argc, const char *argv)\n+{\n+ char file;\n+\n+ if (argc != 1)\n+ abort ();\n+\n+ file = find_a_file (&startfile_prefixes, argv[0], R_OK, 0);\n+ if (file)\n+ read_specs (file, FALSE, TRUE);\n+\n+ return NULL;\n+}\n+\n /* %:compare-debug-dump-opt spec function. Save the last argument,\n expected to be the last -fdump-final-insns option, or generate a\n temporary. /\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: gcc/gcc.c\n===================================================================\n--- gcc/gcc.c.orig\t2013-11-26 15:41:59.000000000 +0100\n+++ gcc/gcc.c\t2013-11-26 16:40:35.780548125 +0100\n@@ -258,6 +258,7 @@ static const char replace_outfile_spec_\n static const char remove_outfile_spec_function (int, const char );\n static const char version_compare_spec_function (int, const char *);\n static const char include_spec_function (int, const char *);\n+static const char include_noerr_spec_function (int, const char *);\n static const char find_file_spec_function (int, const char *);\n static const char find_plugindir_spec_function (int, const char *);\n static const char print_asm_header_spec_function (int, const char );\n@@ -1357,6 +1358,7 @@ static const struct spec_function static\n { \"remove-outfile\",\t\tremove_outfile_spec_function },\n { \"version-compare\",\t\tversion_compare_spec_function },\n { \"include\",\t\t\tinclude_spec_function },\n+ { \"include_noerr\", include_noerr_spec_function },\n { \"find-file\",\t\tfind_file_spec_function },\n { \"find-plugindir\",\t\tfind_plugindir_spec_function },\n { \"print-asm-header\",\t\tprint_asm_header_spec_function },\n@@ -6480,6 +6482,8 @@ main (int argc, char argv)\n if (access (specs_file, R_OK) == 0)\n read_specs (specs_file, true, false);\n \n+ do_self_spec (\"%:include_noerr(defaults.spec)%(default_spec)\");\n+\n /* Process any configure-time defaults specified for the command line\n options, via OPTION_DEFAULT_SPECS. /\n for (i = 0; i < ARRAY_SIZE (option_default_specs); i++)\n@@ -8401,6 +8405,21 @@ get_random_number (void)\n return ret ^ getpid ();\n }\n \n+static const char \n+include_noerr_spec_function (int argc, const char *argv)\n+{\n+ char file;\n+\n+ if (argc != 1)\n+ abort ();\n+\n+ file = find_a_file (&startfile_prefixes, argv[0], R_OK, 0);\n+ if (file)\n+ read_specs (file, FALSE, TRUE);\n+\n+ return NULL;\n+}\n+\n /* %:compare-debug-dump-opt spec function. Save the last argument,\n expected to be the last -fdump-final-insns option, or generate a\n temporary. */" } ]	{ "id": "gcc5-4931-gcc-add-defaultsspec.diff", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 19, "patch_files_count": 1, "total_tokens_est": 1212, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- gcc/config/rs6000/rs6000.c\n- gcc/testsuite/gcc.dg/20051128-1.c\n\n## Upstream Fix\n```diff\n2005-11-28 Jakub Jelinek <jakub@redhat.com>\n\n\t* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,\n\tread word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx\n\tinstead of doing an extran indirection from frame_pointer_rtx.\n\n\t* gcc.dg/20051128-1.c: New test.\n\nIndex: gcc/config/rs6000/rs6000.c\n===================================================================\n--- gcc/config/rs6000/rs6000.c.orig\t2013-11-26 15:42:33.000000000 +0100\n+++ gcc/config/rs6000/rs6000.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -20878,18 +20878,22 @@ rs6000_return_addr (int count, rtx frame\n if (count != 0\n \|\| ((DEFAULT_ABI == ABI_V4 \|\| DEFAULT_ABI == ABI_DARWIN) && flag_pic))\n {\n+ rtx x;\n cfun->machine->ra_needs_full_frame = 1;\n \n- return\n-\tgen_rtx_MEM\n-\t (Pmode,\n-\t memory_address\n-\t (Pmode,\n-\t plus_constant (Pmode,\n-\t\t\t copy_to_reg\n-\t\t\t (gen_rtx_MEM (Pmode,\n-\t\t\t\t\t memory_address (Pmode, frame))),\n-\t\t\t RETURN_ADDRESS_OFFSET)));\n+ if (count == 0)\n+\t{\n+\t gcc_assert (frame == frame_pointer_rtx);\n+\t x = arg_pointer_rtx;\n+\t}\n+ else\n+\t{\n+\t x = memory_address (Pmode, frame);\n+\t x = copy_to_reg (gen_rtx_MEM (Pmode, x));\n+\t}\n+\n+ x = plus_constant (Pmode, x, RETURN_ADDRESS_OFFSET);\n+ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));\n }\n \n cfun->machine->ra_need_lr = 1;\nIndex: gcc/testsuite/gcc.dg/20051128-1.c\n===================================================================\n--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n+++ gcc/testsuite/gcc.dg/20051128-1.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -0,0 +1,41 @@\n+/* { dg-do run } /\n+/ { dg-options \"-O2 -fpic\" } /\n+\n+extern void exit (int);\n+extern void abort (void);\n+\n+int b;\n+\n+struct A\n+{\n+ void pad[147];\n+ void ra, h;\n+ long o;\n+};\n+\n+void\n+__attribute__((noinline))\n+foo (struct A a, void x)\n+{\n+ __builtin_memset (a, 0, sizeof (a));\n+ if (!b)\n+ exit (0);\n+}\n+\n+void\n+__attribute__((noinline))\n+bar (void)\n+{\n+ struct A a;\n+\n+ __builtin_unwind_init ();\n+ foo (&a, __builtin_return_address (0));\n+}\n+\n+int\n+main (void)\n+{\n+ bar ();\n+ abort ();\n+ return 0;\n+}\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "2005-11-28 Jakub Jelinek <jakub@redhat.com>\n\n\t* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,\n\tread word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx\n\tinstead of doing an extran indirection from frame_pointer_rtx.\n\n\t* gcc.dg/20051128-1.c: New test.\n\nIndex: gcc/config/rs6000/rs6000.c\n===================================================================\n--- gcc/config/rs6000/rs6000.c.orig\t2013-11-26 15:42:33.000000000 +0100\n+++ gcc/config/rs6000/rs6000.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -20878,18 +20878,22 @@ rs6000_return_addr (int count, rtx frame\n if (count != 0\n \|\| ((DEFAULT_ABI == ABI_V4 \|\| DEFAULT_ABI == ABI_DARWIN) && flag_pic))\n {\n+ rtx x;\n cfun->machine->ra_needs_full_frame = 1;\n \n- return\n-\tgen_rtx_MEM\n-\t (Pmode,\n-\t memory_address\n-\t (Pmode,\n-\t plus_constant (Pmode,\n-\t\t\t copy_to_reg\n-\t\t\t (gen_rtx_MEM (Pmode,\n-\t\t\t\t\t memory_address (Pmode, frame))),\n-\t\t\t RETURN_ADDRESS_OFFSET)));\n+ if (count == 0)\n+\t{\n+\t gcc_assert (frame == frame_pointer_rtx);\n+\t x = arg_pointer_rtx;\n+\t}\n+ else\n+\t{\n+\t x = memory_address (Pmode, frame);\n+\t x = copy_to_reg (gen_rtx_MEM (Pmode, x));\n+\t}\n+\n+ x = plus_constant (Pmode, x, RETURN_ADDRESS_OFFSET);\n+ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));\n }\n \n cfun->machine->ra_need_lr = 1;\nIndex: gcc/testsuite/gcc.dg/20051128-1.c\n===================================================================\n--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n+++ gcc/testsuite/gcc.dg/20051128-1.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -0,0 +1,41 @@\n+/* { dg-do run } /\n+/ { dg-options \"-O2 -fpic\" } /\n+\n+extern void exit (int);\n+extern void abort (void);\n+\n+int b;\n+\n+struct A\n+{\n+ void pad[147];\n+ void ra, h;\n+ long o;\n+};\n+\n+void\n+__attribute__((noinline))\n+foo (struct A a, void x)\n+{\n+ __builtin_memset (a, 0, sizeof (a));\n+ if (!b)\n+ exit (0);\n+}\n+\n+void\n+__attribute__((noinline))\n+bar (void)\n+{\n+ struct A a;\n+\n+ __builtin_unwind_init ();\n+ foo (&a, __builtin_return_address (0));\n+}\n+\n+int\n+main (void)\n+{\n+ bar ();\n+ abort ();\n+ return 0;\n+}" } ]	{ "id": "gcc5-4931-gcc41-ppc32-retaddr.patch", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 65, "patch_files_count": 2, "total_tokens_est": 1246, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- libcpp/init.c\n- gcc/intl.c\n- libcpp/system.h\n\n## Upstream Fix\n```diff\n#! /bin/sh -e\n\n# DP: Set gettext's domain and textdomain to the versioned package name.\n\ndir=\nif [ $# -eq 3 -a \"$2\" = '-d' ]; then\n pdir=\"-d $3\"\n dir=\"$3/\"\nelif [ $# -ne 1 ]; then\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nfi\ncase \"$1\" in\n -patch)\n patch $pdir -f --no-backup-if-mismatch -p0 < $0\n ;;\n -unpatch)\n patch $pdir -f --no-backup-if-mismatch -R -p0 < $0\n ;;\n )\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nesac\nexit 0\n\n\nIndex: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2013-11-26 16:46:03.000000000 +0100\n+++ gcc/Makefile.in\t2013-11-26 16:46:43.271816000 +0100\n@@ -3795,8 +3795,8 @@ install-po:\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n \t echo $(mkinstalldirs) $(DESTDIR)$$dir; \\\n \t $(mkinstalldirs) $(DESTDIR)$$dir \|\| exit 1; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n \tdone\n \n # Rule for regenerating the message template (gcc.pot).\nIndex: gcc/intl.c\n===================================================================\n--- gcc/intl.c.orig\t2013-11-26 15:42:31.000000000 +0100\n+++ gcc/intl.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -55,8 +55,8 @@ gcc_init_libintl (void)\n setlocale (LC_ALL, \"\");\n #endif\n \n- (void) bindtextdomain (\"gcc\", LOCALEDIR);\n- (void) textdomain (\"gcc\");\n+ (void) bindtextdomain (\"gcc-5\", LOCALEDIR);\n+ (void) textdomain (\"gcc-5\");\n \n / Opening quotation mark. /\n open_quote = _(\"`\");\nIndex: libcpp/Makefile.in\n===================================================================\n--- libcpp/Makefile.in.orig\t2013-11-26 16:26:56.000000000 +0100\n+++ libcpp/Makefile.in\t2013-11-26 16:47:15.764193260 +0100\n@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@\n LIBICONV = @LIBICONV@\n LIBINTL = @LIBINTL@\n PACKAGE = @PACKAGE@\n+PACKAGE_SUFFIX = -5\n RANLIB = @RANLIB@\n SHELL = @SHELL@\n USED_CATALOGS = @USED_CATALOGS@\n@@ -74,8 +75,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/.\n \t-I$(srcdir)/include\n \n ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG)\n+ALL_CFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \\\n \t$(CPPFLAGS) $(PICFLAG)\n+ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n \n # The name of the compiler to use.\n COMPILER = $(CXX)\n@@ -164,8 +167,8 @@ install-strip install: all installdirs\n \t else continue; \\\n \t fi; \\\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n \tdone\n \n mostlyclean:\nIndex: libcpp/system.h\n===================================================================\n--- libcpp/system.h.orig\t2013-01-15 10:49:52.000000000 +0100\n+++ libcpp/system.h\t2013-11-26 16:46:43.271816000 +0100\n@@ -280,7 +280,7 @@ extern int errno;\n #endif\n \n #ifndef _\n-# define _(msgid) dgettext (PACKAGE, msgid)\n+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)\n #endif\n \n #ifndef N_\nIndex: libcpp/init.c\n===================================================================\n--- libcpp/init.c.orig\t2013-11-26 15:42:40.000000000 +0100\n+++ libcpp/init.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -152,7 +152,7 @@ init_library (void)\n init_trigraph_map ();\n \n #ifdef ENABLE_NLS\n- (void) bindtextdomain (PACKAGE, LOCALEDIR);\n+ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);\n #endif\n }\n }\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "#! /bin/sh -e\n\n# DP: Set gettext's domain and textdomain to the versioned package name.\n\ndir=\nif [ $# -eq 3 -a \"$2\" = '-d' ]; then\n pdir=\"-d $3\"\n dir=\"$3/\"\nelif [ $# -ne 1 ]; then\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nfi\ncase \"$1\" in\n -patch)\n patch $pdir -f --no-backup-if-mismatch -p0 < $0\n ;;\n -unpatch)\n patch $pdir -f --no-backup-if-mismatch -R -p0 < $0\n ;;\n )\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nesac\nexit 0\n\n\nIndex: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2013-11-26 16:46:03.000000000 +0100\n+++ gcc/Makefile.in\t2013-11-26 16:46:43.271816000 +0100\n@@ -3795,8 +3795,8 @@ install-po:\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n \t echo $(mkinstalldirs) $(DESTDIR)$$dir; \\\n \t $(mkinstalldirs) $(DESTDIR)$$dir \|\| exit 1; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n \tdone\n \n # Rule for regenerating the message template (gcc.pot).\nIndex: gcc/intl.c\n===================================================================\n--- gcc/intl.c.orig\t2013-11-26 15:42:31.000000000 +0100\n+++ gcc/intl.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -55,8 +55,8 @@ gcc_init_libintl (void)\n setlocale (LC_ALL, \"\");\n #endif\n \n- (void) bindtextdomain (\"gcc\", LOCALEDIR);\n- (void) textdomain (\"gcc\");\n+ (void) bindtextdomain (\"gcc-5\", LOCALEDIR);\n+ (void) textdomain (\"gcc-5\");\n \n /* Opening quotation mark. */\n open_quote = _(\"`\");\nIndex: libcpp/Makefile.in\n===================================================================\n--- libcpp/Makefile.in.orig\t2013-11-26 16:26:56.000000000 +0100\n+++ libcpp/Makefile.in\t2013-11-26 16:47:15.764193260 +0100\n@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@\n LIBICONV = @LIBICONV@\n LIBINTL = @LIBINTL@\n PACKAGE = @PACKAGE@\n+PACKAGE_SUFFIX = -5\n RANLIB = @RANLIB@\n SHELL = @SHELL@\n USED_CATALOGS = @USED_CATALOGS@\n@@ -74,8 +75,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/.\n \t-I$(srcdir)/include\n \n ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG)\n+ALL_CFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \\\n \t$(CPPFLAGS) $(PICFLAG)\n+ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n \n # The name of the compiler to use.\n COMPILER = $(CXX)\n@@ -164,8 +167,8 @@ install-strip install: all installdirs\n \t else continue; \\\n \t fi; \\\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n \tdone\n \n mostlyclean:\nIndex: libcpp/system.h\n===================================================================\n--- libcpp/system.h.orig\t2013-01-15 10:49:52.000000000 +0100\n+++ libcpp/system.h\t2013-11-26 16:46:43.271816000 +0100\n@@ -280,7 +280,7 @@ extern int errno;\n #endif\n \n #ifndef _\n-# define _(msgid) dgettext (PACKAGE, msgid)\n+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)\n #endif\n \n #ifndef N_\nIndex: libcpp/init.c\n===================================================================\n--- libcpp/init.c.orig\t2013-11-26 15:42:40.000000000 +0100\n+++ libcpp/init.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -152,7 +152,7 @@ init_library (void)\n init_trigraph_map ();\n \n #ifdef ENABLE_NLS\n- (void) bindtextdomain (PACKAGE, LOCALEDIR);\n+ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);\n #endif\n }\n }" } ]	{ "id": "gcc5-4931-gcc44-textdomain.patch", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 19, "patch_files_count": 5, "total_tokens_est": 2101, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- libffi/src/aarch64/ffitarget.h\n\n## Upstream Fix\n```diff\nIndex: libffi/src/aarch64/ffitarget.h\n===================================================================\n--- libffi/src/aarch64/ffitarget.h\t(revision 233963)\n+++ libffi/src/aarch64/ffitarget.h\t(working copy)\n@@ -52,8 +52,8 @@ typedef enum ffi_abi\n #define FFI_TRAMPOLINE_SIZE 20\n #define FFI_TRAMPOLINE_CLOSURE_OFFSET 16\n #else\n-#define FFI_TRAMPOLINE_SIZE 24\n-#define FFI_TRAMPOLINE_CLOSURE_OFFSET FFI_TRAMPOLINE_SIZE\n+#define FFI_TRAMPOLINE_SIZE 36\n+#define FFI_TRAMPOLINE_CLOSURE_OFFSET 40\n #endif\n #define FFI_NATIVE_RAW_API 0\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: libffi/src/aarch64/ffitarget.h\n===================================================================\n--- libffi/src/aarch64/ffitarget.h\t(revision 233963)\n+++ libffi/src/aarch64/ffitarget.h\t(working copy)\n@@ -52,8 +52,8 @@ typedef enum ffi_abi\n #define FFI_TRAMPOLINE_SIZE 20\n #define FFI_TRAMPOLINE_CLOSURE_OFFSET 16\n #else\n-#define FFI_TRAMPOLINE_SIZE 24\n-#define FFI_TRAMPOLINE_CLOSURE_OFFSET FFI_TRAMPOLINE_SIZE\n+#define FFI_TRAMPOLINE_SIZE 36\n+#define FFI_TRAMPOLINE_CLOSURE_OFFSET 40\n #endif\n #define FFI_NATIVE_RAW_API 0" } ]	{ "id": "gcc5-4931-gcc5-aarch64-libffi.patch", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 4, "patch_files_count": 1, "total_tokens_est": 447, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- gcc/config/i386/linux.h\n\n## Upstream Fix\n```diff\nFor i?86 negative offsets to %fs segment accesses cause a hypervisor\ntrap for Xen. Avoid this by making accesses indirect.\n\n??? Note that similar to the behavior on SLE11 this only affects\nthe compiler built on %ix86, not that on x86_64, even with -m32.\n\nIndex: gcc/config/i386/linux.h\n===================================================================\n--- gcc/config/i386/linux.h\t(revision 209175)\n+++ gcc/config/i386/linux.h\t(working copy)\n@@ -21,3 +21,9 @@ along with GCC; see the file COPYING3.\n \n #define GNU_USER_LINK_EMULATION \"elf_i386\"\n #define GLIBC_DYNAMIC_LINKER \"/lib/ld-linux.so.2\"\n+\n+/* This slows down Xen, so take a very small general performance hit\n+ for not accessing the %fs segment with negative offsets by making\n+ GCC not emit direct accesses to %fs at all. /\n+#undef TARGET_TLS_DIRECT_SEG_REFS_DEFAULT\n+#define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT 0\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "For i?86 negative offsets to %fs segment accesses cause a hypervisor\ntrap for Xen. Avoid this by making accesses indirect.\n\n??? Note that similar to the behavior on SLE11 this only affects\nthe compiler built on %ix86, not that on x86_64, even with -m32.\n\nIndex: gcc/config/i386/linux.h\n===================================================================\n--- gcc/config/i386/linux.h\t(revision 209175)\n+++ gcc/config/i386/linux.h\t(working copy)\n@@ -21,3 +21,9 @@ along with GCC; see the file COPYING3.\n \n #define GNU_USER_LINK_EMULATION \"elf_i386\"\n #define GLIBC_DYNAMIC_LINKER \"/lib/ld-linux.so.2\"\n+\n+/ This slows down Xen, so take a very small general performance hit\n+ for not accessing the %fs segment with negative offsets by making\n+ GCC not emit direct accesses to %fs at all. */\n+#undef TARGET_TLS_DIRECT_SEG_REFS_DEFAULT\n+#define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT 0" } ]	{ "id": "gcc5-4931-tls-no-direct.diff", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 1, "total_tokens_est": 620, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- libsanitizer/sanitizer_common/sanitizer_platform.h\n- libsanitizer/asan/asan_allocator.h\n\n## Upstream Fix\n```diff\n2015-01-22 Jakub Jelinek <jakub@redhat.com>\n\n\t* asan/asan_allocator.h (kAllocatorSpace, kAllocatorSize):\n\tSet to 1T for __aarch64__.\n\t* sanitizer_common/sanitizer_platform.h\n\t(SANITIZER_CAN_USE_ALLOCATOR64): Set to 1 on __aarch64__\n\tif SANITIZER_WORDSIZE is 64.\n\t(SANITIZER_MMAP_RANGE_SIZE): Define to 1ULL << 42 for\n\t__aarch64__.\n\n--- libsanitizer/asan/asan_allocator.h\t(revision 219833)\n+++ libsanitizer/asan/asan_allocator.h\t(working copy)\n@@ -100,6 +100,10 @@\n # if defined(__powerpc64__)\n const uptr kAllocatorSpace = 0xa0000000000ULL;\n const uptr kAllocatorSize = 0x20000000000ULL; // 2T.\n+# elif defined(__aarch64__)\n+// Valid only for 42-bit VA\n+const uptr kAllocatorSpace = 0x10000000000ULL;\n+const uptr kAllocatorSize = 0x10000000000ULL; // 1T.\n # else\n const uptr kAllocatorSpace = 0x600000000000ULL;\n const uptr kAllocatorSize = 0x40000000000ULL; // 4T.\n--- libsanitizer/sanitizer_common/sanitizer_platform.h\t(revision 219833)\n+++ libsanitizer/sanitizer_common/sanitizer_platform.h\t(working copy)\n@@ -79,7 +79,7 @@\n // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or\n // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.\n #ifndef SANITIZER_CAN_USE_ALLOCATOR64\n-# if defined(__aarch64__) \|\| defined(__mips64)\n+# if defined(__mips64)\n # define SANITIZER_CAN_USE_ALLOCATOR64 0\n # else\n # define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)\n@@ -88,10 +88,10 @@\n \n // The range of addresses which can be returned my mmap.\n // FIXME: this value should be different on different platforms,\n-// e.g. on AArch64 it is most likely (1ULL << 39). Larger values will still work\n+// e.g. on AArch64 it is most likely (1ULL << 42). Larger values will still work\n // but will consume more memory for TwoLevelByteMap.\n #if defined(__aarch64__)\n-# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 39)\n+# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 42)\n #else\n # define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 47)\n #endif\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "2015-01-22 Jakub Jelinek <jakub@redhat.com>\n\n\t* asan/asan_allocator.h (kAllocatorSpace, kAllocatorSize):\n\tSet to 1T for __aarch64__.\n\t* sanitizer_common/sanitizer_platform.h\n\t(SANITIZER_CAN_USE_ALLOCATOR64): Set to 1 on __aarch64__\n\tif SANITIZER_WORDSIZE is 64.\n\t(SANITIZER_MMAP_RANGE_SIZE): Define to 1ULL << 42 for\n\t__aarch64__.\n\n--- libsanitizer/asan/asan_allocator.h\t(revision 219833)\n+++ libsanitizer/asan/asan_allocator.h\t(working copy)\n@@ -100,6 +100,10 @@\n # if defined(__powerpc64__)\n const uptr kAllocatorSpace = 0xa0000000000ULL;\n const uptr kAllocatorSize = 0x20000000000ULL; // 2T.\n+# elif defined(__aarch64__)\n+// Valid only for 42-bit VA\n+const uptr kAllocatorSpace = 0x10000000000ULL;\n+const uptr kAllocatorSize = 0x10000000000ULL; // 1T.\n # else\n const uptr kAllocatorSpace = 0x600000000000ULL;\n const uptr kAllocatorSize = 0x40000000000ULL; // 4T.\n--- libsanitizer/sanitizer_common/sanitizer_platform.h\t(revision 219833)\n+++ libsanitizer/sanitizer_common/sanitizer_platform.h\t(working copy)\n@@ -79,7 +79,7 @@\n // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or\n // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.\n #ifndef SANITIZER_CAN_USE_ALLOCATOR64\n-# if defined(__aarch64__) \|\| defined(__mips64)\n+# if defined(__mips64)\n # define SANITIZER_CAN_USE_ALLOCATOR64 0\n # else\n # define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)\n@@ -88,10 +88,10 @@\n \n // The range of addresses which can be returned my mmap.\n // FIXME: this value should be different on different platforms,\n-// e.g. on AArch64 it is most likely (1ULL << 39). Larger values will still work\n+// e.g. on AArch64 it is most likely (1ULL << 42). Larger values will still work\n // but will consume more memory for TwoLevelByteMap.\n #if defined(__aarch64__)\n-# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 39)\n+# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 42)\n #else\n # define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 47)\n #endif" } ]	{ "id": "gcc5-4931-gcc5-libsanitize-aarch64-va42.", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 10, "patch_files_count": 0, "total_tokens_est": 1224, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- gcc/cppbuiltin.c\n\n## Upstream Fix\n```diff\nIndex: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2015-05-08 17:10:12.068697540 +0200\n+++ gcc/Makefile.in\t2015-05-08 17:25:31.831833081 +0200\n@@ -810,12 +810,14 @@ GTM_H = tm.h $(tm_file_list) in\n TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)\n \n # Variables for version information.\n-BASEVER := $(srcdir)/BASE-VER # 4.x.y\n+BASEVER := $(srcdir)/BASE-VER # 5\n+FULLVER := $(srcdir)/FULL-VER # 5.x.y\n DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, \"\"\n DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty\n REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]\n \n BASEVER_c := $(shell cat $(BASEVER))\n+FULLVER_c := $(shell cat $(FULLVER))\n DEVPHASE_c := $(shell cat $(DEVPHASE))\n DATESTAMP_c := $(shell cat $(DATESTAMP))\n \n@@ -839,6 +841,7 @@ PATCHLEVEL_c := \\\n # immediately after the comma in the $(if ...) constructs is\n # significant - do not remove it.\n BASEVER_s := \"\\\"$(BASEVER_c)\\\"\"\n+FULLVER_s := \"\\\"$(FULLVER_c)\\\"\"\n DEVPHASE_s := \"\\\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\\\"\"\n DATESTAMP_s := \\\n \"\\\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\\\"\"\n@@ -2028,7 +2031,7 @@ s-options-h: optionlist $(srcdir)/opt-fu\n \n dumpvers: dumpvers.c\n \n-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s)\n@@ -2038,10 +2041,10 @@ version.o: $(REVISION) $(DATESTAMP) $(BA\n CFLAGS-lto-compress.o += $(ZLIBINC)\n \n bversion.h: s-bversion; @true\n-s-bversion: BASE-VER\n-\techo \"#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n-\techo \"#define BUILDING_GCC_MINOR `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n-\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n+s-bversion: FULL-VER\n+\techo \"#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n+\techo \"#define BUILDING_GCC_MINOR `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n+\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n \techo \"#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)\" >> bversion.h\n \t$(STAMP) s-bversion\n \n@@ -2410,9 +2413,9 @@ build/%.o : # dependencies provided by\n ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs\n ## several C macro definitions, just like version.o\n build/version.o: version.c version.h \\\n- $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)\n+ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)\n \t$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \\\n-\t-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+\t-DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s) -o $@ $<\n@@ -2623,8 +2626,8 @@ PREPROCESSOR_DEFINES = \\\n -DSTANDARD_EXEC_PREFIX=\\\"$(libdir)/gcc/\\\" \\\n @TARGET_SYSTEM_ROOT_DEFINE@\n \n-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)\n-cppbuiltin.o: $(BASEVER)\n+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)\n+cppbuiltin.o: $(FULLVER)\n \n CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)\n \n@@ -2640,8 +2643,8 @@ build/gcov-iov$(build_exeext): build/gco\n \t\tbuild/gcov-iov.o -o $@\n \n gcov-iov.h: s-iov\n-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)\n-\tbuild/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \\\n+s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)\n+\tbuild/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \\\n \t > tmp-gcov-iov.h\n \t$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h\n \t$(STAMP) s-iov\nIndex: libjava/testsuite/lib/libjava.exp\n===================================================================\n--- libjava/testsuite/lib/libjava.exp.orig\t2014-12-02 13:29:22.487902351 +0100\n+++ libjava/testsuite/lib/libjava.exp\t2015-05-08 17:25:31.831833081 +0200\n@@ -179,7 +179,7 @@ proc libjava_init { args } {\n \n set text [eval exec \"$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout\"]\n regexp \" version \\[^\\n\\r\\]\" $text version\n- set libjava_version [lindex $version 1]\n+ set libjava_version 5\n \n verbose \"version: $libjava_version\"\n \nIndex: gcc/cppbuiltin.c\n===================================================================\n--- gcc/cppbuiltin.c.orig\t2015-01-12 16:22:34.486893087 +0100\n+++ gcc/cppbuiltin.c\t2015-05-08 17:25:31.832833089 +0200\n@@ -46,9 +46,9 @@ parse_basever (int major, int minor, i\n static int s_major = -1, s_minor, s_patchlevel;\n \n if (s_major == -1)\n- if (sscanf (BASEVER, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n+ if (sscanf (version_string, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n {\n-\tsscanf (BASEVER, \"%d.%d\", &s_major, &s_minor);\n+\tsscanf (version_string, \"%d.%d\", &s_major, &s_minor);\n \ts_patchlevel = 0;\n }\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2015-05-08 17:10:12.068697540 +0200\n+++ gcc/Makefile.in\t2015-05-08 17:25:31.831833081 +0200\n@@ -810,12 +810,14 @@ GTM_H = tm.h $(tm_file_list) in\n TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)\n \n # Variables for version information.\n-BASEVER := $(srcdir)/BASE-VER # 4.x.y\n+BASEVER := $(srcdir)/BASE-VER # 5\n+FULLVER := $(srcdir)/FULL-VER # 5.x.y\n DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, \"\"\n DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty\n REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]\n \n BASEVER_c := $(shell cat $(BASEVER))\n+FULLVER_c := $(shell cat $(FULLVER))\n DEVPHASE_c := $(shell cat $(DEVPHASE))\n DATESTAMP_c := $(shell cat $(DATESTAMP))\n \n@@ -839,6 +841,7 @@ PATCHLEVEL_c := \\\n # immediately after the comma in the $(if ...) constructs is\n # significant - do not remove it.\n BASEVER_s := \"\\\"$(BASEVER_c)\\\"\"\n+FULLVER_s := \"\\\"$(FULLVER_c)\\\"\"\n DEVPHASE_s := \"\\\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\\\"\"\n DATESTAMP_s := \\\n \"\\\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\\\"\"\n@@ -2028,7 +2031,7 @@ s-options-h: optionlist $(srcdir)/opt-fu\n \n dumpvers: dumpvers.c\n \n-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s)\n@@ -2038,10 +2041,10 @@ version.o: $(REVISION) $(DATESTAMP) $(BA\n CFLAGS-lto-compress.o += $(ZLIBINC)\n \n bversion.h: s-bversion; @true\n-s-bversion: BASE-VER\n-\techo \"#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n-\techo \"#define BUILDING_GCC_MINOR `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n-\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n+s-bversion: FULL-VER\n+\techo \"#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n+\techo \"#define BUILDING_GCC_MINOR `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n+\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n \techo \"#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR 1000 + BUILDING_GCC_MINOR)\" >> bversion.h\n \t$(STAMP) s-bversion\n \n@@ -2410,9 +2413,9 @@ build/%.o : # dependencies provided by\n ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs\n ## several C macro definitions, just like version.o\n build/version.o: version.c version.h \\\n- $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)\n+ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)\n \t$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \\\n-\t-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+\t-DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s) -o $@ $<\n@@ -2623,8 +2626,8 @@ PREPROCESSOR_DEFINES = \\\n -DSTANDARD_EXEC_PREFIX=\\\"$(libdir)/gcc/\\\" \\\n @TARGET_SYSTEM_ROOT_DEFINE@\n \n-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)\n-cppbuiltin.o: $(BASEVER)\n+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)\n+cppbuiltin.o: $(FULLVER)\n \n CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)\n \n@@ -2640,8 +2643,8 @@ build/gcov-iov$(build_exeext): build/gco\n \t\tbuild/gcov-iov.o -o $@\n \n gcov-iov.h: s-iov\n-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)\n-\tbuild/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \\\n+s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)\n+\tbuild/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \\\n \t > tmp-gcov-iov.h\n \t$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h\n \t$(STAMP) s-iov\nIndex: libjava/testsuite/lib/libjava.exp\n===================================================================\n--- libjava/testsuite/lib/libjava.exp.orig\t2014-12-02 13:29:22.487902351 +0100\n+++ libjava/testsuite/lib/libjava.exp\t2015-05-08 17:25:31.831833081 +0200\n@@ -179,7 +179,7 @@ proc libjava_init { args } {\n \n set text [eval exec \"$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout\"]\n regexp \" version \\[^\\n\\r\\]\" $text version\n- set libjava_version [lindex $version 1]\n+ set libjava_version 5\n \n verbose \"version: $libjava_version\"\n \nIndex: gcc/cppbuiltin.c\n===================================================================\n--- gcc/cppbuiltin.c.orig\t2015-01-12 16:22:34.486893087 +0100\n+++ gcc/cppbuiltin.c\t2015-05-08 17:25:31.832833089 +0200\n@@ -46,9 +46,9 @@ parse_basever (int major, int *minor, i\n static int s_major = -1, s_minor, s_patchlevel;\n \n if (s_major == -1)\n- if (sscanf (BASEVER, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n+ if (sscanf (version_string, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n {\n-\tsscanf (BASEVER, \"%d.%d\", &s_major, &s_minor);\n+\tsscanf (version_string, \"%d.%d\", &s_major, &s_minor);\n \ts_patchlevel = 0;\n }" } ]	{ "id": "gcc5-4931-gcc-dir-version.patch", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 33, "patch_files_count": 3, "total_tokens_est": 2785, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5\n\n## Files to modify\n- gcc/c/c-typeck.c\n- gcc/testsuite/gcc.dg/cleanup-1.c\n\n## Upstream Fix\n```diff\nIndex: gcc/c-family/c.opt\n===================================================================\n--- gcc/c-family/c.opt.orig\t2014-11-11 09:38:31.286867405 +0100\n+++ gcc/c-family/c.opt\t2014-11-17 16:38:44.438078729 +0100\n@@ -868,6 +868,10 @@ Wunused-local-typedefs\n C ObjC C++ ObjC++ Var(warn_unused_local_typedefs) Warning EnabledBy(Wunused)\n Warn when typedefs locally defined in a function are not used\n \n+Wunprototyped-calls\n+C Var(warn_unprototyped_calls) Warning LangEnabledBy(C,Wall)\n+Warn about calls to unprototyped functions with at least one argument\n+\n Wunused-macros\n C ObjC C++ ObjC++ CppReason(CPP_W_UNUSED_MACROS) Var(cpp_warn_unused_macros) Warning\n Warn about macros defined in the main file that are not used\nIndex: gcc/c/c-typeck.c\n===================================================================\n--- gcc/c/c-typeck.c.orig\t2014-11-11 09:38:32.068867371 +0100\n+++ gcc/c/c-typeck.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -2957,6 +2957,19 @@ build_function_call_vec (location_t loc,\n && !check_builtin_function_arguments (fundecl, nargs, argarray))\n return error_mark_node;\n \n+ /* If we cannot check function arguments because a prototype is\n+ missing for the callee, warn here. /\n+ if (warn_unprototyped_calls\n+ && nargs > 0 && !TYPE_ARG_TYPES (fntype)\n+ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl)\n+ && !DECL_ARGUMENTS (fundecl))\n+ {\n+ if (warning (OPT_Wunprototyped_calls,\n+\t\t \"call to function %qD without a real prototype\", fundecl))\n+\tinform (DECL_SOURCE_LOCATION (fundecl), \"%qD was declared here\",\n+\t\tfundecl);\n+ }\n+\n / Check that the arguments to the function are valid. /\n check_function_arguments (fntype, nargs, argarray);\n \nIndex: gcc/testsuite/gcc.dg/cleanup-1.c\n===================================================================\n--- gcc/testsuite/gcc.dg/cleanup-1.c.orig\t2010-02-23 12:43:21.000000000 +0100\n+++ gcc/testsuite/gcc.dg/cleanup-1.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -6,7 +6,7 @@\n #define C(x)\t__attribute__((cleanup(x)))\n \n static int f1(void x U) { return 0; }\n-static void f2() { }\n+static void f2() { } /* { dg-message \"declared here\" \"\" } /\n static void f3(void) { } / { dg-message \"note: declared here\" } /\n static void f4(void x U) { }\n static void f5(int x U) { }\n@@ -18,7 +18,7 @@ static void f9(int x U) { } / { dg-mess\n void test(void)\n {\n int o1 C(f1);\n- int o2 C(f2);\n+ int o2 C(f2);\t\t/* { dg-warning \"without a real prototype\" } /\n int o3 C(f3);\t\t/ { dg-error \"too many arguments\" } /\n int o4 C(f4);\n int o5 C(f5);\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: gcc/c-family/c.opt\n===================================================================\n--- gcc/c-family/c.opt.orig\t2014-11-11 09:38:31.286867405 +0100\n+++ gcc/c-family/c.opt\t2014-11-17 16:38:44.438078729 +0100\n@@ -868,6 +868,10 @@ Wunused-local-typedefs\n C ObjC C++ ObjC++ Var(warn_unused_local_typedefs) Warning EnabledBy(Wunused)\n Warn when typedefs locally defined in a function are not used\n \n+Wunprototyped-calls\n+C Var(warn_unprototyped_calls) Warning LangEnabledBy(C,Wall)\n+Warn about calls to unprototyped functions with at least one argument\n+\n Wunused-macros\n C ObjC C++ ObjC++ CppReason(CPP_W_UNUSED_MACROS) Var(cpp_warn_unused_macros) Warning\n Warn about macros defined in the main file that are not used\nIndex: gcc/c/c-typeck.c\n===================================================================\n--- gcc/c/c-typeck.c.orig\t2014-11-11 09:38:32.068867371 +0100\n+++ gcc/c/c-typeck.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -2957,6 +2957,19 @@ build_function_call_vec (location_t loc,\n && !check_builtin_function_arguments (fundecl, nargs, argarray))\n return error_mark_node;\n \n+ / If we cannot check function arguments because a prototype is\n+ missing for the callee, warn here. /\n+ if (warn_unprototyped_calls\n+ && nargs > 0 && !TYPE_ARG_TYPES (fntype)\n+ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl)\n+ && !DECL_ARGUMENTS (fundecl))\n+ {\n+ if (warning (OPT_Wunprototyped_calls,\n+\t\t \"call to function %qD without a real prototype\", fundecl))\n+\tinform (DECL_SOURCE_LOCATION (fundecl), \"%qD was declared here\",\n+\t\tfundecl);\n+ }\n+\n / Check that the arguments to the function are valid. /\n check_function_arguments (fntype, nargs, argarray);\n \nIndex: gcc/testsuite/gcc.dg/cleanup-1.c\n===================================================================\n--- gcc/testsuite/gcc.dg/cleanup-1.c.orig\t2010-02-23 12:43:21.000000000 +0100\n+++ gcc/testsuite/gcc.dg/cleanup-1.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -6,7 +6,7 @@\n #define C(x)\t__attribute__((cleanup(x)))\n \n static int f1(void x U) { return 0; }\n-static void f2() { }\n+static void f2() { } /* { dg-message \"declared here\" \"\" } /\n static void f3(void) { } / { dg-message \"note: declared here\" } /\n static void f4(void x U) { }\n static void f5(int x U) { }\n@@ -18,7 +18,7 @@ static void f9(int x U) { } / { dg-mess\n void test(void)\n {\n int o1 C(f1);\n- int o2 C(f2);\n+ int o2 C(f2);\t\t/* { dg-warning \"without a real prototype\" } /\n int o3 C(f3);\t\t/ { dg-error \"too many arguments\" } */\n int o4 C(f4);\n int o5 C(f5);" } ]	{ "id": "gcc5-4931-Wunprototyped-calls.diff", "cves": [], "package": "gcc5", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 21, "patch_files_count": 3, "total_tokens_est": 1474, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- gcc/config/i386/linux.h\n\n## Upstream Fix\n```diff\nFor i?86 negative offsets to %fs segment accesses cause a hypervisor\ntrap for Xen. Avoid this by making accesses indirect.\n\n??? Note that similar to the behavior on SLE11 this only affects\nthe compiler built on %ix86, not that on x86_64, even with -m32.\n\nIndex: gcc/config/i386/linux.h\n===================================================================\n--- gcc/config/i386/linux.h\t(revision 209175)\n+++ gcc/config/i386/linux.h\t(working copy)\n@@ -21,3 +21,9 @@ along with GCC; see the file COPYING3.\n \n #define GNU_USER_LINK_EMULATION \"elf_i386\"\n #define GLIBC_DYNAMIC_LINKER \"/lib/ld-linux.so.2\"\n+\n+/* This slows down Xen, so take a very small general performance hit\n+ for not accessing the %fs segment with negative offsets by making\n+ GCC not emit direct accesses to %fs at all. /\n+#undef TARGET_TLS_DIRECT_SEG_REFS_DEFAULT\n+#define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT 0\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "For i?86 negative offsets to %fs segment accesses cause a hypervisor\ntrap for Xen. Avoid this by making accesses indirect.\n\n??? Note that similar to the behavior on SLE11 this only affects\nthe compiler built on %ix86, not that on x86_64, even with -m32.\n\nIndex: gcc/config/i386/linux.h\n===================================================================\n--- gcc/config/i386/linux.h\t(revision 209175)\n+++ gcc/config/i386/linux.h\t(working copy)\n@@ -21,3 +21,9 @@ along with GCC; see the file COPYING3.\n \n #define GNU_USER_LINK_EMULATION \"elf_i386\"\n #define GLIBC_DYNAMIC_LINKER \"/lib/ld-linux.so.2\"\n+\n+/ This slows down Xen, so take a very small general performance hit\n+ for not accessing the %fs segment with negative offsets by making\n+ GCC not emit direct accesses to %fs at all. */\n+#undef TARGET_TLS_DIRECT_SEG_REFS_DEFAULT\n+#define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT 0" } ]	{ "id": "gcc5-testresults-4931-tls-no-direct.diff", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 1, "total_tokens_est": 623, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- gcc/config/rs6000/rs6000.c\n- gcc/testsuite/gcc.dg/20051128-1.c\n\n## Upstream Fix\n```diff\n2005-11-28 Jakub Jelinek <jakub@redhat.com>\n\n\t* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,\n\tread word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx\n\tinstead of doing an extran indirection from frame_pointer_rtx.\n\n\t* gcc.dg/20051128-1.c: New test.\n\nIndex: gcc/config/rs6000/rs6000.c\n===================================================================\n--- gcc/config/rs6000/rs6000.c.orig\t2013-11-26 15:42:33.000000000 +0100\n+++ gcc/config/rs6000/rs6000.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -20878,18 +20878,22 @@ rs6000_return_addr (int count, rtx frame\n if (count != 0\n \|\| ((DEFAULT_ABI == ABI_V4 \|\| DEFAULT_ABI == ABI_DARWIN) && flag_pic))\n {\n+ rtx x;\n cfun->machine->ra_needs_full_frame = 1;\n \n- return\n-\tgen_rtx_MEM\n-\t (Pmode,\n-\t memory_address\n-\t (Pmode,\n-\t plus_constant (Pmode,\n-\t\t\t copy_to_reg\n-\t\t\t (gen_rtx_MEM (Pmode,\n-\t\t\t\t\t memory_address (Pmode, frame))),\n-\t\t\t RETURN_ADDRESS_OFFSET)));\n+ if (count == 0)\n+\t{\n+\t gcc_assert (frame == frame_pointer_rtx);\n+\t x = arg_pointer_rtx;\n+\t}\n+ else\n+\t{\n+\t x = memory_address (Pmode, frame);\n+\t x = copy_to_reg (gen_rtx_MEM (Pmode, x));\n+\t}\n+\n+ x = plus_constant (Pmode, x, RETURN_ADDRESS_OFFSET);\n+ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));\n }\n \n cfun->machine->ra_need_lr = 1;\nIndex: gcc/testsuite/gcc.dg/20051128-1.c\n===================================================================\n--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n+++ gcc/testsuite/gcc.dg/20051128-1.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -0,0 +1,41 @@\n+/* { dg-do run } /\n+/ { dg-options \"-O2 -fpic\" } /\n+\n+extern void exit (int);\n+extern void abort (void);\n+\n+int b;\n+\n+struct A\n+{\n+ void pad[147];\n+ void ra, h;\n+ long o;\n+};\n+\n+void\n+__attribute__((noinline))\n+foo (struct A a, void x)\n+{\n+ __builtin_memset (a, 0, sizeof (a));\n+ if (!b)\n+ exit (0);\n+}\n+\n+void\n+__attribute__((noinline))\n+bar (void)\n+{\n+ struct A a;\n+\n+ __builtin_unwind_init ();\n+ foo (&a, __builtin_return_address (0));\n+}\n+\n+int\n+main (void)\n+{\n+ bar ();\n+ abort ();\n+ return 0;\n+}\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "2005-11-28 Jakub Jelinek <jakub@redhat.com>\n\n\t* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,\n\tread word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx\n\tinstead of doing an extran indirection from frame_pointer_rtx.\n\n\t* gcc.dg/20051128-1.c: New test.\n\nIndex: gcc/config/rs6000/rs6000.c\n===================================================================\n--- gcc/config/rs6000/rs6000.c.orig\t2013-11-26 15:42:33.000000000 +0100\n+++ gcc/config/rs6000/rs6000.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -20878,18 +20878,22 @@ rs6000_return_addr (int count, rtx frame\n if (count != 0\n \|\| ((DEFAULT_ABI == ABI_V4 \|\| DEFAULT_ABI == ABI_DARWIN) && flag_pic))\n {\n+ rtx x;\n cfun->machine->ra_needs_full_frame = 1;\n \n- return\n-\tgen_rtx_MEM\n-\t (Pmode,\n-\t memory_address\n-\t (Pmode,\n-\t plus_constant (Pmode,\n-\t\t\t copy_to_reg\n-\t\t\t (gen_rtx_MEM (Pmode,\n-\t\t\t\t\t memory_address (Pmode, frame))),\n-\t\t\t RETURN_ADDRESS_OFFSET)));\n+ if (count == 0)\n+\t{\n+\t gcc_assert (frame == frame_pointer_rtx);\n+\t x = arg_pointer_rtx;\n+\t}\n+ else\n+\t{\n+\t x = memory_address (Pmode, frame);\n+\t x = copy_to_reg (gen_rtx_MEM (Pmode, x));\n+\t}\n+\n+ x = plus_constant (Pmode, x, RETURN_ADDRESS_OFFSET);\n+ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));\n }\n \n cfun->machine->ra_need_lr = 1;\nIndex: gcc/testsuite/gcc.dg/20051128-1.c\n===================================================================\n--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n+++ gcc/testsuite/gcc.dg/20051128-1.c\t2013-11-26 16:44:14.566089231 +0100\n@@ -0,0 +1,41 @@\n+/* { dg-do run } /\n+/ { dg-options \"-O2 -fpic\" } /\n+\n+extern void exit (int);\n+extern void abort (void);\n+\n+int b;\n+\n+struct A\n+{\n+ void pad[147];\n+ void ra, h;\n+ long o;\n+};\n+\n+void\n+__attribute__((noinline))\n+foo (struct A a, void x)\n+{\n+ __builtin_memset (a, 0, sizeof (a));\n+ if (!b)\n+ exit (0);\n+}\n+\n+void\n+__attribute__((noinline))\n+bar (void)\n+{\n+ struct A a;\n+\n+ __builtin_unwind_init ();\n+ foo (&a, __builtin_return_address (0));\n+}\n+\n+int\n+main (void)\n+{\n+ bar ();\n+ abort ();\n+ return 0;\n+}" } ]	{ "id": "gcc5-testresults-4931-gcc41-ppc32-retaddr.patch", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 65, "patch_files_count": 2, "total_tokens_est": 1249, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- libcpp/init.c\n- gcc/intl.c\n- libcpp/system.h\n\n## Upstream Fix\n```diff\n#! /bin/sh -e\n\n# DP: Set gettext's domain and textdomain to the versioned package name.\n\ndir=\nif [ $# -eq 3 -a \"$2\" = '-d' ]; then\n pdir=\"-d $3\"\n dir=\"$3/\"\nelif [ $# -ne 1 ]; then\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nfi\ncase \"$1\" in\n -patch)\n patch $pdir -f --no-backup-if-mismatch -p0 < $0\n ;;\n -unpatch)\n patch $pdir -f --no-backup-if-mismatch -R -p0 < $0\n ;;\n )\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nesac\nexit 0\n\n\nIndex: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2013-11-26 16:46:03.000000000 +0100\n+++ gcc/Makefile.in\t2013-11-26 16:46:43.271816000 +0100\n@@ -3795,8 +3795,8 @@ install-po:\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n \t echo $(mkinstalldirs) $(DESTDIR)$$dir; \\\n \t $(mkinstalldirs) $(DESTDIR)$$dir \|\| exit 1; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n \tdone\n \n # Rule for regenerating the message template (gcc.pot).\nIndex: gcc/intl.c\n===================================================================\n--- gcc/intl.c.orig\t2013-11-26 15:42:31.000000000 +0100\n+++ gcc/intl.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -55,8 +55,8 @@ gcc_init_libintl (void)\n setlocale (LC_ALL, \"\");\n #endif\n \n- (void) bindtextdomain (\"gcc\", LOCALEDIR);\n- (void) textdomain (\"gcc\");\n+ (void) bindtextdomain (\"gcc-5\", LOCALEDIR);\n+ (void) textdomain (\"gcc-5\");\n \n / Opening quotation mark. /\n open_quote = _(\"`\");\nIndex: libcpp/Makefile.in\n===================================================================\n--- libcpp/Makefile.in.orig\t2013-11-26 16:26:56.000000000 +0100\n+++ libcpp/Makefile.in\t2013-11-26 16:47:15.764193260 +0100\n@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@\n LIBICONV = @LIBICONV@\n LIBINTL = @LIBINTL@\n PACKAGE = @PACKAGE@\n+PACKAGE_SUFFIX = -5\n RANLIB = @RANLIB@\n SHELL = @SHELL@\n USED_CATALOGS = @USED_CATALOGS@\n@@ -74,8 +75,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/.\n \t-I$(srcdir)/include\n \n ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG)\n+ALL_CFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \\\n \t$(CPPFLAGS) $(PICFLAG)\n+ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n \n # The name of the compiler to use.\n COMPILER = $(CXX)\n@@ -164,8 +167,8 @@ install-strip install: all installdirs\n \t else continue; \\\n \t fi; \\\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n \tdone\n \n mostlyclean:\nIndex: libcpp/system.h\n===================================================================\n--- libcpp/system.h.orig\t2013-01-15 10:49:52.000000000 +0100\n+++ libcpp/system.h\t2013-11-26 16:46:43.271816000 +0100\n@@ -280,7 +280,7 @@ extern int errno;\n #endif\n \n #ifndef _\n-# define _(msgid) dgettext (PACKAGE, msgid)\n+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)\n #endif\n \n #ifndef N_\nIndex: libcpp/init.c\n===================================================================\n--- libcpp/init.c.orig\t2013-11-26 15:42:40.000000000 +0100\n+++ libcpp/init.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -152,7 +152,7 @@ init_library (void)\n init_trigraph_map ();\n \n #ifdef ENABLE_NLS\n- (void) bindtextdomain (PACKAGE, LOCALEDIR);\n+ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);\n #endif\n }\n }\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "#! /bin/sh -e\n\n# DP: Set gettext's domain and textdomain to the versioned package name.\n\ndir=\nif [ $# -eq 3 -a \"$2\" = '-d' ]; then\n pdir=\"-d $3\"\n dir=\"$3/\"\nelif [ $# -ne 1 ]; then\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nfi\ncase \"$1\" in\n -patch)\n patch $pdir -f --no-backup-if-mismatch -p0 < $0\n ;;\n -unpatch)\n patch $pdir -f --no-backup-if-mismatch -R -p0 < $0\n ;;\n )\n echo >&2 \"`basename $0`: script expects -patch\|-unpatch as argument\"\n exit 1\nesac\nexit 0\n\n\nIndex: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2013-11-26 16:46:03.000000000 +0100\n+++ gcc/Makefile.in\t2013-11-26 16:46:43.271816000 +0100\n@@ -3795,8 +3795,8 @@ install-po:\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n \t echo $(mkinstalldirs) $(DESTDIR)$$dir; \\\n \t $(mkinstalldirs) $(DESTDIR)$$dir \|\| exit 1; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-5.mo; \\\n \tdone\n \n # Rule for regenerating the message template (gcc.pot).\nIndex: gcc/intl.c\n===================================================================\n--- gcc/intl.c.orig\t2013-11-26 15:42:31.000000000 +0100\n+++ gcc/intl.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -55,8 +55,8 @@ gcc_init_libintl (void)\n setlocale (LC_ALL, \"\");\n #endif\n \n- (void) bindtextdomain (\"gcc\", LOCALEDIR);\n- (void) textdomain (\"gcc\");\n+ (void) bindtextdomain (\"gcc-5\", LOCALEDIR);\n+ (void) textdomain (\"gcc-5\");\n \n /* Opening quotation mark. */\n open_quote = _(\"`\");\nIndex: libcpp/Makefile.in\n===================================================================\n--- libcpp/Makefile.in.orig\t2013-11-26 16:26:56.000000000 +0100\n+++ libcpp/Makefile.in\t2013-11-26 16:47:15.764193260 +0100\n@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@\n LIBICONV = @LIBICONV@\n LIBINTL = @LIBINTL@\n PACKAGE = @PACKAGE@\n+PACKAGE_SUFFIX = -5\n RANLIB = @RANLIB@\n SHELL = @SHELL@\n USED_CATALOGS = @USED_CATALOGS@\n@@ -74,8 +75,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/.\n \t-I$(srcdir)/include\n \n ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG)\n+ALL_CFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \\\n \t$(CPPFLAGS) $(PICFLAG)\n+ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\\\"$(strip $(PACKAGE_SUFFIX))\\\"\n \n # The name of the compiler to use.\n COMPILER = $(CXX)\n@@ -164,8 +167,8 @@ install-strip install: all installdirs\n \t else continue; \\\n \t fi; \\\n \t dir=$(localedir)/$$lang/LC_MESSAGES; \\\n-\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n-\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \\\n+\t echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n+\t $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \\\n \tdone\n \n mostlyclean:\nIndex: libcpp/system.h\n===================================================================\n--- libcpp/system.h.orig\t2013-01-15 10:49:52.000000000 +0100\n+++ libcpp/system.h\t2013-11-26 16:46:43.271816000 +0100\n@@ -280,7 +280,7 @@ extern int errno;\n #endif\n \n #ifndef _\n-# define _(msgid) dgettext (PACKAGE, msgid)\n+# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)\n #endif\n \n #ifndef N_\nIndex: libcpp/init.c\n===================================================================\n--- libcpp/init.c.orig\t2013-11-26 15:42:40.000000000 +0100\n+++ libcpp/init.c\t2013-11-26 16:46:43.271816000 +0100\n@@ -152,7 +152,7 @@ init_library (void)\n init_trigraph_map ();\n \n #ifdef ENABLE_NLS\n- (void) bindtextdomain (PACKAGE, LOCALEDIR);\n+ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);\n #endif\n }\n }" } ]	{ "id": "gcc5-testresults-4931-gcc44-textdomain.patch", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 19, "patch_files_count": 5, "total_tokens_est": 2104, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- gcc/cppbuiltin.c\n\n## Upstream Fix\n```diff\nIndex: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2015-05-08 17:10:12.068697540 +0200\n+++ gcc/Makefile.in\t2015-05-08 17:25:31.831833081 +0200\n@@ -810,12 +810,14 @@ GTM_H = tm.h $(tm_file_list) in\n TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)\n \n # Variables for version information.\n-BASEVER := $(srcdir)/BASE-VER # 4.x.y\n+BASEVER := $(srcdir)/BASE-VER # 5\n+FULLVER := $(srcdir)/FULL-VER # 5.x.y\n DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, \"\"\n DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty\n REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]\n \n BASEVER_c := $(shell cat $(BASEVER))\n+FULLVER_c := $(shell cat $(FULLVER))\n DEVPHASE_c := $(shell cat $(DEVPHASE))\n DATESTAMP_c := $(shell cat $(DATESTAMP))\n \n@@ -839,6 +841,7 @@ PATCHLEVEL_c := \\\n # immediately after the comma in the $(if ...) constructs is\n # significant - do not remove it.\n BASEVER_s := \"\\\"$(BASEVER_c)\\\"\"\n+FULLVER_s := \"\\\"$(FULLVER_c)\\\"\"\n DEVPHASE_s := \"\\\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\\\"\"\n DATESTAMP_s := \\\n \"\\\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\\\"\"\n@@ -2028,7 +2031,7 @@ s-options-h: optionlist $(srcdir)/opt-fu\n \n dumpvers: dumpvers.c\n \n-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s)\n@@ -2038,10 +2041,10 @@ version.o: $(REVISION) $(DATESTAMP) $(BA\n CFLAGS-lto-compress.o += $(ZLIBINC)\n \n bversion.h: s-bversion; @true\n-s-bversion: BASE-VER\n-\techo \"#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n-\techo \"#define BUILDING_GCC_MINOR `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n-\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n+s-bversion: FULL-VER\n+\techo \"#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n+\techo \"#define BUILDING_GCC_MINOR `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n+\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n \techo \"#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)\" >> bversion.h\n \t$(STAMP) s-bversion\n \n@@ -2410,9 +2413,9 @@ build/%.o : # dependencies provided by\n ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs\n ## several C macro definitions, just like version.o\n build/version.o: version.c version.h \\\n- $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)\n+ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)\n \t$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \\\n-\t-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+\t-DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s) -o $@ $<\n@@ -2623,8 +2626,8 @@ PREPROCESSOR_DEFINES = \\\n -DSTANDARD_EXEC_PREFIX=\\\"$(libdir)/gcc/\\\" \\\n @TARGET_SYSTEM_ROOT_DEFINE@\n \n-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)\n-cppbuiltin.o: $(BASEVER)\n+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)\n+cppbuiltin.o: $(FULLVER)\n \n CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)\n \n@@ -2640,8 +2643,8 @@ build/gcov-iov$(build_exeext): build/gco\n \t\tbuild/gcov-iov.o -o $@\n \n gcov-iov.h: s-iov\n-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)\n-\tbuild/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \\\n+s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)\n+\tbuild/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \\\n \t > tmp-gcov-iov.h\n \t$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h\n \t$(STAMP) s-iov\nIndex: libjava/testsuite/lib/libjava.exp\n===================================================================\n--- libjava/testsuite/lib/libjava.exp.orig\t2014-12-02 13:29:22.487902351 +0100\n+++ libjava/testsuite/lib/libjava.exp\t2015-05-08 17:25:31.831833081 +0200\n@@ -179,7 +179,7 @@ proc libjava_init { args } {\n \n set text [eval exec \"$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout\"]\n regexp \" version \\[^\\n\\r\\]\" $text version\n- set libjava_version [lindex $version 1]\n+ set libjava_version 5\n \n verbose \"version: $libjava_version\"\n \nIndex: gcc/cppbuiltin.c\n===================================================================\n--- gcc/cppbuiltin.c.orig\t2015-01-12 16:22:34.486893087 +0100\n+++ gcc/cppbuiltin.c\t2015-05-08 17:25:31.832833089 +0200\n@@ -46,9 +46,9 @@ parse_basever (int major, int minor, i\n static int s_major = -1, s_minor, s_patchlevel;\n \n if (s_major == -1)\n- if (sscanf (BASEVER, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n+ if (sscanf (version_string, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n {\n-\tsscanf (BASEVER, \"%d.%d\", &s_major, &s_minor);\n+\tsscanf (version_string, \"%d.%d\", &s_major, &s_minor);\n \ts_patchlevel = 0;\n }\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: gcc/Makefile.in\n===================================================================\n--- gcc/Makefile.in.orig\t2015-05-08 17:10:12.068697540 +0200\n+++ gcc/Makefile.in\t2015-05-08 17:25:31.831833081 +0200\n@@ -810,12 +810,14 @@ GTM_H = tm.h $(tm_file_list) in\n TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)\n \n # Variables for version information.\n-BASEVER := $(srcdir)/BASE-VER # 4.x.y\n+BASEVER := $(srcdir)/BASE-VER # 5\n+FULLVER := $(srcdir)/FULL-VER # 5.x.y\n DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, \"\"\n DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty\n REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]\n \n BASEVER_c := $(shell cat $(BASEVER))\n+FULLVER_c := $(shell cat $(FULLVER))\n DEVPHASE_c := $(shell cat $(DEVPHASE))\n DATESTAMP_c := $(shell cat $(DATESTAMP))\n \n@@ -839,6 +841,7 @@ PATCHLEVEL_c := \\\n # immediately after the comma in the $(if ...) constructs is\n # significant - do not remove it.\n BASEVER_s := \"\\\"$(BASEVER_c)\\\"\"\n+FULLVER_s := \"\\\"$(FULLVER_c)\\\"\"\n DEVPHASE_s := \"\\\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\\\"\"\n DATESTAMP_s := \\\n \"\\\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\\\"\"\n@@ -2028,7 +2031,7 @@ s-options-h: optionlist $(srcdir)/opt-fu\n \n dumpvers: dumpvers.c\n \n-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s)\n@@ -2038,10 +2041,10 @@ version.o: $(REVISION) $(DATESTAMP) $(BA\n CFLAGS-lto-compress.o += $(ZLIBINC)\n \n bversion.h: s-bversion; @true\n-s-bversion: BASE-VER\n-\techo \"#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n-\techo \"#define BUILDING_GCC_MINOR `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n-\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n+s-bversion: FULL-VER\n+\techo \"#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) \| sed -e 's/^\$[0-9]\$.$$/\\1/'`\" > bversion.h\n+\techo \"#define BUILDING_GCC_MINOR `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.\$[0-9]\$.$$/\\1/'`\" >> bversion.h\n+\techo \"#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) \| sed -e 's/^[0-9]\\.[0-9]\\.\$[0-9]\$$$/\\1/'`\" >> bversion.h\n \techo \"#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR 1000 + BUILDING_GCC_MINOR)\" >> bversion.h\n \t$(STAMP) s-bversion\n \n@@ -2410,9 +2413,9 @@ build/%.o : # dependencies provided by\n ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs\n ## several C macro definitions, just like version.o\n build/version.o: version.c version.h \\\n- $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)\n+ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)\n \t$(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \\\n-\t-DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n+\t-DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \\\n \t-DREVISION=$(REVISION_s) \\\n \t-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \\\n \t-DBUGURL=$(BUGURL_s) -o $@ $<\n@@ -2623,8 +2626,8 @@ PREPROCESSOR_DEFINES = \\\n -DSTANDARD_EXEC_PREFIX=\\\"$(libdir)/gcc/\\\" \\\n @TARGET_SYSTEM_ROOT_DEFINE@\n \n-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s)\n-cppbuiltin.o: $(BASEVER)\n+CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s)\n+cppbuiltin.o: $(FULLVER)\n \n CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)\n \n@@ -2640,8 +2643,8 @@ build/gcov-iov$(build_exeext): build/gco\n \t\tbuild/gcov-iov.o -o $@\n \n gcov-iov.h: s-iov\n-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE)\n-\tbuild/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \\\n+s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE)\n+\tbuild/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \\\n \t > tmp-gcov-iov.h\n \t$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h\n \t$(STAMP) s-iov\nIndex: libjava/testsuite/lib/libjava.exp\n===================================================================\n--- libjava/testsuite/lib/libjava.exp.orig\t2014-12-02 13:29:22.487902351 +0100\n+++ libjava/testsuite/lib/libjava.exp\t2015-05-08 17:25:31.831833081 +0200\n@@ -179,7 +179,7 @@ proc libjava_init { args } {\n \n set text [eval exec \"$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout\"]\n regexp \" version \\[^\\n\\r\\]\" $text version\n- set libjava_version [lindex $version 1]\n+ set libjava_version 5\n \n verbose \"version: $libjava_version\"\n \nIndex: gcc/cppbuiltin.c\n===================================================================\n--- gcc/cppbuiltin.c.orig\t2015-01-12 16:22:34.486893087 +0100\n+++ gcc/cppbuiltin.c\t2015-05-08 17:25:31.832833089 +0200\n@@ -46,9 +46,9 @@ parse_basever (int major, int *minor, i\n static int s_major = -1, s_minor, s_patchlevel;\n \n if (s_major == -1)\n- if (sscanf (BASEVER, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n+ if (sscanf (version_string, \"%d.%d.%d\", &s_major, &s_minor, &s_patchlevel) != 3)\n {\n-\tsscanf (BASEVER, \"%d.%d\", &s_major, &s_minor);\n+\tsscanf (version_string, \"%d.%d\", &s_major, &s_minor);\n \ts_patchlevel = 0;\n }" } ]	{ "id": "gcc5-testresults-4931-gcc-dir-version.patch", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 33, "patch_files_count": 3, "total_tokens_est": 2788, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- gcc/c/c-typeck.c\n- gcc/testsuite/gcc.dg/cleanup-1.c\n\n## Upstream Fix\n```diff\nIndex: gcc/c-family/c.opt\n===================================================================\n--- gcc/c-family/c.opt.orig\t2014-11-11 09:38:31.286867405 +0100\n+++ gcc/c-family/c.opt\t2014-11-17 16:38:44.438078729 +0100\n@@ -868,6 +868,10 @@ Wunused-local-typedefs\n C ObjC C++ ObjC++ Var(warn_unused_local_typedefs) Warning EnabledBy(Wunused)\n Warn when typedefs locally defined in a function are not used\n \n+Wunprototyped-calls\n+C Var(warn_unprototyped_calls) Warning LangEnabledBy(C,Wall)\n+Warn about calls to unprototyped functions with at least one argument\n+\n Wunused-macros\n C ObjC C++ ObjC++ CppReason(CPP_W_UNUSED_MACROS) Var(cpp_warn_unused_macros) Warning\n Warn about macros defined in the main file that are not used\nIndex: gcc/c/c-typeck.c\n===================================================================\n--- gcc/c/c-typeck.c.orig\t2014-11-11 09:38:32.068867371 +0100\n+++ gcc/c/c-typeck.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -2957,6 +2957,19 @@ build_function_call_vec (location_t loc,\n && !check_builtin_function_arguments (fundecl, nargs, argarray))\n return error_mark_node;\n \n+ /* If we cannot check function arguments because a prototype is\n+ missing for the callee, warn here. /\n+ if (warn_unprototyped_calls\n+ && nargs > 0 && !TYPE_ARG_TYPES (fntype)\n+ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl)\n+ && !DECL_ARGUMENTS (fundecl))\n+ {\n+ if (warning (OPT_Wunprototyped_calls,\n+\t\t \"call to function %qD without a real prototype\", fundecl))\n+\tinform (DECL_SOURCE_LOCATION (fundecl), \"%qD was declared here\",\n+\t\tfundecl);\n+ }\n+\n / Check that the arguments to the function are valid. /\n check_function_arguments (fntype, nargs, argarray);\n \nIndex: gcc/testsuite/gcc.dg/cleanup-1.c\n===================================================================\n--- gcc/testsuite/gcc.dg/cleanup-1.c.orig\t2010-02-23 12:43:21.000000000 +0100\n+++ gcc/testsuite/gcc.dg/cleanup-1.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -6,7 +6,7 @@\n #define C(x)\t__attribute__((cleanup(x)))\n \n static int f1(void x U) { return 0; }\n-static void f2() { }\n+static void f2() { } /* { dg-message \"declared here\" \"\" } /\n static void f3(void) { } / { dg-message \"note: declared here\" } /\n static void f4(void x U) { }\n static void f5(int x U) { }\n@@ -18,7 +18,7 @@ static void f9(int x U) { } / { dg-mess\n void test(void)\n {\n int o1 C(f1);\n- int o2 C(f2);\n+ int o2 C(f2);\t\t/* { dg-warning \"without a real prototype\" } /\n int o3 C(f3);\t\t/ { dg-error \"too many arguments\" } /\n int o4 C(f4);\n int o5 C(f5);\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: gcc/c-family/c.opt\n===================================================================\n--- gcc/c-family/c.opt.orig\t2014-11-11 09:38:31.286867405 +0100\n+++ gcc/c-family/c.opt\t2014-11-17 16:38:44.438078729 +0100\n@@ -868,6 +868,10 @@ Wunused-local-typedefs\n C ObjC C++ ObjC++ Var(warn_unused_local_typedefs) Warning EnabledBy(Wunused)\n Warn when typedefs locally defined in a function are not used\n \n+Wunprototyped-calls\n+C Var(warn_unprototyped_calls) Warning LangEnabledBy(C,Wall)\n+Warn about calls to unprototyped functions with at least one argument\n+\n Wunused-macros\n C ObjC C++ ObjC++ CppReason(CPP_W_UNUSED_MACROS) Var(cpp_warn_unused_macros) Warning\n Warn about macros defined in the main file that are not used\nIndex: gcc/c/c-typeck.c\n===================================================================\n--- gcc/c/c-typeck.c.orig\t2014-11-11 09:38:32.068867371 +0100\n+++ gcc/c/c-typeck.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -2957,6 +2957,19 @@ build_function_call_vec (location_t loc,\n && !check_builtin_function_arguments (fundecl, nargs, argarray))\n return error_mark_node;\n \n+ / If we cannot check function arguments because a prototype is\n+ missing for the callee, warn here. /\n+ if (warn_unprototyped_calls\n+ && nargs > 0 && !TYPE_ARG_TYPES (fntype)\n+ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl)\n+ && !DECL_ARGUMENTS (fundecl))\n+ {\n+ if (warning (OPT_Wunprototyped_calls,\n+\t\t \"call to function %qD without a real prototype\", fundecl))\n+\tinform (DECL_SOURCE_LOCATION (fundecl), \"%qD was declared here\",\n+\t\tfundecl);\n+ }\n+\n / Check that the arguments to the function are valid. /\n check_function_arguments (fntype, nargs, argarray);\n \nIndex: gcc/testsuite/gcc.dg/cleanup-1.c\n===================================================================\n--- gcc/testsuite/gcc.dg/cleanup-1.c.orig\t2010-02-23 12:43:21.000000000 +0100\n+++ gcc/testsuite/gcc.dg/cleanup-1.c\t2014-11-17 16:38:44.442078729 +0100\n@@ -6,7 +6,7 @@\n #define C(x)\t__attribute__((cleanup(x)))\n \n static int f1(void x U) { return 0; }\n-static void f2() { }\n+static void f2() { } /* { dg-message \"declared here\" \"\" } /\n static void f3(void) { } / { dg-message \"note: declared here\" } /\n static void f4(void x U) { }\n static void f5(int x U) { }\n@@ -18,7 +18,7 @@ static void f9(int x U) { } / { dg-mess\n void test(void)\n {\n int o1 C(f1);\n- int o2 C(f2);\n+ int o2 C(f2);\t\t/* { dg-warning \"without a real prototype\" } /\n int o3 C(f3);\t\t/ { dg-error \"too many arguments\" } */\n int o4 C(f4);\n int o5 C(f5);" } ]	{ "id": "gcc5-testresults-4931-Wunprototyped-calls.diff", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 21, "patch_files_count": 3, "total_tokens_est": 1477, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- libsanitizer/sanitizer_common/sanitizer_platform.h\n- libsanitizer/asan/asan_allocator.h\n\n## Upstream Fix\n```diff\n2015-01-22 Jakub Jelinek <jakub@redhat.com>\n\n\t* asan/asan_allocator.h (kAllocatorSpace, kAllocatorSize):\n\tSet to 1T for __aarch64__.\n\t* sanitizer_common/sanitizer_platform.h\n\t(SANITIZER_CAN_USE_ALLOCATOR64): Set to 1 on __aarch64__\n\tif SANITIZER_WORDSIZE is 64.\n\t(SANITIZER_MMAP_RANGE_SIZE): Define to 1ULL << 42 for\n\t__aarch64__.\n\n--- libsanitizer/asan/asan_allocator.h\t(revision 219833)\n+++ libsanitizer/asan/asan_allocator.h\t(working copy)\n@@ -100,6 +100,10 @@\n # if defined(__powerpc64__)\n const uptr kAllocatorSpace = 0xa0000000000ULL;\n const uptr kAllocatorSize = 0x20000000000ULL; // 2T.\n+# elif defined(__aarch64__)\n+// Valid only for 42-bit VA\n+const uptr kAllocatorSpace = 0x10000000000ULL;\n+const uptr kAllocatorSize = 0x10000000000ULL; // 1T.\n # else\n const uptr kAllocatorSpace = 0x600000000000ULL;\n const uptr kAllocatorSize = 0x40000000000ULL; // 4T.\n--- libsanitizer/sanitizer_common/sanitizer_platform.h\t(revision 219833)\n+++ libsanitizer/sanitizer_common/sanitizer_platform.h\t(working copy)\n@@ -79,7 +79,7 @@\n // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or\n // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.\n #ifndef SANITIZER_CAN_USE_ALLOCATOR64\n-# if defined(__aarch64__) \|\| defined(__mips64)\n+# if defined(__mips64)\n # define SANITIZER_CAN_USE_ALLOCATOR64 0\n # else\n # define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)\n@@ -88,10 +88,10 @@\n \n // The range of addresses which can be returned my mmap.\n // FIXME: this value should be different on different platforms,\n-// e.g. on AArch64 it is most likely (1ULL << 39). Larger values will still work\n+// e.g. on AArch64 it is most likely (1ULL << 42). Larger values will still work\n // but will consume more memory for TwoLevelByteMap.\n #if defined(__aarch64__)\n-# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 39)\n+# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 42)\n #else\n # define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 47)\n #endif\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "2015-01-22 Jakub Jelinek <jakub@redhat.com>\n\n\t* asan/asan_allocator.h (kAllocatorSpace, kAllocatorSize):\n\tSet to 1T for __aarch64__.\n\t* sanitizer_common/sanitizer_platform.h\n\t(SANITIZER_CAN_USE_ALLOCATOR64): Set to 1 on __aarch64__\n\tif SANITIZER_WORDSIZE is 64.\n\t(SANITIZER_MMAP_RANGE_SIZE): Define to 1ULL << 42 for\n\t__aarch64__.\n\n--- libsanitizer/asan/asan_allocator.h\t(revision 219833)\n+++ libsanitizer/asan/asan_allocator.h\t(working copy)\n@@ -100,6 +100,10 @@\n # if defined(__powerpc64__)\n const uptr kAllocatorSpace = 0xa0000000000ULL;\n const uptr kAllocatorSize = 0x20000000000ULL; // 2T.\n+# elif defined(__aarch64__)\n+// Valid only for 42-bit VA\n+const uptr kAllocatorSpace = 0x10000000000ULL;\n+const uptr kAllocatorSize = 0x10000000000ULL; // 1T.\n # else\n const uptr kAllocatorSpace = 0x600000000000ULL;\n const uptr kAllocatorSize = 0x40000000000ULL; // 4T.\n--- libsanitizer/sanitizer_common/sanitizer_platform.h\t(revision 219833)\n+++ libsanitizer/sanitizer_common/sanitizer_platform.h\t(working copy)\n@@ -79,7 +79,7 @@\n // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or\n // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.\n #ifndef SANITIZER_CAN_USE_ALLOCATOR64\n-# if defined(__aarch64__) \|\| defined(__mips64)\n+# if defined(__mips64)\n # define SANITIZER_CAN_USE_ALLOCATOR64 0\n # else\n # define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)\n@@ -88,10 +88,10 @@\n \n // The range of addresses which can be returned my mmap.\n // FIXME: this value should be different on different platforms,\n-// e.g. on AArch64 it is most likely (1ULL << 39). Larger values will still work\n+// e.g. on AArch64 it is most likely (1ULL << 42). Larger values will still work\n // but will consume more memory for TwoLevelByteMap.\n #if defined(__aarch64__)\n-# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 39)\n+# define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 42)\n #else\n # define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 47)\n #endif" } ]	{ "id": "gcc5-testresults-4931-gcc5-libsanitize-aarch64-va42.", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 10, "patch_files_count": 0, "total_tokens_est": 1227, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- libffi/src/aarch64/ffitarget.h\n\n## Upstream Fix\n```diff\nIndex: libffi/src/aarch64/ffitarget.h\n===================================================================\n--- libffi/src/aarch64/ffitarget.h\t(revision 233963)\n+++ libffi/src/aarch64/ffitarget.h\t(working copy)\n@@ -52,8 +52,8 @@ typedef enum ffi_abi\n #define FFI_TRAMPOLINE_SIZE 20\n #define FFI_TRAMPOLINE_CLOSURE_OFFSET 16\n #else\n-#define FFI_TRAMPOLINE_SIZE 24\n-#define FFI_TRAMPOLINE_CLOSURE_OFFSET FFI_TRAMPOLINE_SIZE\n+#define FFI_TRAMPOLINE_SIZE 36\n+#define FFI_TRAMPOLINE_CLOSURE_OFFSET 40\n #endif\n #define FFI_NATIVE_RAW_API 0\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: libffi/src/aarch64/ffitarget.h\n===================================================================\n--- libffi/src/aarch64/ffitarget.h\t(revision 233963)\n+++ libffi/src/aarch64/ffitarget.h\t(working copy)\n@@ -52,8 +52,8 @@ typedef enum ffi_abi\n #define FFI_TRAMPOLINE_SIZE 20\n #define FFI_TRAMPOLINE_CLOSURE_OFFSET 16\n #else\n-#define FFI_TRAMPOLINE_SIZE 24\n-#define FFI_TRAMPOLINE_CLOSURE_OFFSET FFI_TRAMPOLINE_SIZE\n+#define FFI_TRAMPOLINE_SIZE 36\n+#define FFI_TRAMPOLINE_CLOSURE_OFFSET 40\n #endif\n #define FFI_NATIVE_RAW_API 0" } ]	{ "id": "gcc5-testresults-4931-gcc5-aarch64-libffi.patch", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 4, "patch_files_count": 1, "total_tokens_est": 450, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- gcc/gcc.c\n\n## Upstream Fix\n```diff\nIndex: gcc/gcc.c\n===================================================================\n--- gcc/gcc.c.orig\t2013-11-26 15:41:59.000000000 +0100\n+++ gcc/gcc.c\t2013-11-26 16:40:35.780548125 +0100\n@@ -258,6 +258,7 @@ static const char replace_outfile_spec_\n static const char remove_outfile_spec_function (int, const char *);\n static const char version_compare_spec_function (int, const char *);\n static const char include_spec_function (int, const char *);\n+static const char include_noerr_spec_function (int, const char *);\n static const char find_file_spec_function (int, const char *);\n static const char find_plugindir_spec_function (int, const char *);\n static const char print_asm_header_spec_function (int, const char );\n@@ -1357,6 +1358,7 @@ static const struct spec_function static\n { \"remove-outfile\",\t\tremove_outfile_spec_function },\n { \"version-compare\",\t\tversion_compare_spec_function },\n { \"include\",\t\t\tinclude_spec_function },\n+ { \"include_noerr\", include_noerr_spec_function },\n { \"find-file\",\t\tfind_file_spec_function },\n { \"find-plugindir\",\t\tfind_plugindir_spec_function },\n { \"print-asm-header\",\t\tprint_asm_header_spec_function },\n@@ -6480,6 +6482,8 @@ main (int argc, char argv)\n if (access (specs_file, R_OK) == 0)\n read_specs (specs_file, true, false);\n \n+ do_self_spec (\"%:include_noerr(defaults.spec)%(default_spec)\");\n+\n /* Process any configure-time defaults specified for the command line\n options, via OPTION_DEFAULT_SPECS. /\n for (i = 0; i < ARRAY_SIZE (option_default_specs); i++)\n@@ -8401,6 +8405,21 @@ get_random_number (void)\n return ret ^ getpid ();\n }\n \n+static const char \n+include_noerr_spec_function (int argc, const char *argv)\n+{\n+ char file;\n+\n+ if (argc != 1)\n+ abort ();\n+\n+ file = find_a_file (&startfile_prefixes, argv[0], R_OK, 0);\n+ if (file)\n+ read_specs (file, FALSE, TRUE);\n+\n+ return NULL;\n+}\n+\n /* %:compare-debug-dump-opt spec function. Save the last argument,\n expected to be the last -fdump-final-insns option, or generate a\n temporary. /\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: gcc/gcc.c\n===================================================================\n--- gcc/gcc.c.orig\t2013-11-26 15:41:59.000000000 +0100\n+++ gcc/gcc.c\t2013-11-26 16:40:35.780548125 +0100\n@@ -258,6 +258,7 @@ static const char replace_outfile_spec_\n static const char remove_outfile_spec_function (int, const char );\n static const char version_compare_spec_function (int, const char *);\n static const char include_spec_function (int, const char *);\n+static const char include_noerr_spec_function (int, const char *);\n static const char find_file_spec_function (int, const char *);\n static const char find_plugindir_spec_function (int, const char *);\n static const char print_asm_header_spec_function (int, const char );\n@@ -1357,6 +1358,7 @@ static const struct spec_function static\n { \"remove-outfile\",\t\tremove_outfile_spec_function },\n { \"version-compare\",\t\tversion_compare_spec_function },\n { \"include\",\t\t\tinclude_spec_function },\n+ { \"include_noerr\", include_noerr_spec_function },\n { \"find-file\",\t\tfind_file_spec_function },\n { \"find-plugindir\",\t\tfind_plugindir_spec_function },\n { \"print-asm-header\",\t\tprint_asm_header_spec_function },\n@@ -6480,6 +6482,8 @@ main (int argc, char argv)\n if (access (specs_file, R_OK) == 0)\n read_specs (specs_file, true, false);\n \n+ do_self_spec (\"%:include_noerr(defaults.spec)%(default_spec)\");\n+\n /* Process any configure-time defaults specified for the command line\n options, via OPTION_DEFAULT_SPECS. /\n for (i = 0; i < ARRAY_SIZE (option_default_specs); i++)\n@@ -8401,6 +8405,21 @@ get_random_number (void)\n return ret ^ getpid ();\n }\n \n+static const char \n+include_noerr_spec_function (int argc, const char *argv)\n+{\n+ char file;\n+\n+ if (argc != 1)\n+ abort ();\n+\n+ file = find_a_file (&startfile_prefixes, argv[0], R_OK, 0);\n+ if (file)\n+ read_specs (file, FALSE, TRUE);\n+\n+ return NULL;\n+}\n+\n /* %:compare-debug-dump-opt spec function. Save the last argument,\n expected to be the last -fdump-final-insns option, or generate a\n temporary. */" } ]	{ "id": "gcc5-testresults-4931-gcc-add-defaultsspec.diff", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 19, "patch_files_count": 1, "total_tokens_est": 1215, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2015-5276\n\nThe std::random_device class in libstdc++ in the GNU Compiler Collection (aka GCC) before 4.9.4 does not properly handle short reads from blocking sources, which makes it easier for context-dependent attackers to predict the random values via unspecified vectors.\n\n## Package\ngcc5-testresults\n\n## Files to modify\n- gcc/fortran/simplify.c\n- gcc/ubsan.c\n\n## Upstream Fix\n```diff\nIndex: configure.ac\n===================================================================\n--- configure.ac\t(revision 216911)\n+++ configure.ac\t(working copy)\n@@ -1454,7 +1454,7 @@ if test -d ${srcdir}/gcc && test \"x$have\n AC_MSG_CHECKING([for the correct version of mpfr.h])\n AC_TRY_COMPILE([#include <gmp.h>\n #include <mpfr.h>],[\n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n ], [AC_TRY_COMPILE([#include <gmp.h>\nIndex: configure\n===================================================================\n--- configure\t(revision 216911)\n+++ configure\t(working copy)\n@@ -5524,7 +5524,7 @@ int\n main ()\n {\n \n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n \nIndex: gcc/fortran/simplify.c\n===================================================================\n--- gcc/fortran/simplify.c\t(revision 216911)\n+++ gcc/fortran/simplify.c\t(working copy)\n@@ -4278,10 +4278,7 @@ gfc_simplify_mod (gfc_expr a, gfc_expr\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_mod(): Bad arguments\");\n@@ -4327,19 +4324,7 @@ gfc_simplify_modulo (gfc_expr a, gfc_ex\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tif (mpfr_cmp_ui (result->value.real, 0) != 0)\n-\t {\n-\t if (mpfr_signbit (a->value.real) != mpfr_signbit (p->value.real))\n-\t mpfr_add (result->value.real, result->value.real, p->value.real,\n-\t\t\tGFC_RND_MODE);\n-\t }\n-\telse\n-\t mpfr_copysign (result->value.real, result->value.real,\n-\t\t\t p->value.real, GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_modulo(): Bad arguments\");\nIndex: gcc/ubsan.c\n===================================================================\n--- gcc/ubsan.c.orig\t2015-06-01 14:52:11.717105684 +0200\n+++ gcc/ubsan.c\t2015-06-01 14:52:26.945253071 +0200\n@@ -1564,40 +1564,6 @@\n \t min = build_real (expr_type, minval2);\n \t}\n }\n- else if (REAL_MODE_FORMAT (mode)->b == 10)\n- {\n- /* For _Decimal128 up to 34 decimal digits, - sign,\n-\t dot, e, exponent. /\n- char buf[64];\n- mpfr_t m;\n- int p = REAL_MODE_FORMAT (mode)->p;\n- REAL_VALUE_TYPE maxval, minval;\n-\n- / Use mpfr_snprintf rounding to compute the smallest\n-\t representable decimal number greater or equal than\n-\t 1 << (prec - !uns_p). /\n- mpfr_init2 (m, prec + 2);\n- mpfr_set_ui_2exp (m, 1, prec - !uns_p, GMP_RNDN);\n- mpfr_snprintf (buf, sizeof buf, \"%.RUe\", p - 1, m);\n- decimal_real_from_string (&maxval, buf);\n- max = build_real (expr_type, maxval);\n-\n- /* For unsigned, assume -1.0 is always representable. /\n- if (uns_p)\n-\tmin = build_minus_one_cst (expr_type);\n- else\n-\t{\n-\t / Use mpfr_snprintf rounding to compute the largest\n-\t representable decimal number less or equal than\n-\t (-1 << (prec - 1)) - 1. /\n-\t mpfr_set_si_2exp (m, -1, prec - 1, GMP_RNDN);\n-\t mpfr_sub_ui (m, m, 1, GMP_RNDN);\n-\t mpfr_snprintf (buf, sizeof buf, \"%.RDe\", p - 1, m);\n-\t decimal_real_from_string (&minval, buf);\n-\t min = build_real (expr_type, minval);\n-\t}\n- mpfr_clear (m);\n- }\n else\n return NULL_TREE;\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: configure.ac\n===================================================================\n--- configure.ac\t(revision 216911)\n+++ configure.ac\t(working copy)\n@@ -1454,7 +1454,7 @@ if test -d ${srcdir}/gcc && test \"x$have\n AC_MSG_CHECKING([for the correct version of mpfr.h])\n AC_TRY_COMPILE([#include <gmp.h>\n #include <mpfr.h>],[\n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n ], [AC_TRY_COMPILE([#include <gmp.h>\nIndex: configure\n===================================================================\n--- configure\t(revision 216911)\n+++ configure\t(working copy)\n@@ -5524,7 +5524,7 @@ int\n main ()\n {\n \n- #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0)\n+ #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)\n choke me\n #endif\n \nIndex: gcc/fortran/simplify.c\n===================================================================\n--- gcc/fortran/simplify.c\t(revision 216911)\n+++ gcc/fortran/simplify.c\t(working copy)\n@@ -4278,10 +4278,7 @@ gfc_simplify_mod (gfc_expr a, gfc_expr\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_mod(): Bad arguments\");\n@@ -4327,19 +4324,7 @@ gfc_simplify_modulo (gfc_expr a, gfc_ex\n \t return &gfc_bad_expr;\n \t }\n \n-\tgfc_set_model_kind (kind);\n-\tmpfr_fmod (result->value.real, a->value.real, p->value.real,\n-\t\t GFC_RND_MODE);\n-\tif (mpfr_cmp_ui (result->value.real, 0) != 0)\n-\t {\n-\t if (mpfr_signbit (a->value.real) != mpfr_signbit (p->value.real))\n-\t mpfr_add (result->value.real, result->value.real, p->value.real,\n-\t\t\tGFC_RND_MODE);\n-\t }\n-\telse\n-\t mpfr_copysign (result->value.real, result->value.real,\n-\t\t\t p->value.real, GFC_RND_MODE);\n-\tbreak;\n+\treturn NULL;\n \n default:\n \tgfc_internal_error (\"gfc_simplify_modulo(): Bad arguments\");\nIndex: gcc/ubsan.c\n===================================================================\n--- gcc/ubsan.c.orig\t2015-06-01 14:52:11.717105684 +0200\n+++ gcc/ubsan.c\t2015-06-01 14:52:26.945253071 +0200\n@@ -1564,40 +1564,6 @@\n \t min = build_real (expr_type, minval2);\n \t}\n }\n- else if (REAL_MODE_FORMAT (mode)->b == 10)\n- {\n- /* For _Decimal128 up to 34 decimal digits, - sign,\n-\t dot, e, exponent. /\n- char buf[64];\n- mpfr_t m;\n- int p = REAL_MODE_FORMAT (mode)->p;\n- REAL_VALUE_TYPE maxval, minval;\n-\n- / Use mpfr_snprintf rounding to compute the smallest\n-\t representable decimal number greater or equal than\n-\t 1 << (prec - !uns_p). /\n- mpfr_init2 (m, prec + 2);\n- mpfr_set_ui_2exp (m, 1, prec - !uns_p, GMP_RNDN);\n- mpfr_snprintf (buf, sizeof buf, \"%.RUe\", p - 1, m);\n- decimal_real_from_string (&maxval, buf);\n- max = build_real (expr_type, maxval);\n-\n- /* For unsigned, assume -1.0 is always representable. /\n- if (uns_p)\n-\tmin = build_minus_one_cst (expr_type);\n- else\n-\t{\n-\t / Use mpfr_snprintf rounding to compute the largest\n-\t representable decimal number less or equal than\n-\t (-1 << (prec - 1)) - 1. /\n-\t mpfr_set_si_2exp (m, -1, prec - 1, GMP_RNDN);\n-\t mpfr_sub_ui (m, m, 1, GMP_RNDN);\n-\t mpfr_snprintf (buf, sizeof buf, \"%.RDe\", p - 1, m);\n-\t decimal_real_from_string (&minval, buf);\n-\t min = build_real (expr_type, minval);\n-\t}\n- mpfr_clear (m);\n- }\n else\n return NULL_TREE;" } ]	{ "id": "gcc5-testresults-4931-gcc48-remove-mpfr-2.4.0-requir", "cves": [], "package": "gcc5-testresults", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 57, "patch_files_count": 4, "total_tokens_est": 1916, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-3.0-or-later", "upstream_license": null, "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2012-6709\n\n===================================================================\n\n## Package\nelinks\n\n## Files to modify\n- config/m4/ruby.m4\n- src/scripting/ruby/core.c\n- src/scripting/ruby/core.h\n- src/scripting/ruby/hooks.c\n\n## Upstream Fix\n```diff\nIndex: elinks-0.13-20190401/config/m4/ruby.m4\n===================================================================\n--- elinks-0.13-20190401.orig/config/m4/ruby.m4\n+++ elinks-0.13-20190401/config/m4/ruby.m4\n@@ -32,36 +32,40 @@ if test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"\n \tif test \"$CONFIG_SCRIPTING_RUBY\" != \"no\"; then\n \n \t\tAC_MSG_CHECKING(Ruby version)\n-\t\tif $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= \"1.6.0\")' >/dev/null 2>/dev/null; then\n+\t\tif $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= \"1.6.0\")' >/dev/null 2>/dev/null; then\n \t\t\truby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts \"#{VERSION rescue RUBY_VERSION}\"'`\n \t\t\tAC_MSG_RESULT($ruby_version)\n \n \t\t\tAC_MSG_CHECKING(for Ruby header files)\n-\t\t\trubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[[\"archdir\"]] \|\| $hdrdir' 2>/dev/null`\n+\t\t\trubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[[\"rubyhdrdir\"]] \|\| RbConfig::CONFIG[[\"archdir\"]] \|\| $hdrdir' 2>/dev/null`\n \n \t\t\tif test \"X$rubyhdrdir\" != \"X\"; then\n \t\t\t\tAC_MSG_RESULT($rubyhdrdir)\n \t\t\t\tRUBY_CFLAGS=\"-I$rubyhdrdir\"\n-\t\t\t\trubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[[\"LIBS\"]]'`\n+\t\t\t\trubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[[\"arch\"]]'`\n+\t\t\t\tif test -d \"$rubyhdrdir/$rubyarch\"; then\n+\t\t\t\t\tRUBY_CFLAGS=\"$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch\"\n+\t\t\t\tfi\n+\t\t\t\trubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[[\"LIBS\"]]'`\n \n \t\t\t\tif test \"X$rubylibs\" != \"X\"; then\n \t\t\t\t\tRUBY_LIBS=\"$rubylibs\"\n \t\t\t\tfi\n \n-\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[[\"LIBRUBYARG\"]])'`\n+\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[[\"LIBRUBYARG\"]])'`\n \n \t\t\t\tif test -f \"$rubyhdrdir/$librubyarg\"; then\n \t\t\t\t\tlibrubyarg=\"$rubyhdrdir/$librubyarg\"\n \n \t\t\t\telse\n-\t\t\t\t\trubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[[\"libdir\"]])'`\n+\t\t\t\t\trubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[[\"libdir\"]])'`\n \t\t\t\t\tif test -f \"$rubylibdir/$librubyarg\"; then\n \t\t\t\t\t\tlibrubyarg=\"$rubylibdir/$librubyarg\"\n \t\t\t\t\telif test \"$librubyarg\" = \"libruby.a\"; then\n \t\t\t\t\t\tdnl required on Mac OS 10.3 where libruby.a doesn't exist\n \t\t\t\t\t\tlibrubyarg=\"-lruby\"\n \t\t\t\t\telse\n-\t\t\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e \"print '$librubyarg'.gsub(/-L\\./, %'-L#{Config.expand(Config::CONFIG[\\\"libdir\\\"])}')\"`\n+\t\t\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e \"print '$librubyarg'.gsub(/-L\\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\\\"libdir\\\"])}')\"`\n \t\t\t\t\tfi\n \t\t\t\tfi\n \n@@ -69,7 +73,7 @@ if test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"\n \t\t\t\t\tRUBY_LIBS=\"$librubyarg $RUBY_LIBS\"\n \t\t\t\tfi\n \n-\t\t\t\trubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[[\"LDFLAGS\"]]'`\n+\t\t\t\trubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[[\"LDFLAGS\"]]'`\n \t\t\t\tif test \"X$rubyldflags\" != \"X\"; then\n \t\t\t\t\tLDFLAGS=\"$rubyldflags $LDFLAGS\"\n \t\t\t\tfi\n@@ -86,6 +90,15 @@ if test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"\n \t\t\tAC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)\n \t\tfi\n \tfi\n+\tif test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"; then\n+\t\tAC_MSG_CHECKING([for rb_errinfo])\n+\t\tAC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo=\"yes\",have_rb_errinfo=\"no\")\n+\t\tAC_MSG_RESULT($have_rb_errinfo)\n+\t\tif test \"$have_rb_errinfo\" = \"yes\"; then\n+\t\t\tAC_DEFINE([HAVE_RB_ERRINFO], [1],\n+\t\t\t\t[Define to 1 if you have the `rb_errinfo' function.])\n+\t\tfi\n+\tfi\n fi\n \n EL_RESTORE_FLAGS\nIndex: elinks-0.13-20190401/src/scripting/ruby/core.c\n===================================================================\n--- elinks-0.13-20190401.orig/src/scripting/ruby/core.c\n+++ elinks-0.13-20190401/src/scripting/ruby/core.c\n@@ -76,10 +76,10 @@ erb_report_error(struct session ses, in\n \t\tbreak;\n \tcase TAG_RAISE:\n \tcase TAG_FATAL:\n-\t\teclass = CLASS_OF(ruby_errinfo);\n-\t\teinfo = rb_obj_as_string(ruby_errinfo);\n+\t\teclass = CLASS_OF(RB_ERRINFO);\n+\t\teinfo = rb_obj_as_string(RB_ERRINFO);\n \n-\t\tif (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {\n+\t\tif (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {\n \t\t\tmsg = \"unhandled exception\";\n \n \t\t} else {\n@@ -88,7 +88,7 @@ erb_report_error(struct session ses, in\n \n \t\t\tepath = rb_class_path(eclass);\n \t\t\tsnprintf(buff, MAX_STR_LEN, \"%s: %s\",\n-\t\t\t\tRSTRING(epath)->ptr, RSTRING(einfo)->ptr);\n+\t\t\t\tRSTRING_PTR(epath), RSTRING_PTR(einfo));\n \n \t\t\tp = strchr((const char )buff, '\\n');\n \t\t\tif (p) p = '\\0';\n@@ -116,7 +116,7 @@ erb_module_message(VALUE self, VALUE str\n \tstruct terminal term;\n \n \tstr = rb_obj_as_string(str);\n-\tmessage = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);\n+\tmessage = memacpy(RSTRING_PTR(str), RSTRING_LEN(str));\n \tif (!message) return Qnil;\n \n \tline_end = strchr((const char )message, '\\n');\n@@ -165,8 +165,8 @@ erb_stdout_p(int argc, VALUE argv, VALU\n \t\t the inspect() method, which adds quotes to the strings, so\n \t\t * gently ignore them. /\n \n-\t\tptr = RSTRING(substr)->ptr;\n-\t\tlen = RSTRING(substr)->len;\n+\t\tptr = RSTRING_PTR(substr);\n+\t\tlen = RSTRING_LEN(substr);\n \n \t\tif (ptr == '\"')\n \t\t\tptr++, len--;\nIndex: elinks-0.13-20190401/src/scripting/ruby/core.h\n===================================================================\n--- elinks-0.13-20190401.orig/src/scripting/ruby/core.h\n+++ elinks-0.13-20190401/src/scripting/ruby/core.h\n@@ -7,6 +7,20 @@ struct session;\n \n #include <ruby.h>\t/* for VALUE /\n \n+#ifndef RSTRING_LEN\n+#define RSTRING_LEN(string) (RSTRING(string)->len)\n+#endif\n+\n+#ifndef RSTRING_PTR\n+#define RSTRING_PTR(string) (RSTRING(string)->ptr)\n+#endif\n+\n+#ifdef HAVE_RB_ERRINFO\n+#define RB_ERRINFO (rb_errinfo())\n+#else\n+#define RB_ERRINFO (ruby_errinfo)\n+#endif\n+\n VALUE erb_module;\n \n void alert_ruby_error(struct session ses, unsigned char msg);\nIndex: elinks-0.13-20190401/src/scripting/ruby/hooks.c\n===================================================================\n--- elinks-0.13-20190401.orig/src/scripting/ruby/hooks.c\n+++ elinks-0.13-20190401/src/scripting/ruby/hooks.c\n@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void d\n \t{\n \t\tunsigned char new_url;\n \n-\t\tnew_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);\n+\t\tnew_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));\n \t\tif (new_url) {\n \t\t\tmem_free_set(url, new_url);\n \t\t}\n@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void\n \t{\n \t\tunsigned char new_url;\n \n-\t\tnew_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);\n+\t\tnew_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));\n \t\tif (new_url) {\n \t\t\tmem_free_set(url, new_url);\n \t\t}\n@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap,\n \tswitch (rb_type(result)) {\n \tcase T_STRING:\n \t{\n-\t\tint len = RSTRING(result)->len;\n+\t\tint len = RSTRING_LEN(result);\n \n-\t\tadd_fragment(cached, 0, RSTRING(result)->ptr, len);\n+\t\tadd_fragment(cached, 0, RSTRING_PTR(result), len);\n \t\tnormalize_cache_entry(cached, len);\n \n \t\tbreak;\n@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void \n \t{\n \t\tunsigned char proxy;\n \n-\t\tproxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);\n+\t\tproxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));\n \t\tif (proxy) {\n \t\t\tmem_free_set(new_proxy_url, proxy);\n \t\t}\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: elinks-0.13-20190401/config/m4/ruby.m4\n===================================================================\n--- elinks-0.13-20190401.orig/config/m4/ruby.m4\n+++ elinks-0.13-20190401/config/m4/ruby.m4\n@@ -32,36 +32,40 @@ if test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"\n \tif test \"$CONFIG_SCRIPTING_RUBY\" != \"no\"; then\n \n \t\tAC_MSG_CHECKING(Ruby version)\n-\t\tif $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= \"1.6.0\")' >/dev/null 2>/dev/null; then\n+\t\tif $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= \"1.6.0\")' >/dev/null 2>/dev/null; then\n \t\t\truby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts \"#{VERSION rescue RUBY_VERSION}\"'`\n \t\t\tAC_MSG_RESULT($ruby_version)\n \n \t\t\tAC_MSG_CHECKING(for Ruby header files)\n-\t\t\trubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[[\"archdir\"]] \|\| $hdrdir' 2>/dev/null`\n+\t\t\trubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[[\"rubyhdrdir\"]] \|\| RbConfig::CONFIG[[\"archdir\"]] \|\| $hdrdir' 2>/dev/null`\n \n \t\t\tif test \"X$rubyhdrdir\" != \"X\"; then\n \t\t\t\tAC_MSG_RESULT($rubyhdrdir)\n \t\t\t\tRUBY_CFLAGS=\"-I$rubyhdrdir\"\n-\t\t\t\trubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[[\"LIBS\"]]'`\n+\t\t\t\trubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[[\"arch\"]]'`\n+\t\t\t\tif test -d \"$rubyhdrdir/$rubyarch\"; then\n+\t\t\t\t\tRUBY_CFLAGS=\"$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch\"\n+\t\t\t\tfi\n+\t\t\t\trubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[[\"LIBS\"]]'`\n \n \t\t\t\tif test \"X$rubylibs\" != \"X\"; then\n \t\t\t\t\tRUBY_LIBS=\"$rubylibs\"\n \t\t\t\tfi\n \n-\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[[\"LIBRUBYARG\"]])'`\n+\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[[\"LIBRUBYARG\"]])'`\n \n \t\t\t\tif test -f \"$rubyhdrdir/$librubyarg\"; then\n \t\t\t\t\tlibrubyarg=\"$rubyhdrdir/$librubyarg\"\n \n \t\t\t\telse\n-\t\t\t\t\trubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[[\"libdir\"]])'`\n+\t\t\t\t\trubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[[\"libdir\"]])'`\n \t\t\t\t\tif test -f \"$rubylibdir/$librubyarg\"; then\n \t\t\t\t\t\tlibrubyarg=\"$rubylibdir/$librubyarg\"\n \t\t\t\t\telif test \"$librubyarg\" = \"libruby.a\"; then\n \t\t\t\t\t\tdnl required on Mac OS 10.3 where libruby.a doesn't exist\n \t\t\t\t\t\tlibrubyarg=\"-lruby\"\n \t\t\t\t\telse\n-\t\t\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e \"print '$librubyarg'.gsub(/-L\\./, %'-L#{Config.expand(Config::CONFIG[\\\"libdir\\\"])}')\"`\n+\t\t\t\t\t\tlibrubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e \"print '$librubyarg'.gsub(/-L\\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\\\"libdir\\\"])}')\"`\n \t\t\t\t\tfi\n \t\t\t\tfi\n \n@@ -69,7 +73,7 @@ if test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"\n \t\t\t\t\tRUBY_LIBS=\"$librubyarg $RUBY_LIBS\"\n \t\t\t\tfi\n \n-\t\t\t\trubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[[\"LDFLAGS\"]]'`\n+\t\t\t\trubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[[\"LDFLAGS\"]]'`\n \t\t\t\tif test \"X$rubyldflags\" != \"X\"; then\n \t\t\t\t\tLDFLAGS=\"$rubyldflags $LDFLAGS\"\n \t\t\t\tfi\n@@ -86,6 +90,15 @@ if test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"\n \t\t\tAC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)\n \t\tfi\n \tfi\n+\tif test \"$CONFIG_SCRIPTING_RUBY\" = \"yes\"; then\n+\t\tAC_MSG_CHECKING([for rb_errinfo])\n+\t\tAC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo=\"yes\",have_rb_errinfo=\"no\")\n+\t\tAC_MSG_RESULT($have_rb_errinfo)\n+\t\tif test \"$have_rb_errinfo\" = \"yes\"; then\n+\t\t\tAC_DEFINE([HAVE_RB_ERRINFO], [1],\n+\t\t\t\t[Define to 1 if you have the `rb_errinfo' function.])\n+\t\tfi\n+\tfi\n fi\n \n EL_RESTORE_FLAGS\nIndex: elinks-0.13-20190401/src/scripting/ruby/core.c\n===================================================================\n--- elinks-0.13-20190401.orig/src/scripting/ruby/core.c\n+++ elinks-0.13-20190401/src/scripting/ruby/core.c\n@@ -76,10 +76,10 @@ erb_report_error(struct session ses, in\n \t\tbreak;\n \tcase TAG_RAISE:\n \tcase TAG_FATAL:\n-\t\teclass = CLASS_OF(ruby_errinfo);\n-\t\teinfo = rb_obj_as_string(ruby_errinfo);\n+\t\teclass = CLASS_OF(RB_ERRINFO);\n+\t\teinfo = rb_obj_as_string(RB_ERRINFO);\n \n-\t\tif (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {\n+\t\tif (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {\n \t\t\tmsg = \"unhandled exception\";\n \n \t\t} else {\n@@ -88,7 +88,7 @@ erb_report_error(struct session ses, in\n \n \t\t\tepath = rb_class_path(eclass);\n \t\t\tsnprintf(buff, MAX_STR_LEN, \"%s: %s\",\n-\t\t\t\tRSTRING(epath)->ptr, RSTRING(einfo)->ptr);\n+\t\t\t\tRSTRING_PTR(epath), RSTRING_PTR(einfo));\n \n \t\t\tp = strchr((const char )buff, '\\n');\n \t\t\tif (p) p = '\\0';\n@@ -116,7 +116,7 @@ erb_module_message(VALUE self, VALUE str\n \tstruct terminal term;\n \n \tstr = rb_obj_as_string(str);\n-\tmessage = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);\n+\tmessage = memacpy(RSTRING_PTR(str), RSTRING_LEN(str));\n \tif (!message) return Qnil;\n \n \tline_end = strchr((const char )message, '\\n');\n@@ -165,8 +165,8 @@ erb_stdout_p(int argc, VALUE argv, VALU\n \t\t the inspect() method, which adds quotes to the strings, so\n \t\t * gently ignore them. /\n \n-\t\tptr = RSTRING(substr)->ptr;\n-\t\tlen = RSTRING(substr)->len;\n+\t\tptr = RSTRING_PTR(substr);\n+\t\tlen = RSTRING_LEN(substr);\n \n \t\tif (ptr == '\"')\n \t\t\tptr++, len--;\nIndex: elinks-0.13-20190401/src/scripting/ruby/core.h\n===================================================================\n--- elinks-0.13-20190401.orig/src/scripting/ruby/core.h\n+++ elinks-0.13-20190401/src/scripting/ruby/core.h\n@@ -7,6 +7,20 @@ struct session;\n \n #include <ruby.h>\t/* for VALUE /\n \n+#ifndef RSTRING_LEN\n+#define RSTRING_LEN(string) (RSTRING(string)->len)\n+#endif\n+\n+#ifndef RSTRING_PTR\n+#define RSTRING_PTR(string) (RSTRING(string)->ptr)\n+#endif\n+\n+#ifdef HAVE_RB_ERRINFO\n+#define RB_ERRINFO (rb_errinfo())\n+#else\n+#define RB_ERRINFO (ruby_errinfo)\n+#endif\n+\n VALUE erb_module;\n \n void alert_ruby_error(struct session ses, unsigned char msg);\nIndex: elinks-0.13-20190401/src/scripting/ruby/hooks.c\n===================================================================\n--- elinks-0.13-20190401.orig/src/scripting/ruby/hooks.c\n+++ elinks-0.13-20190401/src/scripting/ruby/hooks.c\n@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void d\n \t{\n \t\tunsigned char new_url;\n \n-\t\tnew_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);\n+\t\tnew_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));\n \t\tif (new_url) {\n \t\t\tmem_free_set(url, new_url);\n \t\t}\n@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void\n \t{\n \t\tunsigned char new_url;\n \n-\t\tnew_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);\n+\t\tnew_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));\n \t\tif (new_url) {\n \t\t\tmem_free_set(url, new_url);\n \t\t}\n@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap,\n \tswitch (rb_type(result)) {\n \tcase T_STRING:\n \t{\n-\t\tint len = RSTRING(result)->len;\n+\t\tint len = RSTRING_LEN(result);\n \n-\t\tadd_fragment(cached, 0, RSTRING(result)->ptr, len);\n+\t\tadd_fragment(cached, 0, RSTRING_PTR(result), len);\n \t\tnormalize_cache_entry(cached, len);\n \n \t\tbreak;\n@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void \n \t{\n \t\tunsigned char proxy;\n \n-\t\tproxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);\n+\t\tproxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));\n \t\tif (proxy) {\n \t\t\tmem_free_set(new_proxy_url, proxy);\n \t\t}\n" } ]	{ "id": "elinks-17511-build-with-new-ruby.patch", "cves": [ "CVE-2012-6709" ], "package": "elinks", "incident_id": 17511, "patch_name": "build-with-new-ruby.patch", "tier": "identical", "language": "c", "patch_lines_changed": 65, "patch_files_count": 4, "total_tokens_est": 3782, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2012-6709", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-16239\n\n===================================================================\n\n## Package\nopenconnect\n\n## Files to modify\n- http.c\n\n## Upstream Fix\n```diff\nIndex: openconnect-7.08/http.c\n===================================================================\n--- openconnect-7.08.orig/http.c\n+++ openconnect-7.08/http.c\n@@ -521,7 +521,8 @@ int process_http_response(struct opencon\n \t} else if (bodylen == BODY_CHUNKED) {\n \t\t/* ... else, chunked /\n \t\twhile ((i = vpninfo->ssl_gets(vpninfo, buf, sizeof(buf)))) {\n-\t\t\tint chunklen, lastchunk = 0;\n+\t\t\tint lastchunk = 0;\n+\t\t\tlong chunklen;\n \n \t\t\tif (i < 0) {\n \t\t\t\tvpn_progress(vpninfo, PRG_ERR,\n@@ -533,6 +534,18 @@ int process_http_response(struct opencon\n \t\t\t\tlastchunk = 1;\n \t\t\t\tgoto skip;\n \t\t\t}\n+\t\t\tif (chunklen < 0) {\n+\t\t\t\tvpn_progress(vpninfo, PRG_ERR,\n+\t\t\t\t\t _(\"HTTP chunk length is negative (%ld)\\n\"), chunklen);\n+\t\t\t\topenconnect_close_https(vpninfo, 0);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tif (chunklen >= INT_MAX) {\n+\t\t\t\tvpn_progress(vpninfo, PRG_ERR,\n+\t\t\t\t\t _(\"HTTP chunk length is too large (%ld)\\n\"), chunklen);\n+\t\t\t\topenconnect_close_https(vpninfo, 0);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n \t\t\tif (buf_ensure_space(body, chunklen + 1))\n \t\t\t\treturn buf_error(body);\n \t\t\twhile (chunklen) {\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: openconnect-7.08/http.c\n===================================================================\n--- openconnect-7.08.orig/http.c\n+++ openconnect-7.08/http.c\n@@ -521,7 +521,8 @@ int process_http_response(struct opencon\n \t} else if (bodylen == BODY_CHUNKED) {\n \t\t/ ... else, chunked */\n \t\twhile ((i = vpninfo->ssl_gets(vpninfo, buf, sizeof(buf)))) {\n-\t\t\tint chunklen, lastchunk = 0;\n+\t\t\tint lastchunk = 0;\n+\t\t\tlong chunklen;\n \n \t\t\tif (i < 0) {\n \t\t\t\tvpn_progress(vpninfo, PRG_ERR,\n@@ -533,6 +534,18 @@ int process_http_response(struct opencon\n \t\t\t\tlastchunk = 1;\n \t\t\t\tgoto skip;\n \t\t\t}\n+\t\t\tif (chunklen < 0) {\n+\t\t\t\tvpn_progress(vpninfo, PRG_ERR,\n+\t\t\t\t\t _(\"HTTP chunk length is negative (%ld)\\n\"), chunklen);\n+\t\t\t\topenconnect_close_https(vpninfo, 0);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tif (chunklen >= INT_MAX) {\n+\t\t\t\tvpn_progress(vpninfo, PRG_ERR,\n+\t\t\t\t\t _(\"HTTP chunk length is too large (%ld)\\n\"), chunklen);\n+\t\t\t\topenconnect_close_https(vpninfo, 0);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n \t\t\tif (buf_ensure_space(body, chunklen + 1))\n \t\t\t\treturn buf_error(body);\n \t\t\twhile (chunklen) {\n" } ]	{ "id": "openconnect-11316-openconnect-CVE-2019-16239.patch", "cves": [ "CVE-2019-16239" ], "package": "openconnect", "incident_id": 11316, "patch_name": "openconnect-CVE-2019-16239.patch", "tier": "identical", "language": "c", "patch_lines_changed": 15, "patch_files_count": 1, "total_tokens_est": 670, "has_source_context": false, "upstream_enriched": false, "suse_license": "LGPL-2.1-or-later", "upstream_license": null, "cve_id": "CVE-2019-16239", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2023-42119, CVE-2023-42117\n\nindex 7d7ee0c04..8dc3695a1 100644\n\n## Package\nexim\n\n## Files to modify\n- src/dns.c\n- src/lookups/dnsdb.c\n- src/spf.c\n\n## Upstream Fix\n```diff\ndiff --git a/src/dns.c b/src/dns.c\nindex 7d7ee0c04..8dc3695a1 100644\n--- a/src/dns.c\n+++ b/src/dns.c\n@@ -304,7 +304,7 @@ Return: TRUE for a bad result\n static BOOL\n dnss_inc_aptr(const dns_answer * dnsa, dns_scan * dnss, unsigned delta)\n {\n-return (dnss->aptr += delta) >= dnsa->answer + dnsa->answerlen;\n+return (dnss->aptr += delta) > dnsa->answer + dnsa->answerlen;\n }\n \n /************************************************\n@@ -388,7 +388,7 @@ if (reset != RESET_NEXT)\n TRACE trace = \"A-hdr\";\n if (dnss_inc_aptr(dnsa, dnss, namelen+8)) goto null_return;\n GETSHORT(dnss->srr.size, dnss->aptr); / size of data portion /\n- / skip over it /\n+ / skip over it, checking for a bogus size /\n TRACE trace = \"A-skip\";\n if (dnss_inc_aptr(dnsa, dnss, dnss->srr.size)) goto null_return;\n }\n@@ -428,10 +428,9 @@ GETLONG(dnss->srr.ttl, dnss->aptr);\t\t/ TTL /\n GETSHORT(dnss->srr.size, dnss->aptr);\t\t/ Size of data portion /\n dnss->srr.data = dnss->aptr;\t\t\t/ The record's data follows /\n \n-/ Unchecked increment ok here since no further access on this iteration;\n-will be checked on next at \"R-name\". /\n-\n-dnss->aptr += dnss->srr.size;\t\t\t/ Advance to next RR /\n+/ skip over it, checking for a bogus size /\n+if (dnss_inc_aptr(dnsa, dnss, dnss->srr.size))\n+ goto null_return;\n \n / Return a pointer to the dns_record structure within the dns_answer. This is\n for convenience so that the scans can use nice-looking for loops. /\ndiff --git a/src/lookups/dnsdb.c b/src/lookups/dnsdb.c\nindex 355be1b5d..020dc9a52 100644\n--- a/src/lookups/dnsdb.c\n+++ b/src/lookups/dnsdb.c\n@@ -398,43 +398,60 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \n if (type == T_TXT \|\| type == T_SPF)\n {\n- if (outsep2 == NULL)\t/ output only the first item of data /\n- yield = string_catn(yield, US (rr->data+1), (rr->data)[0]);\n+ if (!outsep2)\t\t\t/ output only the first item of data /\n+\t {\n+\t uschar n = (rr->data)[0];\n+\t / size byte + data bytes must not excced the RRs length /\n+\t if (n + 1 <= rr->size)\n+\t yield = string_catn(yield, US (rr->data+1), n);\n+\t }\n else\n {\n / output all items /\n int data_offset = 0;\n while (data_offset < rr->size)\n {\n- uschar chunk_len = (rr->data)[data_offset++];\n- if (outsep2[0] != '\\0' && data_offset != 1)\n+ uschar chunk_len = (rr->data)[data_offset];\n+\t int remain = rr->size - data_offset;\n+\n+\t / Apparently there are resolvers that do not check RRs before passing\n+\t them on, and glibc fails to do so. So every application must...\n+\t Check for chunk len exceeding RR /\n+\n+\t if (chunk_len > remain)\n+\t chunk_len = remain;\n+\n+ if (outsep2 && data_offset != 0)\n yield = string_catn(yield, outsep2, 1);\n- yield = string_catn(yield, US ((rr->data)+data_offset), chunk_len);\n+ yield = string_catn(yield, US ((rr->data) + ++data_offset), --chunk_len);\n data_offset += chunk_len;\n }\n }\n }\n else if (type == T_TLSA)\n- {\n- uint8_t usage, selector, matching_type;\n- uint16_t payload_length;\n- uschar s[MAX_TLSA_EXPANDED_SIZE];\n-\tuschar * sp = s;\n- uschar * p = US rr->data;\n+\tif (rr->size < 3)\n+\t continue;\n+\telse\n+\t {\n+\t uint8_t usage, selector, matching_type;\n+\t uint16_t payload_length;\n+\t uschar s[MAX_TLSA_EXPANDED_SIZE];\n+\t uschar * sp = s;\n+\t uschar * p = US rr->data;\n+\n+\t usage = p++;\n+\t selector = p++;\n+\t matching_type = p++;\n+\t / What's left after removing the first 3 bytes above /\n+\t payload_length = rr->size - 3;\n+\t sp += sprintf(CS s, \"%d%c%d%c%d%c\", usage, outsep2,\n+\t\t selector, outsep2, matching_type, outsep2);\n+\t /* Now append the cert/identifier, one hex char at a time /\n+\t while (payload_length-- > 0 && sp-s < (MAX_TLSA_EXPANDED_SIZE - 4))\n+\t sp += sprintf(CS sp, \"%02x\", p++);\n \n- usage = p++;\n- selector = p++;\n- matching_type = p++;\n- / What's left after removing the first 3 bytes above /\n- payload_length = rr->size - 3;\n- sp += sprintf(CS s, \"%d%c%d%c%d%c\", usage, outsep2,\n-\t\tselector, outsep2, matching_type, outsep2);\n- /* Now append the cert/identifier, one hex char at a time /\n-\twhile (payload_length-- > 0 && sp-s < (MAX_TLSA_EXPANDED_SIZE - 4))\n- sp += sprintf(CS sp, \"%02x\", p++);\n-\n- yield = string_cat(yield, s);\n- }\n+\t yield = string_cat(yield, s);\n+\t }\n else /* T_CNAME, T_CSA, T_MX, T_MXH, T_NS, T_PTR, T_SOA, T_SRV /\n {\n int priority, weight, port;\n@@ -444,17 +461,20 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \tswitch (type)\n \t {\n \t case T_MXH:\n+\t if (rr->size < sizeof(u_int16_t)) continue;\n \t / mxh ignores the priority number and includes only the hostnames /\n \t GETSHORT(priority, p);\n \t break;\n \n \t case T_MX:\n+\t if (rr->size < sizeof(u_int16_t)) continue;\n \t GETSHORT(priority, p);\n \t sprintf(CS s, \"%d%c\", priority, outsep2);\n \t yield = string_cat(yield, s);\n \t break;\n \n \t case T_SRV:\n+\t if (rr->size < 3sizeof(u_int16_t)) continue;\n \t GETSHORT(priority, p);\n \t GETSHORT(weight, p);\n \t GETSHORT(port, p);\n@@ -464,6 +484,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \t break;\n \n \t case T_CSA:\n+\t if (rr->size < 3sizeof(u_int16_t)) continue;\n \t /* See acl_verify_csa() for more comments about CSA. /\n \t GETSHORT(priority, p);\n \t GETSHORT(weight, p);\n@@ -514,7 +535,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \n \tif (type == T_SOA && outsep2 != NULL)\n \t {\n-\t unsigned long serial, refresh, retry, expire, minimum;\n+\t unsigned long serial = 0, refresh = 0, retry = 0, expire = 0, minimum = 0;\n \n \t p += rc;\n \t yield = string_catn(yield, outsep2, 1);\n@@ -530,8 +551,11 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \t else yield = string_cat(yield, s);\n \n \t p += rc;\n-\t GETLONG(serial, p); GETLONG(refresh, p);\n-\t GETLONG(retry, p); GETLONG(expire, p); GETLONG(minimum, p);\n+\t if (rr->size >= p - rr->data - 5sizeof(u_int32_t))\n+\t {\n+\t GETLONG(serial, p); GETLONG(refresh, p);\n+\t GETLONG(retry, p); GETLONG(expire, p); GETLONG(minimum, p);\n+\t }\n \t sprintf(CS s, \"%c%lu%c%lu%c%lu%c%lu%c%lu\",\n \t outsep2, serial, outsep2, refresh,\n \t outsep2, retry, outsep2, expire, outsep2, minimum);\ndiff --git a/src/spf.c b/src/spf.c\nindex db6eea3a8..1981d81b6 100644\n--- a/src/spf.c\n+++ b/src/spf.c\n@@ -120,6 +120,7 @@ for (dns_record rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;\n switch(rr_type)\n {\n case T_MX:\n+\tif (rr->size < 2) continue;\n \ts += 2;\t/* skip the MX precedence field /\n case T_PTR:\n \t{\n@@ -135,6 +136,7 @@ for (dns_record rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;\n \tgstring * g = NULL;\n \tuschar chunk_len;\n \n+\tif (rr->size < 1+6) continue;\t\t/* min for version str /\n \tif (strncmpic(rr->data+1, US SPF_VER_STR, 6) != 0)\n \t {\n \t HDEBUG(D_host_lookup) debug_printf(\"not an spf record: %.s\\n\",\n@@ -142,9 +144,12 @@ for (dns_record * rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;\n \t continue;\n \t }\n \n-\tfor (int off = 0; off < rr->size; off += chunk_len)\n+\t/* require 1 byte for the chunk_len /\n+\tfor (int off = 0; off < rr->size - 1; off += chunk_len)\n \t {\n-\t if (!(chunk_len = s[off++])) break;\n+\t if ( !(chunk_len = s[off++])\n+\t \|\| rr->size < off + chunk_len\t/ ignore bogus size chunks /\n+\t ) break;\n \t g = string_catn(g, s+off, chunk_len);\n \t }\n \tif (!g)\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff --git a/src/dns.c b/src/dns.c\nindex 7d7ee0c04..8dc3695a1 100644\n--- a/src/dns.c\n+++ b/src/dns.c\n@@ -304,7 +304,7 @@ Return: TRUE for a bad result\n static BOOL\n dnss_inc_aptr(const dns_answer dnsa, dns_scan * dnss, unsigned delta)\n {\n-return (dnss->aptr += delta) >= dnsa->answer + dnsa->answerlen;\n+return (dnss->aptr += delta) > dnsa->answer + dnsa->answerlen;\n }\n \n /************************************************\n@@ -388,7 +388,7 @@ if (reset != RESET_NEXT)\n TRACE trace = \"A-hdr\";\n if (dnss_inc_aptr(dnsa, dnss, namelen+8)) goto null_return;\n GETSHORT(dnss->srr.size, dnss->aptr); / size of data portion /\n- / skip over it /\n+ / skip over it, checking for a bogus size /\n TRACE trace = \"A-skip\";\n if (dnss_inc_aptr(dnsa, dnss, dnss->srr.size)) goto null_return;\n }\n@@ -428,10 +428,9 @@ GETLONG(dnss->srr.ttl, dnss->aptr);\t\t/ TTL /\n GETSHORT(dnss->srr.size, dnss->aptr);\t\t/ Size of data portion /\n dnss->srr.data = dnss->aptr;\t\t\t/ The record's data follows /\n \n-/ Unchecked increment ok here since no further access on this iteration;\n-will be checked on next at \"R-name\". /\n-\n-dnss->aptr += dnss->srr.size;\t\t\t/ Advance to next RR /\n+/ skip over it, checking for a bogus size /\n+if (dnss_inc_aptr(dnsa, dnss, dnss->srr.size))\n+ goto null_return;\n \n / Return a pointer to the dns_record structure within the dns_answer. This is\n for convenience so that the scans can use nice-looking for loops. /\ndiff --git a/src/lookups/dnsdb.c b/src/lookups/dnsdb.c\nindex 355be1b5d..020dc9a52 100644\n--- a/src/lookups/dnsdb.c\n+++ b/src/lookups/dnsdb.c\n@@ -398,43 +398,60 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \n if (type == T_TXT \|\| type == T_SPF)\n {\n- if (outsep2 == NULL)\t/ output only the first item of data /\n- yield = string_catn(yield, US (rr->data+1), (rr->data)[0]);\n+ if (!outsep2)\t\t\t/ output only the first item of data /\n+\t {\n+\t uschar n = (rr->data)[0];\n+\t / size byte + data bytes must not excced the RRs length /\n+\t if (n + 1 <= rr->size)\n+\t yield = string_catn(yield, US (rr->data+1), n);\n+\t }\n else\n {\n / output all items /\n int data_offset = 0;\n while (data_offset < rr->size)\n {\n- uschar chunk_len = (rr->data)[data_offset++];\n- if (outsep2[0] != '\\0' && data_offset != 1)\n+ uschar chunk_len = (rr->data)[data_offset];\n+\t int remain = rr->size - data_offset;\n+\n+\t / Apparently there are resolvers that do not check RRs before passing\n+\t them on, and glibc fails to do so. So every application must...\n+\t Check for chunk len exceeding RR /\n+\n+\t if (chunk_len > remain)\n+\t chunk_len = remain;\n+\n+ if (outsep2 && data_offset != 0)\n yield = string_catn(yield, outsep2, 1);\n- yield = string_catn(yield, US ((rr->data)+data_offset), chunk_len);\n+ yield = string_catn(yield, US ((rr->data) + ++data_offset), --chunk_len);\n data_offset += chunk_len;\n }\n }\n }\n else if (type == T_TLSA)\n- {\n- uint8_t usage, selector, matching_type;\n- uint16_t payload_length;\n- uschar s[MAX_TLSA_EXPANDED_SIZE];\n-\tuschar * sp = s;\n- uschar * p = US rr->data;\n+\tif (rr->size < 3)\n+\t continue;\n+\telse\n+\t {\n+\t uint8_t usage, selector, matching_type;\n+\t uint16_t payload_length;\n+\t uschar s[MAX_TLSA_EXPANDED_SIZE];\n+\t uschar * sp = s;\n+\t uschar * p = US rr->data;\n+\n+\t usage = p++;\n+\t selector = p++;\n+\t matching_type = p++;\n+\t / What's left after removing the first 3 bytes above /\n+\t payload_length = rr->size - 3;\n+\t sp += sprintf(CS s, \"%d%c%d%c%d%c\", usage, outsep2,\n+\t\t selector, outsep2, matching_type, outsep2);\n+\t /* Now append the cert/identifier, one hex char at a time /\n+\t while (payload_length-- > 0 && sp-s < (MAX_TLSA_EXPANDED_SIZE - 4))\n+\t sp += sprintf(CS sp, \"%02x\", p++);\n \n- usage = p++;\n- selector = p++;\n- matching_type = p++;\n- / What's left after removing the first 3 bytes above /\n- payload_length = rr->size - 3;\n- sp += sprintf(CS s, \"%d%c%d%c%d%c\", usage, outsep2,\n-\t\tselector, outsep2, matching_type, outsep2);\n- /* Now append the cert/identifier, one hex char at a time /\n-\twhile (payload_length-- > 0 && sp-s < (MAX_TLSA_EXPANDED_SIZE - 4))\n- sp += sprintf(CS sp, \"%02x\", p++);\n-\n- yield = string_cat(yield, s);\n- }\n+\t yield = string_cat(yield, s);\n+\t }\n else /* T_CNAME, T_CSA, T_MX, T_MXH, T_NS, T_PTR, T_SOA, T_SRV /\n {\n int priority, weight, port;\n@@ -444,17 +461,20 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \tswitch (type)\n \t {\n \t case T_MXH:\n+\t if (rr->size < sizeof(u_int16_t)) continue;\n \t / mxh ignores the priority number and includes only the hostnames /\n \t GETSHORT(priority, p);\n \t break;\n \n \t case T_MX:\n+\t if (rr->size < sizeof(u_int16_t)) continue;\n \t GETSHORT(priority, p);\n \t sprintf(CS s, \"%d%c\", priority, outsep2);\n \t yield = string_cat(yield, s);\n \t break;\n \n \t case T_SRV:\n+\t if (rr->size < 3sizeof(u_int16_t)) continue;\n \t GETSHORT(priority, p);\n \t GETSHORT(weight, p);\n \t GETSHORT(port, p);\n@@ -464,6 +484,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \t break;\n \n \t case T_CSA:\n+\t if (rr->size < 3sizeof(u_int16_t)) continue;\n \t /* See acl_verify_csa() for more comments about CSA. /\n \t GETSHORT(priority, p);\n \t GETSHORT(weight, p);\n@@ -514,7 +535,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \n \tif (type == T_SOA && outsep2 != NULL)\n \t {\n-\t unsigned long serial, refresh, retry, expire, minimum;\n+\t unsigned long serial = 0, refresh = 0, retry = 0, expire = 0, minimum = 0;\n \n \t p += rc;\n \t yield = string_catn(yield, outsep2, 1);\n@@ -530,8 +551,11 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))\n \t else yield = string_cat(yield, s);\n \n \t p += rc;\n-\t GETLONG(serial, p); GETLONG(refresh, p);\n-\t GETLONG(retry, p); GETLONG(expire, p); GETLONG(minimum, p);\n+\t if (rr->size >= p - rr->data - 5sizeof(u_int32_t))\n+\t {\n+\t GETLONG(serial, p); GETLONG(refresh, p);\n+\t GETLONG(retry, p); GETLONG(expire, p); GETLONG(minimum, p);\n+\t }\n \t sprintf(CS s, \"%c%lu%c%lu%c%lu%c%lu%c%lu\",\n \t outsep2, serial, outsep2, refresh,\n \t outsep2, retry, outsep2, expire, outsep2, minimum);\ndiff --git a/src/spf.c b/src/spf.c\nindex db6eea3a8..1981d81b6 100644\n--- a/src/spf.c\n+++ b/src/spf.c\n@@ -120,6 +120,7 @@ for (dns_record rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;\n switch(rr_type)\n {\n case T_MX:\n+\tif (rr->size < 2) continue;\n \ts += 2;\t/* skip the MX precedence field /\n case T_PTR:\n \t{\n@@ -135,6 +136,7 @@ for (dns_record rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;\n \tgstring * g = NULL;\n \tuschar chunk_len;\n \n+\tif (rr->size < 1+6) continue;\t\t/* min for version str /\n \tif (strncmpic(rr->data+1, US SPF_VER_STR, 6) != 0)\n \t {\n \t HDEBUG(D_host_lookup) debug_printf(\"not an spf record: %.s\\n\",\n@@ -142,9 +144,12 @@ for (dns_record * rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;\n \t continue;\n \t }\n \n-\tfor (int off = 0; off < rr->size; off += chunk_len)\n+\t/* require 1 byte for the chunk_len /\n+\tfor (int off = 0; off < rr->size - 1; off += chunk_len)\n \t {\n-\t if (!(chunk_len = s[off++])) break;\n+\t if ( !(chunk_len = s[off++])\n+\t \|\| rr->size < off + chunk_len\t/ ignore bogus size chunks */\n+\t ) break;\n \t g = string_catn(g, s+off, chunk_len);\n \t }\n \tif (!g)\n" } ]	{ "id": "exim-18133-patch-CVE-2023-42119.patch", "cves": [ "CVE-2023-42117", "CVE-2023-42119" ], "package": "exim", "incident_id": 18133, "patch_name": "patch-CVE-2023-42119.patch", "tier": "identical", "language": "c", "patch_lines_changed": 98, "patch_files_count": 3, "total_tokens_est": 3975, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2023-42119", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2023-42119, CVE-2023-42117\n\nindex 8d886b6b6..bb3d327d1 100644\n\n## Package\nexim\n\n## Files to modify\n- src/auths/auth-spa.c\n- src/auths/auth-spa.h\n- src/auths/external.c\n- src/auths/spa.c\n\n## Upstream Fix\n```diff\ndiff --git a/src/auths/auth-spa.c b/src/auths/auth-spa.c\nindex 8d886b6b6..bb3d327d1 100644\n--- a/src/auths/auth-spa.c\n+++ b/src/auths/auth-spa.c\n@@ -155,6 +155,9 @@ int main (int argc, char ** argv)\n up with a different answer to the one above)\n /\n \n+#ifndef MACRO_PREDEF\n+\n+\n #define DEBUG_X(a,b) ;\n \n extern int DEBUGLEVEL;\n@@ -1211,7 +1214,9 @@ char versionString[] = \"libntlm version 0.21\";\n \n #define spa_bytes_add(ptr, header, buf, count) \\\n { \\\n-if (buf && (count) != 0) / we hate -Wint-in-bool-contex / \\\n+if ( buf && (count) != 0\t/ we hate -Wint-in-bool-contex / \\\n+ && ptr->bufIndex + count < sizeof(ptr->buffer)\t\t\\\n+ ) \\\n { \\\n SSVAL(&ptr->header.len,0,count); \\\n SSVAL(&ptr->header.maxlen,0,count); \\\n@@ -1229,35 +1234,30 @@ else \\\n \n #define spa_string_add(ptr, header, string) \\\n { \\\n-char p = string; \\\n+uschar * p = string; \\\n int len = 0; \\\n-if (p) len = strlen(p); \\\n-spa_bytes_add(ptr, header, (US p), len); \\\n+if (p) len = Ustrlen(p); \\\n+spa_bytes_add(ptr, header, p, len); \\\n }\n \n #define spa_unicode_add_string(ptr, header, string) \\\n { \\\n-char p = string; \\\n-uschar b = NULL; \\\n+uschar * p = string; \\\n+uschar * b = NULL; \\\n int len = 0; \\\n if (p) \\\n { \\\n- len = strlen(p); \\\n- b = strToUnicode(p); \\\n+ len = Ustrlen(p); \\\n+ b = US strToUnicode(CS p); \\\n } \\\n spa_bytes_add(ptr, header, b, len2); \\\n }\n \n \n-#define GetUnicodeString(structPtr, header) \\\n-unicodeToString(((char)structPtr) + IVAL(&structPtr->header.offset,0) , SVAL(&structPtr->header.len,0)/2)\n-#define GetString(structPtr, header) \\\n-toString(((CS structPtr) + IVAL(&structPtr->header.offset,0)), SVAL(&structPtr->header.len,0))\n-\n #ifdef notdef\n \n #define DumpBuffer(fp, structPtr, header) \\\n-dumpRaw(fp,(US structPtr)+IVAL(&structPtr->header.offset,0),SVAL(&structPtr->header.len,0))\n+ dumpRaw(fp,(US structPtr)+IVAL(&structPtr->header.offset,0),SVAL(&structPtr->header.len,0))\n \n \n static void\n@@ -1321,8 +1321,33 @@ buf[len] = 0;\n return buf;\n }\n \n+static inline uschar \n+get_challenge_unistr(SPAAuthChallenge challenge, SPAStrHeader * hdr)\n+{\n+int off = IVAL(&hdr->offset, 0);\n+int len = SVAL(&hdr->len, 0);\n+return off + len < sizeof(SPAAuthChallenge)\n+ ? US unicodeToString(CS challenge + off, len/2) : US\"\";\n+}\n+\n+static inline uschar \n+get_challenge_str(SPAAuthChallenge challenge, SPAStrHeader * hdr)\n+{\n+int off = IVAL(&hdr->offset, 0);\n+int len = SVAL(&hdr->len, 0);\n+return off + len < sizeof(SPAAuthChallenge)\n+ ? US toString(CS challenge + off, len) : US\"\";\n+}\n+\n #ifdef notdef\n \n+#define GetUnicodeString(structPtr, header) \\\n+ unicodeToString(((char)structPtr) + IVAL(&structPtr->header.offset,0) , SVAL(&structPtr->header.len,0)/2)\n+\n+#define GetString(structPtr, header) \\\n+ toString(((CS structPtr) + IVAL(&structPtr->header.offset,0)), SVAL(&structPtr->header.len,0))\n+\n+\n void\n dumpSmbNtlmAuthRequest (FILE fp, SPAAuthRequest * request)\n {\n@@ -1366,15 +1391,15 @@ fprintf (fp, \" Flags = %08x\\n\", IVAL (&response->flags, 0));\n #endif\n \n void\n-spa_build_auth_request (SPAAuthRequest * request, char user, char domain)\n+spa_build_auth_request (SPAAuthRequest * request, uschar * user, uschar * domain)\n {\n-char u = strdup (user);\n-char p = strchr (u, '@');\n+uschar * u = string_copy(user);\n+uschar * p = Ustrchr(u, '@');\n \n if (p)\n {\n if (!domain)\n- domain = p + 1;\n+ domain = p + 1;\n p = '\\0';\n }\n \n@@ -1384,7 +1409,6 @@ SIVAL (&request->msgType, 0, 1);\n SIVAL (&request->flags, 0, 0x0000b207); / have to figure out what these mean /\n spa_string_add (request, user, u);\n spa_string_add (request, domain, domain);\n-free (u);\n }\n \n \n@@ -1475,16 +1499,16 @@ free (u);\n \n void\n spa_build_auth_response (SPAAuthChallenge challenge,\n- SPAAuthResponse * response, char user,\n- char password)\n+ SPAAuthResponse * response, uschar * user,\n+ uschar * password)\n {\n uint8x lmRespData[24];\n uint8x ntRespData[24];\n uint32x cf = IVAL(&challenge->flags, 0);\n-char u = strdup (user);\n-char p = strchr (u, '@');\n-char d = NULL;\n-char domain;\n+uschar * u = string_copy(user);\n+uschar * p = Ustrchr(u, '@');\n+uschar * d = NULL;\n+uschar * domain;\n \n if (p)\n {\n@@ -1492,33 +1516,33 @@ if (p)\n p = '\\0';\n }\n \n-else domain = d = strdup((cf & 0x1)?\n- CCS GetUnicodeString(challenge, uDomain) :\n- CCS GetString(challenge, uDomain));\n+else domain = d = string_copy(cf & 0x1\n+ ? CUS get_challenge_unistr(challenge, &challenge->uDomain)\n+ : CUS get_challenge_str(challenge, &challenge->uDomain));\n \n-spa_smb_encrypt (US password, challenge->challengeData, lmRespData);\n-spa_smb_nt_encrypt (US password, challenge->challengeData, ntRespData);\n+spa_smb_encrypt(password, challenge->challengeData, lmRespData);\n+spa_smb_nt_encrypt(password, challenge->challengeData, ntRespData);\n \n response->bufIndex = 0;\n memcpy (response->ident, \"NTLMSSP\\0\\0\\0\", 8);\n SIVAL (&response->msgType, 0, 3);\n \n-spa_bytes_add (response, lmResponse, lmRespData, (cf & 0x200) ? 24 : 0);\n-spa_bytes_add (response, ntResponse, ntRespData, (cf & 0x8000) ? 24 : 0);\n+spa_bytes_add(response, lmResponse, lmRespData, cf & 0x200 ? 24 : 0);\n+spa_bytes_add(response, ntResponse, ntRespData, cf & 0x8000 ? 24 : 0);\n \n if (cf & 0x1) { / Unicode Text /\n- spa_unicode_add_string (response, uDomain, domain);\n- spa_unicode_add_string (response, uUser, u);\n- spa_unicode_add_string (response, uWks, u);\n+ spa_unicode_add_string(response, uDomain, domain);\n+ spa_unicode_add_string(response, uUser, u);\n+ spa_unicode_add_string(response, uWks, u);\n } else { / OEM Text /\n- spa_string_add (response, uDomain, domain);\n- spa_string_add (response, uUser, u);\n- spa_string_add (response, uWks, u);\n+ spa_string_add(response, uDomain, domain);\n+ spa_string_add(response, uUser, u);\n+ spa_string_add(response, uWks, u);\n }\n \n-spa_string_add (response, sessionKey, NULL);\n+spa_string_add(response, sessionKey, NULL);\n response->flags = challenge->flags;\n-\n-if (d != NULL) free (d);\n-free (u);\n }\n+\n+\n+#endif /!MACRO_PREDEF/\ndiff --git a/src/auths/auth-spa.h b/src/auths/auth-spa.h\nindex cfe1b086d..3b0b3a9e3 100644\n--- a/src/auths/auth-spa.h\n+++ b/src/auths/auth-spa.h\n@@ -79,10 +79,10 @@ typedef struct\n \n void spa_bits_to_base64 (unsigned char , const unsigned char , int);\n int spa_base64_to_bits(char , int, const char );\n-void spa_build_auth_response (SPAAuthChallenge challenge,\n- SPAAuthResponse response, char user, char password);\n-void spa_build_auth_request (SPAAuthRequest request, char user,\n- char domain);\n+void spa_build_auth_response (SPAAuthChallenge * challenge,\n+ SPAAuthResponse * response, uschar * user, uschar * password);\n+void spa_build_auth_request (SPAAuthRequest * request, uschar * user,\n+ uschar * domain);\n extern void spa_smb_encrypt (unsigned char * passwd, unsigned char * c8,\n unsigned char * p24);\n extern void spa_smb_nt_encrypt (unsigned char * passwd, unsigned char * c8,\ndiff --git a/src/auths/external.c b/src/auths/external.c\nindex 7e7fca841..790b98159 100644\n--- a/src/auths/external.c\n+++ b/src/auths/external.c\n@@ -103,7 +103,7 @@ if (expand_nmax == 0) \t/* skip if rxd data /\n if (ob->server_param2)\n {\n uschar s = expand_string(ob->server_param2);\n- auth_vars[expand_nmax] = s;\n+ auth_vars[expand_nmax = 1] = s;\n expand_nstring[++expand_nmax] = s;\n expand_nlength[expand_nmax] = Ustrlen(s);\n if (ob->server_param3)\ndiff --git a/src/auths/spa.c b/src/auths/spa.c\nindex ff90d33a3..bfaccefda 100644\n--- a/src/auths/spa.c\n+++ b/src/auths/spa.c\n@@ -284,14 +284,13 @@ SPAAuthRequest request;\n SPAAuthChallenge challenge;\n SPAAuthResponse response;\n char msgbuf[2048];\n-char domain = NULL;\n-char username, password;\n+uschar domain = NULL, * username, * password;\n \n /* Code added by PH to expand the options /\n \n buffer = 0; /* Default no message when cancelled /\n \n-if (!(username = CS expand_string(ob->spa_username)))\n+if (!(username = expand_string(ob->spa_username)))\n {\n if (f.expand_string_forcedfail) return CANCELLED;\n string_format(buffer, buffsize, \"expansion of \\\"%s\\\" failed in %s \"\n@@ -300,7 +299,7 @@ if (!(username = CS expand_string(ob->spa_username)))\n return ERROR;\n }\n \n-if (!(password = CS expand_string(ob->spa_password)))\n+if (!(password = expand_string(ob->spa_password)))\n {\n if (f.expand_string_forcedfail) return CANCELLED;\n string_format(buffer, buffsize, \"expansion of \\\"%s\\\" failed in %s \"\n@@ -310,7 +309,7 @@ if (!(password = CS expand_string(ob->spa_password)))\n }\n \n if (ob->spa_domain)\n- if (!(domain = CS expand_string(ob->spa_domain)))\n+ if (!(domain = expand_string(ob->spa_domain)))\n {\n if (f.expand_string_forcedfail) return CANCELLED;\n string_format(buffer, buffsize, \"expansion of \\\"%s\\\" failed in %s \"\n@@ -330,7 +329,7 @@ if (!smtp_read_response(sx, US buffer, buffsize, '3', timeout))\n \n DSPA(\"\\n\\n%s authenticator: using domain %s\\n\\n\", ablock->name, domain);\n \n-spa_build_auth_request(&request, CS username, domain);\n+spa_build_auth_request(&request, username, domain);\n spa_bits_to_base64(US msgbuf, US &request, spa_request_length(&request));\n \n DSPA(\"\\n\\n%s authenticator: sending request (%s)\\n\\n\", ablock->name, msgbuf);\n@@ -347,7 +346,7 @@ if (!smtp_read_response(sx, US buffer, buffsize, '3', timeout))\n DSPA(\"\\n\\n%s authenticator: challenge (%s)\\n\\n\", ablock->name, buffer + 4);\n spa_base64_to_bits(CS (&challenge), sizeof(challenge), CCS (buffer + 4));\n \n-spa_build_auth_response(&challenge, &response, CS username, CS password);\n+spa_build_auth_response(&challenge, &response, username, password);\n spa_bits_to_base64(US msgbuf, US &response, spa_request_length(&response));\n DSPA(\"\\n\\n%s authenticator: challenge response (%s)\\n\\n\", ablock->name, msgbuf);\n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff --git a/src/auths/auth-spa.c b/src/auths/auth-spa.c\nindex 8d886b6b6..bb3d327d1 100644\n--- a/src/auths/auth-spa.c\n+++ b/src/auths/auth-spa.c\n@@ -155,6 +155,9 @@ int main (int argc, char * argv)\n up with a different answer to the one above)\n /\n \n+#ifndef MACRO_PREDEF\n+\n+\n #define DEBUG_X(a,b) ;\n \n extern int DEBUGLEVEL;\n@@ -1211,7 +1214,9 @@ char versionString[] = \"libntlm version 0.21\";\n \n #define spa_bytes_add(ptr, header, buf, count) \\\n { \\\n-if (buf && (count) != 0) / we hate -Wint-in-bool-contex / \\\n+if ( buf && (count) != 0\t/ we hate -Wint-in-bool-contex / \\\n+ && ptr->bufIndex + count < sizeof(ptr->buffer)\t\t\\\n+ ) \\\n { \\\n SSVAL(&ptr->header.len,0,count); \\\n SSVAL(&ptr->header.maxlen,0,count); \\\n@@ -1229,35 +1234,30 @@ else \\\n \n #define spa_string_add(ptr, header, string) \\\n { \\\n-char p = string; \\\n+uschar * p = string; \\\n int len = 0; \\\n-if (p) len = strlen(p); \\\n-spa_bytes_add(ptr, header, (US p), len); \\\n+if (p) len = Ustrlen(p); \\\n+spa_bytes_add(ptr, header, p, len); \\\n }\n \n #define spa_unicode_add_string(ptr, header, string) \\\n { \\\n-char p = string; \\\n-uschar b = NULL; \\\n+uschar * p = string; \\\n+uschar * b = NULL; \\\n int len = 0; \\\n if (p) \\\n { \\\n- len = strlen(p); \\\n- b = strToUnicode(p); \\\n+ len = Ustrlen(p); \\\n+ b = US strToUnicode(CS p); \\\n } \\\n spa_bytes_add(ptr, header, b, len2); \\\n }\n \n \n-#define GetUnicodeString(structPtr, header) \\\n-unicodeToString(((char)structPtr) + IVAL(&structPtr->header.offset,0) , SVAL(&structPtr->header.len,0)/2)\n-#define GetString(structPtr, header) \\\n-toString(((CS structPtr) + IVAL(&structPtr->header.offset,0)), SVAL(&structPtr->header.len,0))\n-\n #ifdef notdef\n \n #define DumpBuffer(fp, structPtr, header) \\\n-dumpRaw(fp,(US structPtr)+IVAL(&structPtr->header.offset,0),SVAL(&structPtr->header.len,0))\n+ dumpRaw(fp,(US structPtr)+IVAL(&structPtr->header.offset,0),SVAL(&structPtr->header.len,0))\n \n \n static void\n@@ -1321,8 +1321,33 @@ buf[len] = 0;\n return buf;\n }\n \n+static inline uschar \n+get_challenge_unistr(SPAAuthChallenge challenge, SPAStrHeader * hdr)\n+{\n+int off = IVAL(&hdr->offset, 0);\n+int len = SVAL(&hdr->len, 0);\n+return off + len < sizeof(SPAAuthChallenge)\n+ ? US unicodeToString(CS challenge + off, len/2) : US\"\";\n+}\n+\n+static inline uschar \n+get_challenge_str(SPAAuthChallenge challenge, SPAStrHeader * hdr)\n+{\n+int off = IVAL(&hdr->offset, 0);\n+int len = SVAL(&hdr->len, 0);\n+return off + len < sizeof(SPAAuthChallenge)\n+ ? US toString(CS challenge + off, len) : US\"\";\n+}\n+\n #ifdef notdef\n \n+#define GetUnicodeString(structPtr, header) \\\n+ unicodeToString(((char)structPtr) + IVAL(&structPtr->header.offset,0) , SVAL(&structPtr->header.len,0)/2)\n+\n+#define GetString(structPtr, header) \\\n+ toString(((CS structPtr) + IVAL(&structPtr->header.offset,0)), SVAL(&structPtr->header.len,0))\n+\n+\n void\n dumpSmbNtlmAuthRequest (FILE fp, SPAAuthRequest * request)\n {\n@@ -1366,15 +1391,15 @@ fprintf (fp, \" Flags = %08x\\n\", IVAL (&response->flags, 0));\n #endif\n \n void\n-spa_build_auth_request (SPAAuthRequest * request, char user, char domain)\n+spa_build_auth_request (SPAAuthRequest * request, uschar * user, uschar * domain)\n {\n-char u = strdup (user);\n-char p = strchr (u, '@');\n+uschar * u = string_copy(user);\n+uschar * p = Ustrchr(u, '@');\n \n if (p)\n {\n if (!domain)\n- domain = p + 1;\n+ domain = p + 1;\n p = '\\0';\n }\n \n@@ -1384,7 +1409,6 @@ SIVAL (&request->msgType, 0, 1);\n SIVAL (&request->flags, 0, 0x0000b207); / have to figure out what these mean /\n spa_string_add (request, user, u);\n spa_string_add (request, domain, domain);\n-free (u);\n }\n \n \n@@ -1475,16 +1499,16 @@ free (u);\n \n void\n spa_build_auth_response (SPAAuthChallenge challenge,\n- SPAAuthResponse * response, char user,\n- char password)\n+ SPAAuthResponse * response, uschar * user,\n+ uschar * password)\n {\n uint8x lmRespData[24];\n uint8x ntRespData[24];\n uint32x cf = IVAL(&challenge->flags, 0);\n-char u = strdup (user);\n-char p = strchr (u, '@');\n-char d = NULL;\n-char domain;\n+uschar * u = string_copy(user);\n+uschar * p = Ustrchr(u, '@');\n+uschar * d = NULL;\n+uschar * domain;\n \n if (p)\n {\n@@ -1492,33 +1516,33 @@ if (p)\n p = '\\0';\n }\n \n-else domain = d = strdup((cf & 0x1)?\n- CCS GetUnicodeString(challenge, uDomain) :\n- CCS GetString(challenge, uDomain));\n+else domain = d = string_copy(cf & 0x1\n+ ? CUS get_challenge_unistr(challenge, &challenge->uDomain)\n+ : CUS get_challenge_str(challenge, &challenge->uDomain));\n \n-spa_smb_encrypt (US password, challenge->challengeData, lmRespData);\n-spa_smb_nt_encrypt (US password, challenge->challengeData, ntRespData);\n+spa_smb_encrypt(password, challenge->challengeData, lmRespData);\n+spa_smb_nt_encrypt(password, challenge->challengeData, ntRespData);\n \n response->bufIndex = 0;\n memcpy (response->ident, \"NTLMSSP\\0\\0\\0\", 8);\n SIVAL (&response->msgType, 0, 3);\n \n-spa_bytes_add (response, lmResponse, lmRespData, (cf & 0x200) ? 24 : 0);\n-spa_bytes_add (response, ntResponse, ntRespData, (cf & 0x8000) ? 24 : 0);\n+spa_bytes_add(response, lmResponse, lmRespData, cf & 0x200 ? 24 : 0);\n+spa_bytes_add(response, ntResponse, ntRespData, cf & 0x8000 ? 24 : 0);\n \n if (cf & 0x1) { / Unicode Text /\n- spa_unicode_add_string (response, uDomain, domain);\n- spa_unicode_add_string (response, uUser, u);\n- spa_unicode_add_string (response, uWks, u);\n+ spa_unicode_add_string(response, uDomain, domain);\n+ spa_unicode_add_string(response, uUser, u);\n+ spa_unicode_add_string(response, uWks, u);\n } else { / OEM Text /\n- spa_string_add (response, uDomain, domain);\n- spa_string_add (response, uUser, u);\n- spa_string_add (response, uWks, u);\n+ spa_string_add(response, uDomain, domain);\n+ spa_string_add(response, uUser, u);\n+ spa_string_add(response, uWks, u);\n }\n \n-spa_string_add (response, sessionKey, NULL);\n+spa_string_add(response, sessionKey, NULL);\n response->flags = challenge->flags;\n-\n-if (d != NULL) free (d);\n-free (u);\n }\n+\n+\n+#endif /!MACRO_PREDEF/\ndiff --git a/src/auths/auth-spa.h b/src/auths/auth-spa.h\nindex cfe1b086d..3b0b3a9e3 100644\n--- a/src/auths/auth-spa.h\n+++ b/src/auths/auth-spa.h\n@@ -79,10 +79,10 @@ typedef struct\n \n void spa_bits_to_base64 (unsigned char , const unsigned char , int);\n int spa_base64_to_bits(char , int, const char );\n-void spa_build_auth_response (SPAAuthChallenge challenge,\n- SPAAuthResponse response, char user, char password);\n-void spa_build_auth_request (SPAAuthRequest request, char user,\n- char domain);\n+void spa_build_auth_response (SPAAuthChallenge * challenge,\n+ SPAAuthResponse * response, uschar * user, uschar * password);\n+void spa_build_auth_request (SPAAuthRequest * request, uschar * user,\n+ uschar * domain);\n extern void spa_smb_encrypt (unsigned char * passwd, unsigned char * c8,\n unsigned char * p24);\n extern void spa_smb_nt_encrypt (unsigned char * passwd, unsigned char * c8,\ndiff --git a/src/auths/external.c b/src/auths/external.c\nindex 7e7fca841..790b98159 100644\n--- a/src/auths/external.c\n+++ b/src/auths/external.c\n@@ -103,7 +103,7 @@ if (expand_nmax == 0) \t/* skip if rxd data /\n if (ob->server_param2)\n {\n uschar s = expand_string(ob->server_param2);\n- auth_vars[expand_nmax] = s;\n+ auth_vars[expand_nmax = 1] = s;\n expand_nstring[++expand_nmax] = s;\n expand_nlength[expand_nmax] = Ustrlen(s);\n if (ob->server_param3)\ndiff --git a/src/auths/spa.c b/src/auths/spa.c\nindex ff90d33a3..bfaccefda 100644\n--- a/src/auths/spa.c\n+++ b/src/auths/spa.c\n@@ -284,14 +284,13 @@ SPAAuthRequest request;\n SPAAuthChallenge challenge;\n SPAAuthResponse response;\n char msgbuf[2048];\n-char domain = NULL;\n-char username, password;\n+uschar domain = NULL, * username, * password;\n \n /* Code added by PH to expand the options /\n \n buffer = 0; /* Default no message when cancelled */\n \n-if (!(username = CS expand_string(ob->spa_username)))\n+if (!(username = expand_string(ob->spa_username)))\n {\n if (f.expand_string_forcedfail) return CANCELLED;\n string_format(buffer, buffsize, \"expansion of \\\"%s\\\" failed in %s \"\n@@ -300,7 +299,7 @@ if (!(username = CS expand_string(ob->spa_username)))\n return ERROR;\n }\n \n-if (!(password = CS expand_string(ob->spa_password)))\n+if (!(password = expand_string(ob->spa_password)))\n {\n if (f.expand_string_forcedfail) return CANCELLED;\n string_format(buffer, buffsize, \"expansion of \\\"%s\\\" failed in %s \"\n@@ -310,7 +309,7 @@ if (!(password = CS expand_string(ob->spa_password)))\n }\n \n if (ob->spa_domain)\n- if (!(domain = CS expand_string(ob->spa_domain)))\n+ if (!(domain = expand_string(ob->spa_domain)))\n {\n if (f.expand_string_forcedfail) return CANCELLED;\n string_format(buffer, buffsize, \"expansion of \\\"%s\\\" failed in %s \"\n@@ -330,7 +329,7 @@ if (!smtp_read_response(sx, US buffer, buffsize, '3', timeout))\n \n DSPA(\"\\n\\n%s authenticator: using domain %s\\n\\n\", ablock->name, domain);\n \n-spa_build_auth_request(&request, CS username, domain);\n+spa_build_auth_request(&request, username, domain);\n spa_bits_to_base64(US msgbuf, US &request, spa_request_length(&request));\n \n DSPA(\"\\n\\n%s authenticator: sending request (%s)\\n\\n\", ablock->name, msgbuf);\n@@ -347,7 +346,7 @@ if (!smtp_read_response(sx, US buffer, buffsize, '3', timeout))\n DSPA(\"\\n\\n%s authenticator: challenge (%s)\\n\\n\", ablock->name, buffer + 4);\n spa_base64_to_bits(CS (&challenge), sizeof(challenge), CCS (buffer + 4));\n \n-spa_build_auth_response(&challenge, &response, CS username, CS password);\n+spa_build_auth_response(&challenge, &response, username, password);\n spa_bits_to_base64(US msgbuf, US &response, spa_request_length(&response));\n DSPA(\"\\n\\n%s authenticator: challenge response (%s)\\n\\n\", ablock->name, msgbuf);\n \n" } ]	{ "id": "exim-18133-patch-CVE-2023-42115-CVE-2023-42116-CVE-2023-42114.patch", "cves": [ "CVE-2023-42117", "CVE-2023-42119" ], "package": "exim", "incident_id": 18133, "patch_name": "patch-CVE-2023-42115-CVE-2023-42116-CVE-2023-42114.patch", "tier": "identical", "language": "c", "patch_lines_changed": 131, "patch_files_count": 4, "total_tokens_est": 5077, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2023-42119", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2023-42119, CVE-2023-42117\n\n/* Print error string, then die /\n\n## Package\nexim\n\n## Upstream Fix\n```diff\ndiff -ru exim-4.92.orig/src/exim.c exim-4.92/src/exim.c\n--- exim-4.92.orig/src/exim.c\t2019-02-11 13:17:06.489418000 +0100\n+++ exim-4.92/src/exim.c\t2019-02-11 13:34:50.663777000 +0100\n@@ -683,6 +683,9 @@\n \n \n / Print error string, then die /\n+#ifdef __GNUC__\n+static void exim_fail(const char fmt, ...) __attribute__((format (printf, 1, 2)));\n+#endif\n static void\n exim_fail(const char * fmt, ...)\n {\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff -ru exim-4.92.orig/src/exim.c exim-4.92/src/exim.c\n--- exim-4.92.orig/src/exim.c\t2019-02-11 13:17:06.489418000 +0100\n+++ exim-4.92/src/exim.c\t2019-02-11 13:34:50.663777000 +0100\n@@ -683,6 +683,9 @@\n \n \n /* Print error string, then die /\n+#ifdef __GNUC__\n+static void exim_fail(const char fmt, ...) __attribute__((format (printf, 1, 2)));\n+#endif\n static void\n exim_fail(const char * fmt, ...)\n {\n" } ]	{ "id": "exim-18133-gnu_printf.patch", "cves": [ "CVE-2023-42117", "CVE-2023-42119" ], "package": "exim", "incident_id": 18133, "patch_name": "gnu_printf.patch", "tier": "identical", "language": "c", "patch_lines_changed": 3, "patch_files_count": 0, "total_tokens_est": 317, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2023-42119", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2023-42119, CVE-2023-42117\n\nindex 36c9f423b..4986e4657 100644\n\n## Package\nexim\n\n## Files to modify\n- src/expand.c\n- src/functions.h\n- src/string.c\n\n## Upstream Fix\n```diff\ndiff --git a/src/expand.c b/src/expand.c\nindex 36c9f423b..4986e4657 100644\n--- a/src/expand.c\n+++ b/src/expand.c\n@@ -2650,9 +2650,17 @@ switch(cond_type = identify_operator(&s, &opname))\n case ECOND_ISIP:\n case ECOND_ISIP4:\n case ECOND_ISIP6:\n- rc = string_is_ip_address(sub[0], NULL);\n- yield = ((cond_type == ECOND_ISIP)? (rc != 0) :\n- (cond_type == ECOND_ISIP4)? (rc == 4) : (rc == 6)) == testfor;\n+ {\n+ const uschar errp;\n+ const uschar *errpp;\n+ DEBUG(D_expand) errpp = &errp; else errpp = 0;\n+ if (0 == (rc = string_is_ip_addressX(sub[0], NULL, errpp)))\n+ DEBUG(D_expand) debug_printf(\"failed: %s\\n\", errp);\n+\n+ yield = ( cond_type == ECOND_ISIP ? rc != 0 :\n+ cond_type == ECOND_ISIP4 ? rc == 4 : rc == 6) == testfor;\n+ }\n+\n break;\n \n /* Various authentication tests - all optionally compiled /\ndiff --git a/src/functions.h b/src/functions.h\nindex 224666cb1..3c8104d25 100644\n--- a/src/functions.h\n+++ b/src/functions.h\n@@ -556,6 +556,7 @@ extern uschar string_dequote(const uschar *);\n extern uschar string_format_size(int, uschar );\n extern int string_interpret_escape(const uschar );\n extern int string_is_ip_address(const uschar , int );\n+extern int string_is_ip_addressX(const uschar , int , const uschar );\n #ifdef SUPPORT_I18N\n extern BOOL string_is_utf8(const uschar );\n #endif\ndiff --git a/src/string.c b/src/string.c\nindex a5161bb31..9aefc2b58 100644\n--- a/src/string.c\n+++ b/src/string.c\n@@ -29,123 +29,133 @@ Arguments:\n maskptr NULL if no mask is permitted to follow\n otherwise, points to an int where the offset of '/' is placed\n if there is no / followed by trailing digits, maskptr is set 0\n+ errp NULL if no diagnostic information is required, and if the netmask\n+ length should not be checked. Otherwise it is set pointing to a short\n+ descriptive text.\n \n Returns: 0 if the string is not a textual representation of an IP address\n 4 if it is an IPv4 address\n 6 if it is an IPv6 address\n-/\n \n+The legacy string_is_ip_address() function follows below.\n+/\n int\n-string_is_ip_address(const uschar s, int maskptr)\n-{\n-int yield = 4;\n+string_is_ip_addressX(const uschar ip_addr, int maskptr, const uschar errp) {\n+ struct addrinfo hints;\n+ struct addrinfo res;\n \n-/* If an optional mask is permitted, check for it. If found, pass back the\n-offset. /\n+ uschar slash, percent;\n \n-if (maskptr)\n+ uschar endp = 0;\n+ long int mask = 0;\n+ const uschar addr = 0;\n+\n+ / If there is a slash, but we didn't request a (optional) netmask,\n+ we return failure, as we do if the mask isn't a pure numerical value,\n+ or if it is negative. The actual length is checked later, once we know\n+ the address family. /\n+ if (slash = Ustrchr(ip_addr, '/'))\n {\n- const uschar ss = s + Ustrlen(s);\n- maskptr = 0;\n- if (s != ss && isdigit((--ss)))\n+ if (!maskptr)\n {\n- while (ss > s && isdigit(ss[-1])) ss--;\n- if (ss > s && (--ss) == '/') maskptr = ss - s;\n+ if (errp) errp = \"netmask found, but not requested\";\n+ return 0;\n }\n- }\n-\n-/ A colon anywhere in the string => IPv6 address /\n-\n-if (Ustrchr(s, ':') != NULL)\n- {\n- BOOL had_double_colon = FALSE;\n- BOOL v4end = FALSE;\n-\n- yield = 6;\n-\n- / An IPv6 address must start with hex digit or double colon. A single\n- colon is invalid. /\n-\n- if (s == ':' && (++s) != ':') return 0;\n-\n- / Now read up to 8 components consisting of up to 4 hex digits each. There\n- may be one and only one appearance of double colon, which implies any number\n- of binary zero bits. The number of preceding components is held in count. /\n \n- for (int count = 0; count < 8; count++)\n+ uschar rest;\n+ mask = Ustrtol(slash+1, &rest, 10);\n+ if (rest \|\| mask < 0)\n {\n- / If the end of the string is reached before reading 8 components, the\n- address is valid provided a double colon has been read. This also applies\n- if we hit the / that introduces a mask or the % that introduces the\n- interface specifier (scope id) of a link-local address. /\n-\n- if (s == 0 \|\| s == '%' \|\| s == '/') return had_double_colon ? yield : 0;\n-\n- /* If a component starts with an additional colon, we have hit a double\n- colon. This is permitted to appear once only, and counts as at least\n- one component. The final component may be of this form. /\n-\n- if (s == ':')\n- {\n- if (had_double_colon) return 0;\n- had_double_colon = TRUE;\n- s++;\n- continue;\n- }\n-\n- /* If the remainder of the string contains a dot but no colons, we\n- can expect a trailing IPv4 address. This is valid if either there has\n- been no double-colon and this is the 7th component (with the IPv4 address\n- being the 7th & 8th components), OR if there has been a double-colon\n- and fewer than 6 components. /\n-\n- if (Ustrchr(s, ':') == NULL && Ustrchr(s, '.') != NULL)\n- {\n- if ((!had_double_colon && count != 6) \|\|\n- (had_double_colon && count > 6)) return 0;\n- v4end = TRUE;\n- yield = 6;\n- break;\n- }\n-\n- / Check for at least one and not more than 4 hex digits for this\n- component. /\n-\n- if (!isxdigit(s++)) return 0;\n- if (isxdigit(s) && isxdigit((++s)) && isxdigit((++s))) s++;\n-\n- / If the component is terminated by colon and there is more to\n- follow, skip over the colon. If there is no more to follow the address is\n- invalid. /\n-\n- if (s == ':' && (++s) == 0) return 0;\n+ if (errp) errp = \"netmask not numeric or <0\";\n+ return 0;\n }\n \n- /* If about to handle a trailing IPv4 address, drop through. Otherwise\n- all is well if we are at the end of the string or at the mask or at a percent\n- sign, which introduces the interface specifier (scope id) of a link local\n- address. /\n+ maskptr = slash - ip_addr; /* offset of the slash /\n+ endp = slash;\n+ } else if (maskptr) maskptr = 0; /* no slash found /\n \n- if (!v4end)\n- return (s == 0 \|\| s == '%' \|\|\n- (s == '/' && maskptr != NULL && maskptr != 0))? yield : 0;\n+ / The interface-ID suffix (%<id>) is optional (for IPv6). If it\n+ exists, we check it syntactically. Later, if we know the address\n+ family is IPv4, we might reject it.\n+ The interface-ID is mutually exclusive with the netmask, to the\n+ best of my knowledge. /\n+ if (percent = Ustrchr(ip_addr, '%'))\n+ {\n+ if (slash)\n+ {\n+ if (errp) errp = \"interface-ID and netmask are mutually exclusive\";\n+ return 0;\n+ }\n+ for (uschar p = percent+1; p; p++)\n+ if (!isalnum(p) && !ispunct(p))\n+ {\n+ if (errp) errp = \"interface-ID must match [[:alnum:][:punct:]]\";\n+ return 0;\n+ }\n+ endp = percent;\n }\n \n-/ Test for IPv4 address, which may be the tail-end of an IPv6 address. /\n-\n-for (int i = 0; i < 4; i++)\n+ / inet_pton() can't parse netmasks and interface IDs, so work on a shortened copy\n+ allocated on the current stack /\n+ if (endp) {\n+ ptrdiff_t l = endp - ip_addr;\n+ if (l > 255)\n+ {\n+ if (errp) errp = \"rudiculous long ip address string\";\n+ return 0;\n+ }\n+ addr = alloca(l+1); /* BSD does not have strndupa() /\n+ Ustrncpy((uschar )addr, ip_addr, l);\n+ ((uschar)addr)[l] = '\\0';\n+ } else addr = ip_addr;\n+\n+ int af;\n+ union { /* we do not need this, but inet_pton() needs a place for storage /\n+ struct in_addr sa4;\n+ struct in6_addr sa6;\n+ } sa;\n+\n+ af = Ustrchr(addr, ':') ? AF_INET6 : AF_INET;\n+ if (!inet_pton(af, addr, &sa))\n {\n- long n;\n- uschar end;\n-\n- if (i != 0 && s++ != '.') return 0;\n- n = strtol(CCS s, CSS &end, 10);\n- if (n > 255 \|\| n < 0 \|\| end <= s \|\| end > s+3) return 0;\n- s = end;\n+ if (errp) errp = af == AF_INET6 ? \"IP address string not parsable as IPv6\"\n+ : \"IP address string not parsable IPv4\";\n+ return 0;\n }\n+ /* we do not check the values of the mask here, as\n+ this is done on the callers side (but I don't understand why), so\n+ actually I'd like to do it here, but it breaks at least 0002 /\n+ switch (af)\n+ {\n+ case AF_INET6:\n+ if (errp && mask > 128)\n+ {\n+ errp = \"IPv6 netmask value must not be >128\";\n+ return 0;\n+ }\n+ return 6;\n+ case AF_INET:\n+ if (percent)\n+ {\n+ if (errp) errp = \"IPv4 address string must not have an interface-ID\";\n+ return 0;\n+ }\n+ if (errp && mask > 32) {\n+ errp = \"IPv4 netmask value must not be >32\";\n+ return 0;\n+ }\n+ return 4;\n+ default:\n+ if (errp) errp = \"unknown address family (should not happen)\";\n+ return 0;\n+ }\n+}\n \n-return !s \|\| (s == '/' && maskptr && maskptr != 0) ? yield : 0;\n+int\n+string_is_ip_address(const uschar ip_addr, int maskptr) {\n+ return string_is_ip_addressX(ip_addr, maskptr, 0);\n }\n+\n #endif /* COMPILE_UTILITY /\n \n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff --git a/src/expand.c b/src/expand.c\nindex 36c9f423b..4986e4657 100644\n--- a/src/expand.c\n+++ b/src/expand.c\n@@ -2650,9 +2650,17 @@ switch(cond_type = identify_operator(&s, &opname))\n case ECOND_ISIP:\n case ECOND_ISIP4:\n case ECOND_ISIP6:\n- rc = string_is_ip_address(sub[0], NULL);\n- yield = ((cond_type == ECOND_ISIP)? (rc != 0) :\n- (cond_type == ECOND_ISIP4)? (rc == 4) : (rc == 6)) == testfor;\n+ {\n+ const uschar errp;\n+ const uschar errpp;\n+ DEBUG(D_expand) errpp = &errp; else errpp = 0;\n+ if (0 == (rc = string_is_ip_addressX(sub[0], NULL, errpp)))\n+ DEBUG(D_expand) debug_printf(\"failed: %s\\n\", errp);\n+\n+ yield = ( cond_type == ECOND_ISIP ? rc != 0 :\n+ cond_type == ECOND_ISIP4 ? rc == 4 : rc == 6) == testfor;\n+ }\n+\n break;\n \n /* Various authentication tests - all optionally compiled /\ndiff --git a/src/functions.h b/src/functions.h\nindex 224666cb1..3c8104d25 100644\n--- a/src/functions.h\n+++ b/src/functions.h\n@@ -556,6 +556,7 @@ extern uschar string_dequote(const uschar *);\n extern uschar string_format_size(int, uschar );\n extern int string_interpret_escape(const uschar );\n extern int string_is_ip_address(const uschar , int );\n+extern int string_is_ip_addressX(const uschar , int , const uschar );\n #ifdef SUPPORT_I18N\n extern BOOL string_is_utf8(const uschar );\n #endif\ndiff --git a/src/string.c b/src/string.c\nindex a5161bb31..9aefc2b58 100644\n--- a/src/string.c\n+++ b/src/string.c\n@@ -29,123 +29,133 @@ Arguments:\n maskptr NULL if no mask is permitted to follow\n otherwise, points to an int where the offset of '/' is placed\n if there is no / followed by trailing digits, maskptr is set 0\n+ errp NULL if no diagnostic information is required, and if the netmask\n+ length should not be checked. Otherwise it is set pointing to a short\n+ descriptive text.\n \n Returns: 0 if the string is not a textual representation of an IP address\n 4 if it is an IPv4 address\n 6 if it is an IPv6 address\n-/\n \n+The legacy string_is_ip_address() function follows below.\n+/\n int\n-string_is_ip_address(const uschar s, int maskptr)\n-{\n-int yield = 4;\n+string_is_ip_addressX(const uschar ip_addr, int maskptr, const uschar errp) {\n+ struct addrinfo hints;\n+ struct addrinfo res;\n \n-/* If an optional mask is permitted, check for it. If found, pass back the\n-offset. /\n+ uschar slash, percent;\n \n-if (maskptr)\n+ uschar endp = 0;\n+ long int mask = 0;\n+ const uschar addr = 0;\n+\n+ / If there is a slash, but we didn't request a (optional) netmask,\n+ we return failure, as we do if the mask isn't a pure numerical value,\n+ or if it is negative. The actual length is checked later, once we know\n+ the address family. /\n+ if (slash = Ustrchr(ip_addr, '/'))\n {\n- const uschar ss = s + Ustrlen(s);\n- maskptr = 0;\n- if (s != ss && isdigit((--ss)))\n+ if (!maskptr)\n {\n- while (ss > s && isdigit(ss[-1])) ss--;\n- if (ss > s && (--ss) == '/') maskptr = ss - s;\n+ if (errp) errp = \"netmask found, but not requested\";\n+ return 0;\n }\n- }\n-\n-/ A colon anywhere in the string => IPv6 address /\n-\n-if (Ustrchr(s, ':') != NULL)\n- {\n- BOOL had_double_colon = FALSE;\n- BOOL v4end = FALSE;\n-\n- yield = 6;\n-\n- / An IPv6 address must start with hex digit or double colon. A single\n- colon is invalid. /\n-\n- if (s == ':' && (++s) != ':') return 0;\n-\n- / Now read up to 8 components consisting of up to 4 hex digits each. There\n- may be one and only one appearance of double colon, which implies any number\n- of binary zero bits. The number of preceding components is held in count. /\n \n- for (int count = 0; count < 8; count++)\n+ uschar rest;\n+ mask = Ustrtol(slash+1, &rest, 10);\n+ if (rest \|\| mask < 0)\n {\n- / If the end of the string is reached before reading 8 components, the\n- address is valid provided a double colon has been read. This also applies\n- if we hit the / that introduces a mask or the % that introduces the\n- interface specifier (scope id) of a link-local address. /\n-\n- if (s == 0 \|\| s == '%' \|\| s == '/') return had_double_colon ? yield : 0;\n-\n- /* If a component starts with an additional colon, we have hit a double\n- colon. This is permitted to appear once only, and counts as at least\n- one component. The final component may be of this form. /\n-\n- if (s == ':')\n- {\n- if (had_double_colon) return 0;\n- had_double_colon = TRUE;\n- s++;\n- continue;\n- }\n-\n- /* If the remainder of the string contains a dot but no colons, we\n- can expect a trailing IPv4 address. This is valid if either there has\n- been no double-colon and this is the 7th component (with the IPv4 address\n- being the 7th & 8th components), OR if there has been a double-colon\n- and fewer than 6 components. /\n-\n- if (Ustrchr(s, ':') == NULL && Ustrchr(s, '.') != NULL)\n- {\n- if ((!had_double_colon && count != 6) \|\|\n- (had_double_colon && count > 6)) return 0;\n- v4end = TRUE;\n- yield = 6;\n- break;\n- }\n-\n- / Check for at least one and not more than 4 hex digits for this\n- component. /\n-\n- if (!isxdigit(s++)) return 0;\n- if (isxdigit(s) && isxdigit((++s)) && isxdigit((++s))) s++;\n-\n- / If the component is terminated by colon and there is more to\n- follow, skip over the colon. If there is no more to follow the address is\n- invalid. /\n-\n- if (s == ':' && (++s) == 0) return 0;\n+ if (errp) errp = \"netmask not numeric or <0\";\n+ return 0;\n }\n \n- /* If about to handle a trailing IPv4 address, drop through. Otherwise\n- all is well if we are at the end of the string or at the mask or at a percent\n- sign, which introduces the interface specifier (scope id) of a link local\n- address. /\n+ maskptr = slash - ip_addr; /* offset of the slash /\n+ endp = slash;\n+ } else if (maskptr) maskptr = 0; /* no slash found /\n \n- if (!v4end)\n- return (s == 0 \|\| s == '%' \|\|\n- (s == '/' && maskptr != NULL && maskptr != 0))? yield : 0;\n+ / The interface-ID suffix (%<id>) is optional (for IPv6). If it\n+ exists, we check it syntactically. Later, if we know the address\n+ family is IPv4, we might reject it.\n+ The interface-ID is mutually exclusive with the netmask, to the\n+ best of my knowledge. /\n+ if (percent = Ustrchr(ip_addr, '%'))\n+ {\n+ if (slash)\n+ {\n+ if (errp) errp = \"interface-ID and netmask are mutually exclusive\";\n+ return 0;\n+ }\n+ for (uschar p = percent+1; p; p++)\n+ if (!isalnum(p) && !ispunct(p))\n+ {\n+ if (errp) errp = \"interface-ID must match [[:alnum:][:punct:]]\";\n+ return 0;\n+ }\n+ endp = percent;\n }\n \n-/ Test for IPv4 address, which may be the tail-end of an IPv6 address. /\n-\n-for (int i = 0; i < 4; i++)\n+ / inet_pton() can't parse netmasks and interface IDs, so work on a shortened copy\n+ allocated on the current stack /\n+ if (endp) {\n+ ptrdiff_t l = endp - ip_addr;\n+ if (l > 255)\n+ {\n+ if (errp) errp = \"rudiculous long ip address string\";\n+ return 0;\n+ }\n+ addr = alloca(l+1); /* BSD does not have strndupa() /\n+ Ustrncpy((uschar )addr, ip_addr, l);\n+ ((uschar)addr)[l] = '\\0';\n+ } else addr = ip_addr;\n+\n+ int af;\n+ union { /* we do not need this, but inet_pton() needs a place for storage /\n+ struct in_addr sa4;\n+ struct in6_addr sa6;\n+ } sa;\n+\n+ af = Ustrchr(addr, ':') ? AF_INET6 : AF_INET;\n+ if (!inet_pton(af, addr, &sa))\n {\n- long n;\n- uschar end;\n-\n- if (i != 0 && s++ != '.') return 0;\n- n = strtol(CCS s, CSS &end, 10);\n- if (n > 255 \|\| n < 0 \|\| end <= s \|\| end > s+3) return 0;\n- s = end;\n+ if (errp) errp = af == AF_INET6 ? \"IP address string not parsable as IPv6\"\n+ : \"IP address string not parsable IPv4\";\n+ return 0;\n }\n+ /* we do not check the values of the mask here, as\n+ this is done on the callers side (but I don't understand why), so\n+ actually I'd like to do it here, but it breaks at least 0002 /\n+ switch (af)\n+ {\n+ case AF_INET6:\n+ if (errp && mask > 128)\n+ {\n+ errp = \"IPv6 netmask value must not be >128\";\n+ return 0;\n+ }\n+ return 6;\n+ case AF_INET:\n+ if (percent)\n+ {\n+ if (errp) errp = \"IPv4 address string must not have an interface-ID\";\n+ return 0;\n+ }\n+ if (errp && mask > 32) {\n+ errp = \"IPv4 netmask value must not be >32\";\n+ return 0;\n+ }\n+ return 4;\n+ default:\n+ if (errp) errp = \"unknown address family (should not happen)\";\n+ return 0;\n+ }\n+}\n \n-return !s \|\| (s == '/' && maskptr && maskptr != 0) ? yield : 0;\n+int\n+string_is_ip_address(const uschar ip_addr, int maskptr) {\n+ return string_is_ip_addressX(ip_addr, maskptr, 0);\n }\n+\n #endif /* COMPILE_UTILITY */\n \n \n" } ]	{ "id": "exim-18133-patch-CVE-2023-42117.patch", "cves": [ "CVE-2023-42117", "CVE-2023-42119" ], "package": "exim", "incident_id": 18133, "patch_name": "patch-CVE-2023-42117.patch", "tier": "identical", "language": "c", "patch_lines_changed": 215, "patch_files_count": 3, "total_tokens_est": 4666, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": "NOASSERTION", "cve_id": "CVE-2023-42119", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-26682\n\n===================================================================\n\n## Package\nlibass\n\n## Files to modify\n- libass/ass_outline.c\n- libass/ass_outline.h\n- libass/ass_rasterizer.c\n\n## Upstream Fix\n```diff\nIndex: libass-0.14.0/libass/ass_outline.c\n===================================================================\n--- libass-0.14.0.orig/libass/ass_outline.c\t2017-10-31 13:14:11.000000000 +0100\n+++ libass-0.14.0/libass/ass_outline.c\t2021-03-16 09:14:17.114485654 +0100\n@@ -47,6 +47,11 @@ static void outline_clear(ASS_Outline o\n outline->n_segments = outline->max_segments = 0;\n }\n \n+static bool valid_point(const FT_Vector pt)\n+{\n+ return abs(pt->x) <= OUTLINE_MAX && abs(pt->y) <= OUTLINE_MAX;\n+}\n+\n bool outline_convert(ASS_Outline outline, const FT_Outline source)\n {\n if (!source \|\| !source->n_points) {\n@@ -77,12 +82,16 @@ bool outline_convert(ASS_Outline outlin\n continue;\n }\n \n+ if (!valid_point(source->points + j))\n+ goto fail;\n switch (FT_CURVE_TAG(source->tags[j])) {\n case FT_CURVE_TAG_ON:\n st = S_ON;\n break;\n \n case FT_CURVE_TAG_CONIC:\n+ if (!valid_point(source->points + last))\n+ goto fail;\n pt.x = source->points[last].x;\n pt.y = -source->points[last].y;\n switch (FT_CURVE_TAG(source->tags[last])) {\n@@ -110,6 +119,8 @@ bool outline_convert(ASS_Outline outlin\n outline->points[outline->n_points++] = pt;\n \n for (j++; j <= last; j++) {\n+ if (!valid_point(source->points + j))\n+ goto fail;\n switch (FT_CURVE_TAG(source->tags[j])) {\n case FT_CURVE_TAG_ON:\n switch (st) {\n@@ -236,6 +247,9 @@ void outline_free(ASS_Outline outline)\n /\n bool outline_add_point(ASS_Outline outline, ASS_Vector pt, char segment)\n {\n+ if(abs(pt.x) > OUTLINE_MAX \|\| abs(pt.y) > OUTLINE_MAX)\n+ return false;\n+\n if (outline->n_points >= outline->max_points) {\n size_t new_size = 2 outline->max_points;\n if (!ASS_REALLOC_ARRAY(outline->points, new_size))\n@@ -1303,7 +1317,7 @@ bool outline_stroke(ASS_Outline result,\n {\n const int dir = 3;\n int rad = FFMAX(xbord, ybord);\n- assert(rad >= eps);\n+ assert(rad >= eps && rad <= OUTLINE_MAX);\n \n result->n_points = result->n_segments = 0;\n result1->n_points = result1->n_segments = 0;\n@@ -1329,12 +1343,10 @@ bool outline_stroke(ASS_Outline result,\n str.err_c = 390 * rel_err * rel_err;\n str.err_a = e;\n \n- for (size_t i = 0; i < path->n_points; i++) {\n- if (path->points[i].x < OUTLINE_MIN \|\| path->points[i].x > OUTLINE_MAX)\n- return false;\n- if (path->points[i].y < OUTLINE_MIN \|\| path->points[i].y > OUTLINE_MAX)\n- return false;\n- }\n+#ifndef NDEBUG\n+ for (size_t i = 0; i < path->n_points; i++)\n+ assert(abs(path->points[i].x) <= OUTLINE_MAX && abs(path->points[i].y) <= OUTLINE_MAX);\n+#endif\n \n ASS_Vector start = path->points, cur = start;\n for (size_t i = 0; i < path->n_segments; i++) {\nIndex: libass-0.14.0/libass/ass_outline.h\n===================================================================\n--- libass-0.14.0.orig/libass/ass_outline.h\t2017-10-31 13:14:11.000000000 +0100\n+++ libass-0.14.0/libass/ass_outline.h\t2021-03-16 09:14:17.114485654 +0100\n@@ -83,8 +83,9 @@ typedef struct {\n char segments;\n } ASS_Outline;\n \n-#define OUTLINE_MIN (-((int32_t) 1 << 28))\n+// ouline point coordinates should always be in [-OUTLINE_MAX, +OUTLINE_MAX] range\n #define OUTLINE_MAX (((int32_t) 1 << 28) - 1)\n+// cubic spline splitting requires 8 OUTLINE_MAX + 4 <= INT32_MAX\n \n bool outline_alloc(ASS_Outline outline, size_t n_points, size_t n_segments);\n bool outline_convert(ASS_Outline outline, const FT_Outline source);\nIndex: libass-0.14.0/libass/ass_rasterizer.c\n===================================================================\n--- libass-0.14.0.orig/libass/ass_rasterizer.c\t2017-10-31 13:14:11.000000000 +0100\n+++ libass-0.14.0/libass/ass_rasterizer.c\t2021-03-16 09:14:17.114485654 +0100\n@@ -269,12 +269,10 @@ bool rasterizer_set_outline(RasterizerDa\n }\n rst->size[0] = rst->n_first;\n \n- for (size_t i = 0; i < path->n_points; i++) {\n- if (path->points[i].x < OUTLINE_MIN \|\| path->points[i].x > OUTLINE_MAX)\n- return false;\n- if (path->points[i].y < OUTLINE_MIN \|\| path->points[i].y > OUTLINE_MAX)\n- return false;\n- }\n+#ifndef NDEBUG\n+ for (size_t i = 0; i < path->n_points; i++)\n+ assert(abs(path->points[i].x) <= OUTLINE_MAX && abs(path->points[i].y) <= OUTLINE_MAX);\n+#endif\n \n ASS_Vector start = path->points, cur = start;\n for (size_t i = 0; i < path->n_segments; i++) {\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: libass-0.14.0/libass/ass_outline.c\n===================================================================\n--- libass-0.14.0.orig/libass/ass_outline.c\t2017-10-31 13:14:11.000000000 +0100\n+++ libass-0.14.0/libass/ass_outline.c\t2021-03-16 09:14:17.114485654 +0100\n@@ -47,6 +47,11 @@ static void outline_clear(ASS_Outline o\n outline->n_segments = outline->max_segments = 0;\n }\n \n+static bool valid_point(const FT_Vector pt)\n+{\n+ return abs(pt->x) <= OUTLINE_MAX && abs(pt->y) <= OUTLINE_MAX;\n+}\n+\n bool outline_convert(ASS_Outline outline, const FT_Outline source)\n {\n if (!source \|\| !source->n_points) {\n@@ -77,12 +82,16 @@ bool outline_convert(ASS_Outline outlin\n continue;\n }\n \n+ if (!valid_point(source->points + j))\n+ goto fail;\n switch (FT_CURVE_TAG(source->tags[j])) {\n case FT_CURVE_TAG_ON:\n st = S_ON;\n break;\n \n case FT_CURVE_TAG_CONIC:\n+ if (!valid_point(source->points + last))\n+ goto fail;\n pt.x = source->points[last].x;\n pt.y = -source->points[last].y;\n switch (FT_CURVE_TAG(source->tags[last])) {\n@@ -110,6 +119,8 @@ bool outline_convert(ASS_Outline outlin\n outline->points[outline->n_points++] = pt;\n \n for (j++; j <= last; j++) {\n+ if (!valid_point(source->points + j))\n+ goto fail;\n switch (FT_CURVE_TAG(source->tags[j])) {\n case FT_CURVE_TAG_ON:\n switch (st) {\n@@ -236,6 +247,9 @@ void outline_free(ASS_Outline outline)\n /\n bool outline_add_point(ASS_Outline outline, ASS_Vector pt, char segment)\n {\n+ if(abs(pt.x) > OUTLINE_MAX \|\| abs(pt.y) > OUTLINE_MAX)\n+ return false;\n+\n if (outline->n_points >= outline->max_points) {\n size_t new_size = 2 * outline->max_points;\n if (!ASS_REALLOC_ARRAY(outline->points, new_size))\n@@ -1303,7 +1317,7 @@ bool outline_stroke(ASS_Outline result,\n {\n const int dir = 3;\n int rad = FFMAX(xbord, ybord);\n- assert(rad >= eps);\n+ assert(rad >= eps && rad <= OUTLINE_MAX);\n \n result->n_points = result->n_segments = 0;\n result1->n_points = result1->n_segments = 0;\n@@ -1329,12 +1343,10 @@ bool outline_stroke(ASS_Outline result,\n str.err_c = 390 * rel_err * rel_err;\n str.err_a = e;\n \n- for (size_t i = 0; i < path->n_points; i++) {\n- if (path->points[i].x < OUTLINE_MIN \|\| path->points[i].x > OUTLINE_MAX)\n- return false;\n- if (path->points[i].y < OUTLINE_MIN \|\| path->points[i].y > OUTLINE_MAX)\n- return false;\n- }\n+#ifndef NDEBUG\n+ for (size_t i = 0; i < path->n_points; i++)\n+ assert(abs(path->points[i].x) <= OUTLINE_MAX && abs(path->points[i].y) <= OUTLINE_MAX);\n+#endif\n \n ASS_Vector start = path->points, cur = start;\n for (size_t i = 0; i < path->n_segments; i++) {\nIndex: libass-0.14.0/libass/ass_outline.h\n===================================================================\n--- libass-0.14.0.orig/libass/ass_outline.h\t2017-10-31 13:14:11.000000000 +0100\n+++ libass-0.14.0/libass/ass_outline.h\t2021-03-16 09:14:17.114485654 +0100\n@@ -83,8 +83,9 @@ typedef struct {\n char segments;\n } ASS_Outline;\n \n-#define OUTLINE_MIN (-((int32_t) 1 << 28))\n+// ouline point coordinates should always be in [-OUTLINE_MAX, +OUTLINE_MAX] range\n #define OUTLINE_MAX (((int32_t) 1 << 28) - 1)\n+// cubic spline splitting requires 8 OUTLINE_MAX + 4 <= INT32_MAX\n \n bool outline_alloc(ASS_Outline outline, size_t n_points, size_t n_segments);\n bool outline_convert(ASS_Outline outline, const FT_Outline source);\nIndex: libass-0.14.0/libass/ass_rasterizer.c\n===================================================================\n--- libass-0.14.0.orig/libass/ass_rasterizer.c\t2017-10-31 13:14:11.000000000 +0100\n+++ libass-0.14.0/libass/ass_rasterizer.c\t2021-03-16 09:14:17.114485654 +0100\n@@ -269,12 +269,10 @@ bool rasterizer_set_outline(RasterizerDa\n }\n rst->size[0] = rst->n_first;\n \n- for (size_t i = 0; i < path->n_points; i++) {\n- if (path->points[i].x < OUTLINE_MIN \|\| path->points[i].x > OUTLINE_MAX)\n- return false;\n- if (path->points[i].y < OUTLINE_MIN \|\| path->points[i].y > OUTLINE_MAX)\n- return false;\n- }\n+#ifndef NDEBUG\n+ for (size_t i = 0; i < path->n_points; i++)\n+ assert(abs(path->points[i].x) <= OUTLINE_MAX && abs(path->points[i].y) <= OUTLINE_MAX);\n+#endif\n \n ASS_Vector start = path->points, *cur = start;\n for (size_t i = 0; i < path->n_segments; i++) {\n" } ]	{ "id": "libass-15981-libass-CVE-2020-26682.patch", "cves": [ "CVE-2020-26682" ], "package": "libass", "incident_id": 15981, "patch_name": "libass-CVE-2020-26682.patch", "tier": "identical", "language": "c", "patch_lines_changed": 39, "patch_files_count": 3, "total_tokens_est": 2428, "has_source_context": false, "upstream_enriched": false, "suse_license": "ISC", "upstream_license": null, "cve_id": "CVE-2020-26682", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-11739, CVE-2020-11740, CVE-2020-11741, CVE-2020-11743, CVE-2020-11742\n\nx86/apic: fix disabling LVT0 in disconnect_bsp_APIC\n\n## Package\nxen\n\n## Files to modify\n- xen/arch/x86/apic.c\n\n## Target Source Code\n\n### arch/x86/apic.c\n\n#### disconnect_bsp_APIC() [lines 216-271]\n```c\n{\n APICCommonState apic_iter;\n\n switch (delivery_mode) {\n case APIC_DM_LOWPRI:\n / XXX: search for focus processor, arbitration /\n {\n int i, d;\n d = -1;\n for(i = 0; i < MAX_APIC_WORDS; i++) {\n if (deliver_bitmask[i]) {\n d = i 32 + apic_ffs_bit(deliver_bitmask[i]);\n break;\n }\n }\n if (d >= 0) {\n apic_iter = local_apics[d];\n if (apic_iter) {\n apic_set_irq(apic_iter, vector_num, trigger_mode);\n }\n }\n }\n return;\n\n case APIC_DM_FIXED:\n break;\n\n case APIC_DM_SMI:\n foreach_apic(apic_iter, deliver_bitmask,\n cpu_interrupt(CPU(apic_iter->cpu), CPU_INTERRUPT_SMI)\n );\n return;\n\n case APIC_DM_NMI:\n foreach_apic(apic_iter, deliver_bitmask,\n cpu_interrupt(CPU(apic_iter->cpu), CPU_INTERRUPT_NMI)\n );\n return;\n\n case APIC_DM_INIT:\n /* normal INIT IPI sent to processors /\n foreach_apic(apic_iter, deliver_bitmask,\n cpu_interrupt(CPU(apic_iter->cpu),\n CPU_INTERRUPT_INIT)\n );\n return;\n\n case APIC_DM_EXTINT:\n / handled in I/O APIC code /\n break;\n\n default:\n return;\n }\n\n foreach_apic(apic_iter, deliver_bitmask,\n```\n\n#### disconnect_bsp_APIC() [lines 225-335]\n```c\n for(i = 0; i < MAX_APIC_WORDS; i++) {\n if (deliver_bitmask[i]) {\n d = i 32 + apic_ffs_bit(deliver_bitmask[i]);\n break;\n }\n }\n if (d >= 0) {\n apic_iter = local_apics[d];\n if (apic_iter) {\n apic_set_irq(apic_iter, vector_num, trigger_mode);\n }\n }\n }\n return;\n\n case APIC_DM_FIXED:\n break;\n\n case APIC_DM_SMI:\n foreach_apic(apic_iter, deliver_bitmask,\n cpu_interrupt(CPU(apic_iter->cpu), CPU_INTERRUPT_SMI)\n );\n return;\n\n case APIC_DM_NMI:\n foreach_apic(apic_iter, deliver_bitmask,\n cpu_interrupt(CPU(apic_iter->cpu), CPU_INTERRUPT_NMI)\n );\n return;\n\n case APIC_DM_INIT:\n /* normal INIT IPI sent to processors /\n foreach_apic(apic_iter, deliver_bitmask,\n cpu_interrupt(CPU(apic_iter->cpu),\n CPU_INTERRUPT_INIT)\n );\n return;\n\n case APIC_DM_EXTINT:\n / handled in I/O APIC code /\n break;\n\n default:\n return;\n }\n\n foreach_apic(apic_iter, deliver_bitmask,\n apic_set_irq(apic_iter, vector_num, trigger_mode) );\n}\n\nvoid apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode,\n uint8_t vector_num, uint8_t trigger_mode)\n{\n uint32_t deliver_bitmask[MAX_APIC_WORDS];\n\n trace_apic_deliver_irq(dest, dest_mode, delivery_mode, vector_num,\n trigger_mode);\n\n apic_get_delivery_bitmask(deliver_bitmask, dest, dest_mode);\n apic_bus_deliver(deliver_bitmask, delivery_mode, vector_num, trigger_mode);\n}\n\nstatic void apic_set_base(APICCommonState s, uint64_t val)\n{\n s->apicbase = (val & 0xfffff000) \|\n (s->apicbase & (MSR_IA32_APICBASE_BSP \| MSR_IA32_APICBASE_ENABLE));\n /* if disabled, cannot be enabled again /\n if (!(val & MSR_IA32_APICBASE_ENABLE)) {\n s->apicbase &= ~MSR_IA32_APICBASE_ENABLE;\n cpu_clear_apic_feature(&s->cpu->env);\n s->spurious_vec &= ~APIC_SV_ENABLE;\n }\n}\n\nstatic void apic_set_tpr(APICCommonState s, uint8_t val)\n{\n /* Updates from cr8 are ignored while the VAPIC is active /\n if (!s->vapic_paddr) {\n s->tpr = val << 4;\n apic_update_irq(s);\n }\n}\n\nstatic uint8_t apic_get_tpr(APICCommonState s)\n{\n apic_sync_vapic(s, SYNC_FROM_VAPIC);\n return s->tpr >> 4;\n}\n\nint apic_get_ppr(APICCommonState s)\n{\n int tpr, isrv, ppr;\n\n tpr = (s->tpr >> 4);\n isrv = get_highest_priority_int(s->isr);\n if (isrv < 0)\n isrv = 0;\n isrv >>= 4;\n if (tpr >= isrv)\n ppr = s->tpr;\n else\n ppr = isrv << 4;\n return ppr;\n}\n\nstatic int apic_get_arb_pri(APICCommonState s)\n{\n /* XXX: arbitration /\n return 0;\n}\n\n```\n\n\n## Upstream Fix\n```diff\n# Commit 782b48b7f7319c07b044606d67a60875e53dd05b\n# Date 2020-01-29 14:47:00 +0100\n# Author Roger Pau Monné <roger.pau@citrix.com>\n# Committer Jan Beulich <jbeulich@suse.com>\nx86/apic: fix disabling LVT0 in disconnect_bsp_APIC\n\nThe Intel SDM states:\n\n\"When an illegal vector value (0 to 15) is written to a LVT entry and\nthe delivery mode is Fixed (bits 8-11 equal 0), the APIC may signal an\nillegal vector error, without regard to whether the mask bit is set or\nwhether an interrupt is actually seen on the input.\"\n\nAnd that's exactly what's currently done in disconnect_bsp_APIC when\nvirt_wire_setup is true and LVT LINT0 is being masked. By writing only\nAPIC_LVT_MASKED Xen is actually setting the vector to 0 and the\ndelivery mode to Fixed (0), and hence it triggers an APIC error even\nwhen the LVT entry is masked.\n\nThis would usually manifest when Xen is being shut down, as that's\nwhere disconnect_bsp_APIC is called:\n\n(XEN) APIC error on CPU0: 40(00)\n\nFix this by calling clear_local_APIC prior to setting the LVT LINT\nregisters which already clear LVT LINT0, and hence the troublesome\nwrite can be avoided as the register is already cleared.\n\nReported-by: Andrew Cooper <andrew.cooper3@citrix.com>\nSigned-off-by: Roger Pau Monné <roger.pau@citrix.com>\nReviewed-by: Jan Beulich <jbeulich@suse.com>\n\n--- a/xen/arch/x86/apic.c\n+++ b/xen/arch/x86/apic.c\n@@ -257,6 +257,8 @@ void disconnect_bsp_APIC(int virt_wire_s\n / Go back to Virtual Wire compatibility mode /\n unsigned long value;\n \n+ clear_local_APIC();\n+\n / For the spurious interrupt use vector F, and enable it /\n value = apic_read(APIC_SPIV);\n value &= ~APIC_VECTOR_MASK;\n@@ -274,10 +276,6 @@ void disconnect_bsp_APIC(int virt_wire_s\n value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXTINT);\n apic_write(APIC_LVT0, value);\n }\n- else {\n- / Disable LVT0 /\n- apic_write(APIC_LVT0, APIC_LVT_MASKED);\n- }\n \n / For LVT1 make it edge triggered, active high, nmi and enabled /\n value = apic_read(APIC_LVT1);\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "# Commit 782b48b7f7319c07b044606d67a60875e53dd05b\n# Date 2020-01-29 14:47:00 +0100\n# Author Roger Pau Monné <roger.pau@citrix.com>\n# Committer Jan Beulich <jbeulich@suse.com>\nx86/apic: fix disabling LVT0 in disconnect_bsp_APIC\n\nThe Intel SDM states:\n\n\"When an illegal vector value (0 to 15) is written to a LVT entry and\nthe delivery mode is Fixed (bits 8-11 equal 0), the APIC may signal an\nillegal vector error, without regard to whether the mask bit is set or\nwhether an interrupt is actually seen on the input.\"\n\nAnd that's exactly what's currently done in disconnect_bsp_APIC when\nvirt_wire_setup is true and LVT LINT0 is being masked. By writing only\nAPIC_LVT_MASKED Xen is actually setting the vector to 0 and the\ndelivery mode to Fixed (0), and hence it triggers an APIC error even\nwhen the LVT entry is masked.\n\nThis would usually manifest when Xen is being shut down, as that's\nwhere disconnect_bsp_APIC is called:\n\n(XEN) APIC error on CPU0: 40(00)\n\nFix this by calling clear_local_APIC prior to setting the LVT LINT\nregisters which already clear LVT LINT0, and hence the troublesome\nwrite can be avoided as the register is already cleared.\n\nReported-by: Andrew Cooper <andrew.cooper3@citrix.com>\nSigned-off-by: Roger Pau Monné <roger.pau@citrix.com>\nReviewed-by: Jan Beulich <jbeulich@suse.com>\n\n--- a/xen/arch/x86/apic.c\n+++ b/xen/arch/x86/apic.c\n@@ -257,6 +257,8 @@ void disconnect_bsp_APIC(int virt_wire_s\n / Go back to Virtual Wire compatibility mode /\n unsigned long value;\n \n+ clear_local_APIC();\n+\n / For the spurious interrupt use vector F, and enable it /\n value = apic_read(APIC_SPIV);\n value &= ~APIC_VECTOR_MASK;\n@@ -274,10 +276,6 @@ void disconnect_bsp_APIC(int virt_wire_s\n value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXTINT);\n apic_write(APIC_LVT0, value);\n }\n- else {\n- / Disable LVT0 /\n- apic_write(APIC_LVT0, APIC_LVT_MASKED);\n- }\n \n / For LVT1 make it edge triggered, active high, nmi and enabled */\n value = apic_read(APIC_LVT1);\n" } ]	{ "id": "xen-12484-5e318cd4-x86-apic-fix-disabling-LVT0.patch", "cves": [ "CVE-2020-11739", "CVE-2020-11740", "CVE-2020-11741", "CVE-2020-11742", "CVE-2020-11743" ], "package": "xen", "incident_id": 12484, "patch_name": "5e318cd4-x86-apic-fix-disabling-LVT0.patch", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 0, "total_tokens_est": 1193, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-2.0-only", "upstream_license": null, "cve_id": "CVE-2020-11739", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-11739, CVE-2020-11740, CVE-2020-11741, CVE-2020-11743, CVE-2020-11742\n\nFrom: Juergen Gross jgross@suse.com Fri Apr 3 13:03:40 2020 +0100\n\n## Package\nxen\n\n## Files to modify\n- tools/xenstore/xenstored_domain.c\n\n## Target Source Code\n\n### tools/xenstore/xenstored_domain.c\n\n#### domain_cleanup() [lines 218-252]\n```c\n\treturn 0;\n}\n\nstatic void domain_cleanup(void)\n{\n\txc_dominfo_t dominfo;\n\tstruct domain domain;\n\tint notify = 0;\n\n again:\n\tlist_for_each_entry(domain, &domains, list) {\n\t\tif (xc_domain_getinfo(xc_handle, domain->domid, 1,\n\t\t\t\t &dominfo) == 1 &&\n\t\t dominfo.domid == domain->domid) {\n\t\t\tif ((dominfo.crashed \|\| dominfo.shutdown)\n\t\t\t && !domain->shutdown) {\n\t\t\t\tdomain->shutdown = 1;\n\t\t\t\tnotify = 1;\n\t\t\t}\n\t\t\tif (!dominfo.dying)\n\t\t\t\tcontinue;\n\t\t}\n\t\tif (domain->conn) {\n\t\t\ttalloc_unlink(talloc_autofree_context(), domain->conn);\n\t\t\tdomain->conn = NULL;\n\t\t\tnotify = 0; /* destroy_domain() fires the watch /\n\t\t\tgoto again;\n\t\t}\n\t}\n\n\tif (notify)\n\t\tfire_watches(NULL, NULL, \"@releaseDomain\", false);\n}\n\n/ We scan all domains rather than use the information given here. /\n```\n\n\n### Type definitions\n\n```c\n/ from xenstored_core.h /\nstruct connection\n{\n\tstruct list_head list;\n\n\t/ The file descriptor we came in on. /\n\tint fd;\n\t/ The index of pollfd in global pollfd array /\n\tint pollfd_idx;\n\n\t/ Who am I? 0 for socket connections. /\n\tunsigned int id;\n\n\t/ Is this a read-only connection? /\n\tbool can_write;\n\n\t/ Buffered incoming data. /\n\tstruct buffered_data in;\n\n\t/* Buffered output data /\n\tstruct list_head out_list;\n\n\t/ Transaction context for current request (NULL if none). /\n\tstruct transaction transaction;\n\n\t/* List of in-progress transactions. /\n\tstruct list_head transaction_list;\n\tuint32_t next_transaction_id;\n\tunsigned int transaction_started;\n\n\t/ The domain I'm associated with, if any. /\n\tstruct domain domain;\n\n /* The target of the domain I'm associated with. /\n struct connection target;\n\n\t/* My watches. /\n\tstruct list_head watches;\n\n\t/ Methods for communicating over this connection: write can be NULL /\n\tconnwritefn_t write;\n\tconnreadfn_t read;\n};\n```\n\n\n## Upstream Fix\n```diff\nSubject: tools/xenstore: fix a use after free problem in xenstored\nFrom: Juergen Gross jgross@suse.com Fri Apr 3 13:03:40 2020 +0100\nDate: Fri Apr 3 17:57:51 2020 +0100:\nGit: bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8\n\nCommit 562a1c0f7ef3fb (\"tools/xenstore: dont unlink connection object\ntwice\") introduced a potential use after free problem in\ndomain_cleanup(): after calling talloc_unlink() for domain->conn\ndomain->conn is set to NULL. The problem is that domain is registered\nas talloc child of domain->conn, so it might be freed by the\ntalloc_unlink() call.\n\nWith Xenstore being single threaded there are normally no concurrent\nmemory allocations running and freeing a virtual memory area normally\ndoesn't result in that area no longer being accessible. A problem\ncould occur only in case either a signal received results in some\nmemory allocation done in the signal handler (SIGHUP is a primary\ncandidate leading to reopening the log file), or in case the talloc\nframework would do some internal memory allocation during freeing of\nthe memory (which would lead to clobbering of the freed domain\nstructure).\n\nFixes: 562a1c0f7ef3fb (\"tools/xenstore: dont unlink connection object twice\")\nSigned-off-by: Juergen Gross <jgross@suse.com>\nReviewed-by: Julien Grall <jgrall@amazon.com>\n\ndiff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c\nindex baddaba5df..5858185211 100644\n--- a/tools/xenstore/xenstored_domain.c\n+++ b/tools/xenstore/xenstored_domain.c\n@@ -222,6 +222,7 @@ static void domain_cleanup(void)\n {\n \txc_dominfo_t dominfo;\n \tstruct domain domain;\n+\tstruct connection conn;\n \tint notify = 0;\n \n again:\n@@ -238,8 +239,10 @@ static void domain_cleanup(void)\n \t\t\t\tcontinue;\n \t\t}\n \t\tif (domain->conn) {\n-\t\t\ttalloc_unlink(talloc_autofree_context(), domain->conn);\n+\t\t\t/ domain is a talloc child of domain->conn. /\n+\t\t\tconn = domain->conn;\n \t\t\tdomain->conn = NULL;\n+\t\t\ttalloc_unlink(talloc_autofree_context(), conn);\n \t\t\tnotify = 0; / destroy_domain() fires the watch /\n \t\t\tgoto again;\n \t\t}\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Subject: tools/xenstore: fix a use after free problem in xenstored\nFrom: Juergen Gross jgross@suse.com Fri Apr 3 13:03:40 2020 +0100\nDate: Fri Apr 3 17:57:51 2020 +0100:\nGit: bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8\n\nCommit 562a1c0f7ef3fb (\"tools/xenstore: dont unlink connection object\ntwice\") introduced a potential use after free problem in\ndomain_cleanup(): after calling talloc_unlink() for domain->conn\ndomain->conn is set to NULL. The problem is that domain is registered\nas talloc child of domain->conn, so it might be freed by the\ntalloc_unlink() call.\n\nWith Xenstore being single threaded there are normally no concurrent\nmemory allocations running and freeing a virtual memory area normally\ndoesn't result in that area no longer being accessible. A problem\ncould occur only in case either a signal received results in some\nmemory allocation done in the signal handler (SIGHUP is a primary\ncandidate leading to reopening the log file), or in case the talloc\nframework would do some internal memory allocation during freeing of\nthe memory (which would lead to clobbering of the freed domain\nstructure).\n\nFixes: 562a1c0f7ef3fb (\"tools/xenstore: dont unlink connection object twice\")\nSigned-off-by: Juergen Gross <jgross@suse.com>\nReviewed-by: Julien Grall <jgrall@amazon.com>\n\ndiff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c\nindex baddaba5df..5858185211 100644\n--- a/tools/xenstore/xenstored_domain.c\n+++ b/tools/xenstore/xenstored_domain.c\n@@ -222,6 +222,7 @@ static void domain_cleanup(void)\n {\n \txc_dominfo_t dominfo;\n \tstruct domain domain;\n+\tstruct connection conn;\n \tint notify = 0;\n \n again:\n@@ -238,8 +239,10 @@ static void domain_cleanup(void)\n \t\t\t\tcontinue;\n \t\t}\n \t\tif (domain->conn) {\n-\t\t\ttalloc_unlink(talloc_autofree_context(), domain->conn);\n+\t\t\t/ domain is a talloc child of domain->conn. /\n+\t\t\tconn = domain->conn;\n \t\t\tdomain->conn = NULL;\n+\t\t\ttalloc_unlink(talloc_autofree_context(), conn);\n \t\t\tnotify = 0; / destroy_domain() fires the watch */\n \t\t\tgoto again;\n \t\t}\n" } ]	{ "id": "xen-12484-5e876b0f-tools-xenstore-fix-use-after-free-in-xenstored.patch", "cves": [ "CVE-2020-11739", "CVE-2020-11740", "CVE-2020-11741", "CVE-2020-11742", "CVE-2020-11743" ], "package": "xen", "incident_id": 12484, "patch_name": "5e876b0f-tools-xenstore-fix-use-after-free-in-xenstored.patch", "tier": "identical", "language": "c", "patch_lines_changed": 5, "patch_files_count": 1, "total_tokens_est": 1165, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-2.0-only", "upstream_license": null, "cve_id": "CVE-2020-11739", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-11739, CVE-2020-11740, CVE-2020-11741, CVE-2020-11743, CVE-2020-11742\n\nAMD/IOMMU: restrict feature logging\n\n## Package\nxen\n\n## Files to modify\n- xen/drivers/passthrough/amd/iommu_detect.c\n\n## Target Source Code\n\n### drivers/passthrough/amd/iommu_detect.c\n\n#### get_iommu_features() [lines 58-102]\n```c\n return 0;\n}\n\nvoid __init get_iommu_features(struct amd_iommu iommu)\n{\n u32 low, high;\n int i = 0 ;\n static const char __initdata feature_str[] = {\n \"- Prefetch Pages Command\", \n \"- Peripheral Page Service Request\", \n \"- X2APIC Supported\", \n \"- NX bit Supported\", \n \"- Guest Translation\", \n \"- Reserved bit [5]\",\n \"- Invalidate All Command\", \n \"- Guest APIC supported\", \n \"- Hardware Error Registers\", \n \"- Performance Counters\", \n NULL\n };\n\n ASSERT( iommu->mmio_base );\n\n if ( !iommu_has_cap(iommu, PCI_CAP_EFRSUP_SHIFT) )\n {\n iommu->features = 0;\n return;\n }\n\n low = readl(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET);\n high = readl(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET + 4);\n\n iommu->features = ((u64)high << 32) \| low;\n\n printk(\"AMD-Vi: IOMMU Extended Features:\\n\");\n\n while ( feature_str[i] )\n {\n if ( amd_iommu_has_feature(iommu, i) )\n printk( \" %s\\n\", feature_str[i]);\n i++;\n }\n}\n\nint __init amd_iommu_detect_one_acpi(\n```\n\n\n## Upstream Fix\n```diff\n\nReferences: bsc#1135799\n\n# Commit 93ef224d63f9f04a0897d64981c619eb4816c0d3\n# Date 2019-07-02 13:27:39 +0200\n# Author Jan Beulich <jbeulich@suse.com>\n# Committer Jan Beulich <jbeulich@suse.com>\nAMD/IOMMU: restrict feature logging\n\nThe common case is all IOMMUs having the same features. Log them only\nfor the first IOMMU, or for any that have a differing feature set.\n\nRequested-by: Andrew Cooper <andrew.cooper3@citrix.com>\nSigned-off-by: Jan Beulich <jbeulich@suse.com>\nReviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>\nAcked-by: Brian Woods <brian.woods@amd.com>\n\n--- a/xen/drivers/passthrough/amd/iommu_detect.c\n+++ b/xen/drivers/passthrough/amd/iommu_detect.c\n@@ -62,6 +62,7 @@ void __init get_iommu_features(struct am\n {\n u32 low, high;\n int i = 0 ;\n+ const struct amd_iommu first;\n static const char __initdata feature_str[] = {\n \"- Prefetch Pages Command\", \n \"- Peripheral Page Service Request\", \n@@ -89,6 +90,11 @@ void __init get_iommu_features(struct am\n \n iommu->features = ((u64)high << 32) \| low;\n \n+ /* Don't log the same set of features over and over. /\n+ first = list_first_entry(&amd_iommu_head, struct amd_iommu, list);\n+ if ( iommu != first && iommu->features == first->features )\n+ return;\n+\n printk(\"AMD-Vi: IOMMU Extended Features:\\n\");\n \n while ( feature_str[i] )\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "\nReferences: bsc#1135799\n\n# Commit 93ef224d63f9f04a0897d64981c619eb4816c0d3\n# Date 2019-07-02 13:27:39 +0200\n# Author Jan Beulich <jbeulich@suse.com>\n# Committer Jan Beulich <jbeulich@suse.com>\nAMD/IOMMU: restrict feature logging\n\nThe common case is all IOMMUs having the same features. Log them only\nfor the first IOMMU, or for any that have a differing feature set.\n\nRequested-by: Andrew Cooper <andrew.cooper3@citrix.com>\nSigned-off-by: Jan Beulich <jbeulich@suse.com>\nReviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>\nAcked-by: Brian Woods <brian.woods@amd.com>\n\n--- a/xen/drivers/passthrough/amd/iommu_detect.c\n+++ b/xen/drivers/passthrough/amd/iommu_detect.c\n@@ -62,6 +62,7 @@ void __init get_iommu_features(struct am\n {\n u32 low, high;\n int i = 0 ;\n+ const struct amd_iommu first;\n static const char __initdata feature_str[] = {\n \"- Prefetch Pages Command\", \n \"- Peripheral Page Service Request\", \n@@ -89,6 +90,11 @@ void __init get_iommu_features(struct am\n \n iommu->features = ((u64)high << 32) \| low;\n \n+ / Don't log the same set of features over and over. */\n+ first = list_first_entry(&amd_iommu_head, struct amd_iommu, list);\n+ if ( iommu != first && iommu->features == first->features )\n+ return;\n+\n printk(\"AMD-Vi: IOMMU Extended Features:\\n\");\n \n while ( feature_str[i] )\n" } ]	{ "id": "xen-12484-5d1b3fab-AMD-IOMMU-restrict-feature-logging.patch", "cves": [ "CVE-2020-11739", "CVE-2020-11740", "CVE-2020-11741", "CVE-2020-11742", "CVE-2020-11743" ], "package": "xen", "incident_id": 12484, "patch_name": "5d1b3fab-AMD-IOMMU-restrict-feature-logging.patch", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 0, "total_tokens_est": 821, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-2.0-only", "upstream_license": null, "cve_id": "CVE-2020-11739", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-11739, CVE-2020-11740, CVE-2020-11741, CVE-2020-11743, CVE-2020-11742\n\nFrom: Jan Beulich jbeulich@suse.com Tue Apr 14 14:33:19 2020 +0200\n\n## Package\nxen\n\n## Files to modify\n- xen/common/xenoprof.c\n- xen/include/xen/xenoprof.h\n\n## Target Source Code\n\n### xen/common/xenoprof.c\n\n#### add_passive_list() [lines 421-481]\n```c\n return 0;\n}\n\nstatic int add_passive_list(XEN_GUEST_HANDLE_PARAM(void) arg)\n{\n struct xenoprof_passive passive;\n struct domain d;\n int ret = 0;\n\n if ( pdomains >= MAX_OPROF_DOMAINS )\n return -E2BIG;\n\n if ( copy_from_guest(&passive, arg, 1) )\n return -EFAULT;\n\n d = get_domain_by_id(passive.domain_id);\n if ( d == NULL )\n return -EINVAL;\n\n if ( d->xenoprof == NULL )\n {\n ret = alloc_xenoprof_struct(d, passive.max_samples, 1);\n if ( ret < 0 )\n {\n put_domain(d);\n return -ENOMEM;\n }\n }\n\n ret = share_xenoprof_page_with_guest(\n current->domain, virt_to_mfn(d->xenoprof->rawbuf),\n d->xenoprof->npages);\n if ( ret < 0 )\n {\n put_domain(d);\n return ret;\n }\n\n d->xenoprof->domain_type = XENOPROF_DOMAIN_PASSIVE;\n passive.nbuf = d->xenoprof->nbuf;\n passive.bufsize = d->xenoprof->bufsize;\n if ( !paging_mode_translate(current->domain) )\n passive.buf_gmaddr = __pa(d->xenoprof->rawbuf);\n else\n xenoprof_shared_gmfn_with_guest(\n current->domain, __pa(d->xenoprof->rawbuf),\n passive.buf_gmaddr, d->xenoprof->npages);\n\n if ( __copy_to_guest(arg, &passive, 1) )\n {\n put_domain(d);\n return -EFAULT;\n }\n \n passive_domains[pdomains] = d;\n pdomains++;\n\n return ret;\n}\n\n\n```\n\n#### xenoprof_add_sample() [lines 491-531]\n```c\n}\n\n/ Check for space and add a sample. Return 1 if successful, 0 otherwise. /\nstatic int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n uint64_t eip, int mode, int event)\n{\n int head, tail, size;\n\n head = xenoprof_buf(d, buf, event_head);\n tail = xenoprof_buf(d, buf, event_tail);\n size = xenoprof_buf(d, buf, event_size);\n \n / make sure indexes in shared buffer are sane /\n if ( (head < 0) \|\| (head >= size) \|\| (tail < 0) \|\| (tail >= size) )\n {\n corrupted_buffer_samples++;\n return 0;\n }\n\n if ( xenoprof_buf_space(d, buf, size) > 0 )\n {\n xenoprof_buf(d, buf, event_log[head].eip) = eip;\n xenoprof_buf(d, buf, event_log[head].mode) = mode;\n xenoprof_buf(d, buf, event_log[head].event) = event;\n head++;\n if ( head >= size )\n head = 0;\n \n xenoprof_buf(d, buf, event_head) = head;\n }\n else\n {\n xenoprof_buf(d, buf, lost_samples)++;\n lost_samples++;\n return 0;\n }\n\n return 1;\n}\n\nint xenoprof_add_trace(struct vcpu vcpu, uint64_t pc, int mode)\n```\n\n#### xenoprof_add_trace() [lines 528-546]\n```c\n return 1;\n}\n\nint xenoprof_add_trace(struct vcpu vcpu, uint64_t pc, int mode)\n{\n struct domain d = vcpu->domain;\n xenoprof_buf_t buf = d->xenoprof->vcpu[vcpu->vcpu_id].buffer;\n\n / Do not accidentally write an escape code due to a broken frame. /\n if ( pc == XENOPROF_ESCAPE_CODE )\n {\n invalid_buffer_samples++;\n return 0;\n }\n\n return xenoprof_add_sample(d, buf, pc, mode, 0);\n}\n\nvoid xenoprof_log_event(struct vcpu vcpu, const struct cpu_user_regs regs,\n```\n\n#### xenoprof_log_event() [lines 543-603]\n```c\n return xenoprof_add_sample(d, buf, pc, mode, 0);\n}\n\nvoid xenoprof_log_event(struct vcpu vcpu, const struct cpu_user_regs regs,\n uint64_t pc, int mode, int event)\n{\n struct domain d = vcpu->domain;\n struct xenoprof_vcpu v;\n xenoprof_buf_t buf;\n\n total_samples++;\n\n /* Ignore samples of un-monitored domains. /\n if ( !is_profiled(d) )\n {\n others_samples++;\n return;\n }\n\n v = &d->xenoprof->vcpu[vcpu->vcpu_id];\n if ( v->buffer == NULL )\n {\n invalid_buffer_samples++;\n return;\n }\n \n buf = v->buffer;\n\n / Provide backtrace if requested. /\n if ( backtrace_depth > 0 )\n {\n if ( (xenoprof_buf_space(d, buf, v->event_size) < 2) \|\|\n !xenoprof_add_sample(d, buf, XENOPROF_ESCAPE_CODE, mode, \n XENOPROF_TRACE_BEGIN) )\n {\n xenoprof_buf(d, buf, lost_samples)++;\n lost_samples++;\n return;\n }\n }\n\n if ( xenoprof_add_sample(d, buf, pc, mode, event) )\n {\n if ( is_active(vcpu->domain) )\n active_samples++;\n else\n passive_samples++;\n if ( mode == 0 )\n xenoprof_buf(d, buf, user_samples)++;\n else if ( mode == 1 )\n xenoprof_buf(d, buf, kernel_samples)++;\n else\n xenoprof_buf(d, buf, xen_samples)++;\n \n }\n\n if ( backtrace_depth > 0 )\n xenoprof_backtrace(vcpu, regs, backtrace_depth, mode);\n}\n\n\n```\n\n### xen/include/xen/xenoprof.h\n\n#### region() [lines 12-98]\n```c\n\n#include <xen/inttypes.h>\n#include <public/xenoprof.h>\n#include <asm/xenoprof.h>\n\n#define PMU_OWNER_NONE 0\n#define PMU_OWNER_XENOPROF 1\n#define PMU_OWNER_HVM 2\n\n#ifdef CONFIG_XENOPROF\n\n#define XENOPROF_DOMAIN_IGNORED 0\n#define XENOPROF_DOMAIN_ACTIVE 1\n#define XENOPROF_DOMAIN_PASSIVE 2\n\n#define XENOPROF_IDLE 0\n#define XENOPROF_INITIALIZED 1\n#define XENOPROF_COUNTERS_RESERVED 2\n#define XENOPROF_READY 3\n#define XENOPROF_PROFILING 4\n\n#ifndef CONFIG_COMPAT\ntypedef struct xenoprof_buf xenoprof_buf_t;\n#else\n#include <compat/xenoprof.h>\ntypedef union {\n\tstruct xenoprof_buf native;\n\tstruct compat_oprof_buf compat;\n} xenoprof_buf_t;\n#endif\n\nstruct xenoprof_vcpu {\n int event_size;\n xenoprof_buf_t buffer;\n};\n\nstruct xenoprof {\n char rawbuf;\n int npages;\n int nbuf;\n int bufsize;\n int domain_type;\n int domain_ready;\n int is_primary;\n#ifdef CONFIG_COMPAT\n int is_compat;\n#endif\n struct xenoprof_vcpu vcpu;\n};\n\n#ifndef CONFIG_COMPAT\n#define XENOPROF_COMPAT(x) 0\n#define xenoprof_buf(d, b, field) ((b)->field)\n#else\n#define XENOPROF_COMPAT(x) ((x)->is_compat)\n#define xenoprof_buf(d, b, field) ((!(d)->xenoprof->is_compat ? \\\n &(b)->native.field : \\\n &(b)->compat.field))\n#endif\n\nstruct domain;\n\nint acquire_pmu_ownership(int pmu_ownership);\nvoid release_pmu_ownership(int pmu_ownership);\n\nint is_active(struct domain d);\nint is_passive(struct domain d);\nvoid free_xenoprof_pages(struct domain d);\n\nint xenoprof_add_trace(struct vcpu , uint64_t pc, int mode);\n\nvoid xenoprof_log_event(struct vcpu , const struct cpu_user_regs ,\n uint64_t pc, int mode, int event);\n\n#else\nstatic inline int acquire_pmu_ownership(int pmu_ownership)\n{\n return 1;\n}\n\nstatic inline void release_pmu_ownership(int pmu_ownership)\n{\n}\n#endif / CONFIG_XENOPROF /\n\n#endif / __XEN__XENOPROF_H__ /\n\n```\n\n\n## Upstream Fix\n```diff\nSubject: xenoprof: limit consumption of shared buffer data\nFrom: Jan Beulich jbeulich@suse.com Tue Apr 14 14:33:19 2020 +0200\nDate: Tue Apr 14 14:33:19 2020 +0200:\nGit: 50ef9a3cb26e2f9383f6fdfbed361d8f174bae9f\n\nSince a shared buffer can be written to by the guest, we may only read\nthe head and tail pointers from there (all other fields should only ever\nbe written to). Furthermore, for any particular operation the two values\nmust be read exactly once, with both checks and consumption happening\nwith the thus read values. (The backtrace related xenoprof_buf_space()\nuse in xenoprof_log_event() is an exception: The values used there get\nre-checked by every subsequent xenoprof_add_sample().)\n\nSince that code needed touching, also fix the double increment of the\nlost samples count in case the backtrace related xenoprof_add_sample()\ninvocation in xenoprof_log_event() fails.\n\nWhere code is being touched anyway, add const as appropriate, but take\nthe opportunity to entirely drop the now unused domain parameter of\nxenoprof_buf_space().\n\nThis is part of XSA-313.\n\nReported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>\nSigned-off-by: Jan Beulich <jbeulich@suse.com>\nReviewed-by: George Dunlap <george.dunlap@citrix.com>\nReviewed-by: Wei Liu <wl@xen.org>\n\ndiff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c\nindex bed796c876..e34b28b41e 100644\n--- a/xen/common/xenoprof.c\n+++ b/xen/common/xenoprof.c\n@@ -480,25 +480,22 @@ static int add_passive_list(XEN_GUEST_HANDLE_PARAM(void) arg)\n \n \n / Get space in the buffer /\n-static int xenoprof_buf_space(struct domain d, xenoprof_buf_t * buf, int size)\n+static int xenoprof_buf_space(int head, int tail, int size)\n {\n- int head, tail;\n-\n- head = xenoprof_buf(d, buf, event_head);\n- tail = xenoprof_buf(d, buf, event_tail);\n-\n return ((tail > head) ? 0 : size) + tail - head - 1;\n }\n \n /* Check for space and add a sample. Return 1 if successful, 0 otherwise. /\n-static int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n+static int xenoprof_add_sample(const struct domain d,\n+ const struct xenoprof_vcpu v,\n uint64_t eip, int mode, int event)\n {\n+ xenoprof_buf_t buf = v->buffer;\n int head, tail, size;\n \n head = xenoprof_buf(d, buf, event_head);\n tail = xenoprof_buf(d, buf, event_tail);\n- size = xenoprof_buf(d, buf, event_size);\n+ size = v->event_size;\n \n /* make sure indexes in shared buffer are sane /\n if ( (head < 0) \|\| (head >= size) \|\| (tail < 0) \|\| (tail >= size) )\n@@ -507,7 +504,7 @@ static int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n return 0;\n }\n \n- if ( xenoprof_buf_space(d, buf, size) > 0 )\n+ if ( xenoprof_buf_space(head, tail, size) > 0 )\n {\n xenoprof_buf(d, buf, event_log[head].eip) = eip;\n xenoprof_buf(d, buf, event_log[head].mode) = mode;\n@@ -531,7 +528,6 @@ static int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n int xenoprof_add_trace(struct vcpu vcpu, uint64_t pc, int mode)\n {\n struct domain d = vcpu->domain;\n- xenoprof_buf_t buf = d->xenoprof->vcpu[vcpu->vcpu_id].buffer;\n \n /* Do not accidentally write an escape code due to a broken frame. /\n if ( pc == XENOPROF_ESCAPE_CODE )\n@@ -540,7 +536,8 @@ int xenoprof_add_trace(struct vcpu vcpu, uint64_t pc, int mode)\n return 0;\n }\n \n- return xenoprof_add_sample(d, buf, pc, mode, 0);\n+ return xenoprof_add_sample(d, &d->xenoprof->vcpu[vcpu->vcpu_id],\n+ pc, mode, 0);\n }\n \n void xenoprof_log_event(struct vcpu vcpu, const struct cpu_user_regs regs,\n@@ -571,17 +568,22 @@ void xenoprof_log_event(struct vcpu vcpu, const struct cpu_user_regs regs,\n /* Provide backtrace if requested. /\n if ( backtrace_depth > 0 )\n {\n- if ( (xenoprof_buf_space(d, buf, v->event_size) < 2) \|\|\n- !xenoprof_add_sample(d, buf, XENOPROF_ESCAPE_CODE, mode, \n- XENOPROF_TRACE_BEGIN) )\n+ if ( xenoprof_buf_space(xenoprof_buf(d, buf, event_head),\n+ xenoprof_buf(d, buf, event_tail),\n+ v->event_size) < 2 )\n {\n xenoprof_buf(d, buf, lost_samples)++;\n lost_samples++;\n return;\n }\n+\n+ / xenoprof_add_sample() will increment lost_samples on failure /\n+ if ( !xenoprof_add_sample(d, v, XENOPROF_ESCAPE_CODE, mode,\n+ XENOPROF_TRACE_BEGIN) )\n+ return;\n }\n \n- if ( xenoprof_add_sample(d, buf, pc, mode, event) )\n+ if ( xenoprof_add_sample(d, v, pc, mode, event) )\n {\n if ( is_active(vcpu->domain) )\n active_samples++;\ndiff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h\nindex 8f045abce6..f1f9446bd5 100644\n--- a/xen/include/xen/xenoprof.h\n+++ b/xen/include/xen/xenoprof.h\n@@ -61,12 +61,12 @@ struct xenoprof {\n \n #ifndef CONFIG_COMPAT\n #define XENOPROF_COMPAT(x) 0\n-#define xenoprof_buf(d, b, field) ((b)->field)\n+#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field)\n #else\n #define XENOPROF_COMPAT(x) ((x)->is_compat)\n-#define xenoprof_buf(d, b, field) ((!(d)->xenoprof->is_compat ? \\\n- &(b)->native.field : \\\n- &(b)->compat.field))\n+#define xenoprof_buf(d, b, field) ACCESS_ONCE((!(d)->xenoprof->is_compat \\\n+ ? &(b)->native.field \\\n+ : &(b)->compat.field))\n #endif\n \n struct domain;\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Subject: xenoprof: limit consumption of shared buffer data\nFrom: Jan Beulich jbeulich@suse.com Tue Apr 14 14:33:19 2020 +0200\nDate: Tue Apr 14 14:33:19 2020 +0200:\nGit: 50ef9a3cb26e2f9383f6fdfbed361d8f174bae9f\n\nSince a shared buffer can be written to by the guest, we may only read\nthe head and tail pointers from there (all other fields should only ever\nbe written to). Furthermore, for any particular operation the two values\nmust be read exactly once, with both checks and consumption happening\nwith the thus read values. (The backtrace related xenoprof_buf_space()\nuse in xenoprof_log_event() is an exception: The values used there get\nre-checked by every subsequent xenoprof_add_sample().)\n\nSince that code needed touching, also fix the double increment of the\nlost samples count in case the backtrace related xenoprof_add_sample()\ninvocation in xenoprof_log_event() fails.\n\nWhere code is being touched anyway, add const as appropriate, but take\nthe opportunity to entirely drop the now unused domain parameter of\nxenoprof_buf_space().\n\nThis is part of XSA-313.\n\nReported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>\nSigned-off-by: Jan Beulich <jbeulich@suse.com>\nReviewed-by: George Dunlap <george.dunlap@citrix.com>\nReviewed-by: Wei Liu <wl@xen.org>\n\ndiff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c\nindex bed796c876..e34b28b41e 100644\n--- a/xen/common/xenoprof.c\n+++ b/xen/common/xenoprof.c\n@@ -480,25 +480,22 @@ static int add_passive_list(XEN_GUEST_HANDLE_PARAM(void) arg)\n \n \n / Get space in the buffer /\n-static int xenoprof_buf_space(struct domain d, xenoprof_buf_t * buf, int size)\n+static int xenoprof_buf_space(int head, int tail, int size)\n {\n- int head, tail;\n-\n- head = xenoprof_buf(d, buf, event_head);\n- tail = xenoprof_buf(d, buf, event_tail);\n-\n return ((tail > head) ? 0 : size) + tail - head - 1;\n }\n \n /* Check for space and add a sample. Return 1 if successful, 0 otherwise. /\n-static int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n+static int xenoprof_add_sample(const struct domain d,\n+ const struct xenoprof_vcpu v,\n uint64_t eip, int mode, int event)\n {\n+ xenoprof_buf_t buf = v->buffer;\n int head, tail, size;\n \n head = xenoprof_buf(d, buf, event_head);\n tail = xenoprof_buf(d, buf, event_tail);\n- size = xenoprof_buf(d, buf, event_size);\n+ size = v->event_size;\n \n /* make sure indexes in shared buffer are sane /\n if ( (head < 0) \|\| (head >= size) \|\| (tail < 0) \|\| (tail >= size) )\n@@ -507,7 +504,7 @@ static int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n return 0;\n }\n \n- if ( xenoprof_buf_space(d, buf, size) > 0 )\n+ if ( xenoprof_buf_space(head, tail, size) > 0 )\n {\n xenoprof_buf(d, buf, event_log[head].eip) = eip;\n xenoprof_buf(d, buf, event_log[head].mode) = mode;\n@@ -531,7 +528,6 @@ static int xenoprof_add_sample(struct domain d, xenoprof_buf_t buf,\n int xenoprof_add_trace(struct vcpu vcpu, uint64_t pc, int mode)\n {\n struct domain d = vcpu->domain;\n- xenoprof_buf_t buf = d->xenoprof->vcpu[vcpu->vcpu_id].buffer;\n \n /* Do not accidentally write an escape code due to a broken frame. /\n if ( pc == XENOPROF_ESCAPE_CODE )\n@@ -540,7 +536,8 @@ int xenoprof_add_trace(struct vcpu vcpu, uint64_t pc, int mode)\n return 0;\n }\n \n- return xenoprof_add_sample(d, buf, pc, mode, 0);\n+ return xenoprof_add_sample(d, &d->xenoprof->vcpu[vcpu->vcpu_id],\n+ pc, mode, 0);\n }\n \n void xenoprof_log_event(struct vcpu vcpu, const struct cpu_user_regs regs,\n@@ -571,17 +568,22 @@ void xenoprof_log_event(struct vcpu vcpu, const struct cpu_user_regs regs,\n /* Provide backtrace if requested. /\n if ( backtrace_depth > 0 )\n {\n- if ( (xenoprof_buf_space(d, buf, v->event_size) < 2) \|\|\n- !xenoprof_add_sample(d, buf, XENOPROF_ESCAPE_CODE, mode, \n- XENOPROF_TRACE_BEGIN) )\n+ if ( xenoprof_buf_space(xenoprof_buf(d, buf, event_head),\n+ xenoprof_buf(d, buf, event_tail),\n+ v->event_size) < 2 )\n {\n xenoprof_buf(d, buf, lost_samples)++;\n lost_samples++;\n return;\n }\n+\n+ / xenoprof_add_sample() will increment lost_samples on failure /\n+ if ( !xenoprof_add_sample(d, v, XENOPROF_ESCAPE_CODE, mode,\n+ XENOPROF_TRACE_BEGIN) )\n+ return;\n }\n \n- if ( xenoprof_add_sample(d, buf, pc, mode, event) )\n+ if ( xenoprof_add_sample(d, v, pc, mode, event) )\n {\n if ( is_active(vcpu->domain) )\n active_samples++;\ndiff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h\nindex 8f045abce6..f1f9446bd5 100644\n--- a/xen/include/xen/xenoprof.h\n+++ b/xen/include/xen/xenoprof.h\n@@ -61,12 +61,12 @@ struct xenoprof {\n \n #ifndef CONFIG_COMPAT\n #define XENOPROF_COMPAT(x) 0\n-#define xenoprof_buf(d, b, field) ((b)->field)\n+#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field)\n #else\n #define XENOPROF_COMPAT(x) ((x)->is_compat)\n-#define xenoprof_buf(d, b, field) ((!(d)->xenoprof->is_compat ? \\\n- &(b)->native.field : \\\n- &(b)->compat.field))\n+#define xenoprof_buf(d, b, field) ACCESS_ONCE(*(!(d)->xenoprof->is_compat \\\n+ ? &(b)->native.field \\\n+ : &(b)->compat.field))\n #endif\n \n struct domain;\n" } ]	{ "id": "xen-12484-5e95ad8f-xenoprof-limit-consumption-of-shared-buffer-data.patch", "cves": [ "CVE-2020-11739", "CVE-2020-11740", "CVE-2020-11741", "CVE-2020-11742", "CVE-2020-11743" ], "package": "xen", "incident_id": 12484, "patch_name": "5e95ad8f-xenoprof-limit-consumption-of-shared-buffer-data.patch", "tier": "identical", "language": "c", "patch_lines_changed": 40, "patch_files_count": 2, "total_tokens_est": 2968, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-2.0-only", "upstream_license": null, "cve_id": "CVE-2020-11739", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2020-11739, CVE-2020-11740, CVE-2020-11741, CVE-2020-11743, CVE-2020-11742\n\nx86/ucode/amd: Fix more potential buffer overruns with microcode parsing\n\n## Package\nxen\n\n## Files to modify\n- xen/arch/x86/microcode_amd.c\n\n## Target Source Code\n\n### arch/x86/microcode_amd.c\n\n#### get_ucode_from_buffer_amd() [lines 484-528]\n```c\n mc_amd->mpb = NULL;\n mc_amd->mpb_size = 0;\n last_offset = offset;\n while ( (error = get_ucode_from_buffer_amd(mc_amd, buf, bufsize,\n &offset)) == 0 )\n {\n if ( microcode_fits(mc_amd, cpu) )\n {\n error = apply_microcode(cpu);\n if ( error )\n break;\n applied_offset = last_offset;\n }\n\n last_offset = offset;\n\n if ( offset >= bufsize )\n break;\n\n /\n 1. Given a situation where multiple containers exist and correct\n * patch lives on a container that is not the last container.\n * 2. We match equivalent ids using find_equiv_cpu_id() from the\n * earlier while() (On this case, matches on earlier container\n * file and we break)\n * 3. Proceed to while ( (error = get_ucode_from_buffer_amd(mc_amd,\n * buf, bufsize,&offset)) == 0 )\n * 4. Find correct patch using microcode_fits() and apply the patch\n * (Assume: apply_microcode() is successful)\n * 5. The while() loop from (3) continues to parse the binary as\n * there is a subsequent container file, but...\n * 6. ...a correct patch can only be on one container and not on any\n * subsequent ones. (Refer docs for more info) Therefore, we\n * don't have to parse a subsequent container. So, we can abort\n * the process here.\n * 7. This ensures that we retain a success value (= 0) to 'error'\n * before if ( mpbuf->type != UCODE_UCODE_TYPE ) evaluates to\n * false and returns -EINVAL.\n /\n if ( offset + SECTION_HDR_SIZE <= bufsize &&\n (const uint32_t )(buf + offset) == UCODE_MAGIC )\n break;\n }\n\n / On success keep the microcode patch for\n```\n\n#### cpu_request_microcode() [lines 384-560]\n```c\n return 0;\n}\n\nstatic int cpu_request_microcode(unsigned int cpu, const void buf,\n size_t bufsize)\n{\n struct microcode_amd mc_amd, mc_old;\n size_t offset = 0;\n size_t last_offset, applied_offset = 0;\n int error = 0, save_error = 1;\n struct ucode_cpu_info uci = &per_cpu(ucode_cpu_info, cpu);\n unsigned int current_cpu_id;\n unsigned int equiv_cpu_id;\n\n /* We should bind the task to the CPU /\n BUG_ON(cpu != raw_smp_processor_id());\n\n current_cpu_id = cpuid_eax(0x00000001);\n\n if ( (const uint32_t )buf != UCODE_MAGIC )\n {\n printk(KERN_ERR \"microcode: Wrong microcode patch file magic\\n\");\n error = -EINVAL;\n goto out;\n }\n\n if ( check_final_patch_levels(cpu) )\n {\n printk(XENLOG_INFO\n \"microcode: Cannot update microcode patch on the cpu as we hit a final level\\n\");\n error = -EPERM;\n goto out;\n }\n\n mc_amd = xmalloc(struct microcode_amd);\n if ( !mc_amd )\n {\n printk(KERN_ERR \"microcode: Cannot allocate memory for microcode patch\\n\");\n error = -ENOMEM;\n goto out;\n }\n\n /\n * Multiple container file support:\n * 1. check if this container file has equiv_cpu_id match\n * 2. If not, fast-fwd to next container file\n /\n/ ... 110 lines omitted ... /\n {\n xfree(mc_amd);\n uci->mc.mc_amd = mc_old;\n }\n else\n xfree(mc_old);\n\n out:\n svm_host_osvw_init();\n\n /\n * In some cases we may return an error even if processor's microcode has\n * been updated. For example, the first patch in a container file is loaded\n * successfully but subsequent container file processing encounters a\n * failure.\n /\n return error;\n}\n\nstatic int microcode_resume_match(unsigned int cpu, const void mc)\n```\n\n\n## Upstream Fix\n```diff\n# Commit 718d1432000079ea7120f6cb770372afe707ce27\n# Date 2020-04-01 14:00:12 +0100\n# Author Andrew Cooper <andrew.cooper3@citrix.com>\n# Committer Andrew Cooper <andrew.cooper3@citrix.com>\nx86/ucode/amd: Fix more potential buffer overruns with microcode parsing\n\ncpu_request_microcode() doesn't know the buffer is at least 4 bytes long\nbefore inspecting UCODE_MAGIC.\n\ninstall_equiv_cpu_table() doesn't know the boundary of the buffer it is\ninterpreting as an equivalency table. This case was clearly observed at one\npoint in the past, given the subsequent overrun detection, but without\ncomprehending that the damage was already done.\n\nMake the logic consistent with container_fast_forward() and pass size_left in\nto install_equiv_cpu_table().\n\nSigned-off-by: Andrew Cooper <andrew.cooper3@citrix.com>\nReviewed-by: Jan Beulich <jbeulich@suse.com>\n\n--- a/xen/arch/x86/microcode_amd.c\n+++ b/xen/arch/x86/microcode_amd.c\n@@ -294,11 +294,20 @@ static int get_ucode_from_buffer_amd(\n static int install_equiv_cpu_table(\n struct microcode_amd mc_amd,\n const void data,\n+ size_t size_left,\n size_t offset)\n {\n- const struct mpbhdr mpbuf = data + offset + 4;\n+ const struct mpbhdr mpbuf;\n const struct equiv_cpu_entry eq;\n \n+ if ( size_left < (sizeof(mpbuf) + 4) \|\|\n+ (mpbuf = data + offset + 4,\n+ size_left - sizeof(mpbuf) - 4 < mpbuf->len) )\n+ {\n+ printk(XENLOG_WARNING \"microcode: No space for equivalent cpu table\\n\");\n+ return -EINVAL;\n+ }\n+\n offset += mpbuf->len + CONT_HDR_SIZE;\t/ add header length /\n \n if ( mpbuf->type != UCODE_EQUIV_CPU_TABLE_TYPE )\n@@ -413,7 +422,7 @@ static int cpu_request_microcode(unsigne\n \n current_cpu_id = cpuid_eax(0x00000001);\n \n- if ( (const uint32_t )buf != UCODE_MAGIC )\n+ if ( bufsize < 4 \|\| (const uint32_t )buf != UCODE_MAGIC )\n {\n printk(KERN_ERR \"microcode: Wrong microcode patch file magic\\n\");\n error = -EINVAL;\n@@ -443,24 +452,13 @@ static int cpu_request_microcode(unsigne\n /\n while ( offset < bufsize )\n {\n- error = install_equiv_cpu_table(mc_amd, buf, &offset);\n+ error = install_equiv_cpu_table(mc_amd, buf, bufsize - offset, &offset);\n if ( error )\n {\n printk(KERN_ERR \"microcode: installing equivalent cpu table failed\\n\");\n break;\n }\n \n- /\n- Could happen as we advance 'offset' early\n- * in install_equiv_cpu_table\n- /\n- if ( offset > bufsize )\n- {\n- printk(KERN_ERR \"microcode: Microcode buffer overrun\\n\");\n- error = -EINVAL;\n- break;\n- }\n-\n if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id,\n &equiv_cpu_id) )\n break;\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "# Commit 718d1432000079ea7120f6cb770372afe707ce27\n# Date 2020-04-01 14:00:12 +0100\n# Author Andrew Cooper <andrew.cooper3@citrix.com>\n# Committer Andrew Cooper <andrew.cooper3@citrix.com>\nx86/ucode/amd: Fix more potential buffer overruns with microcode parsing\n\ncpu_request_microcode() doesn't know the buffer is at least 4 bytes long\nbefore inspecting UCODE_MAGIC.\n\ninstall_equiv_cpu_table() doesn't know the boundary of the buffer it is\ninterpreting as an equivalency table. This case was clearly observed at one\npoint in the past, given the subsequent overrun detection, but without\ncomprehending that the damage was already done.\n\nMake the logic consistent with container_fast_forward() and pass size_left in\nto install_equiv_cpu_table().\n\nSigned-off-by: Andrew Cooper <andrew.cooper3@citrix.com>\nReviewed-by: Jan Beulich <jbeulich@suse.com>\n\n--- a/xen/arch/x86/microcode_amd.c\n+++ b/xen/arch/x86/microcode_amd.c\n@@ -294,11 +294,20 @@ static int get_ucode_from_buffer_amd(\n static int install_equiv_cpu_table(\n struct microcode_amd mc_amd,\n const void data,\n+ size_t size_left,\n size_t offset)\n {\n- const struct mpbhdr mpbuf = data + offset + 4;\n+ const struct mpbhdr mpbuf;\n const struct equiv_cpu_entry eq;\n \n+ if ( size_left < (sizeof(mpbuf) + 4) \|\|\n+ (mpbuf = data + offset + 4,\n+ size_left - sizeof(mpbuf) - 4 < mpbuf->len) )\n+ {\n+ printk(XENLOG_WARNING \"microcode: No space for equivalent cpu table\\n\");\n+ return -EINVAL;\n+ }\n+\n offset += mpbuf->len + CONT_HDR_SIZE;\t/* add header length /\n \n if ( mpbuf->type != UCODE_EQUIV_CPU_TABLE_TYPE )\n@@ -413,7 +422,7 @@ static int cpu_request_microcode(unsigne\n \n current_cpu_id = cpuid_eax(0x00000001);\n \n- if ( (const uint32_t )buf != UCODE_MAGIC )\n+ if ( bufsize < 4 \|\| (const uint32_t )buf != UCODE_MAGIC )\n {\n printk(KERN_ERR \"microcode: Wrong microcode patch file magic\\n\");\n error = -EINVAL;\n@@ -443,24 +452,13 @@ static int cpu_request_microcode(unsigne\n /\n while ( offset < bufsize )\n {\n- error = install_equiv_cpu_table(mc_amd, buf, &offset);\n+ error = install_equiv_cpu_table(mc_amd, buf, bufsize - offset, &offset);\n if ( error )\n {\n printk(KERN_ERR \"microcode: installing equivalent cpu table failed\\n\");\n break;\n }\n \n- /\n- Could happen as we advance 'offset' early\n- * in install_equiv_cpu_table\n- */\n- if ( offset > bufsize )\n- {\n- printk(KERN_ERR \"microcode: Microcode buffer overrun\\n\");\n- error = -EINVAL;\n- break;\n- }\n-\n if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id,\n &equiv_cpu_id) )\n break;\n" } ]	{ "id": "xen-12484-5e84905c-x86-ucode-AMD-fix-more-potential-buffer-overruns.patch", "cves": [ "CVE-2020-11739", "CVE-2020-11740", "CVE-2020-11741", "CVE-2020-11742", "CVE-2020-11743" ], "package": "xen", "incident_id": 12484, "patch_name": "5e84905c-x86-ucode-AMD-fix-more-potential-buffer-overruns.patch", "tier": "identical", "language": "c", "patch_lines_changed": 26, "patch_files_count": 0, "total_tokens_est": 1558, "has_source_context": true, "upstream_enriched": false, "suse_license": "GPL-2.0-only", "upstream_license": null, "cve_id": "CVE-2020-11739", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2016-0787\n\nThe diffie_hellman_sha256 function in kex.c in libssh2 before 1.7.0 improperly truncates secrets to 128 or 256 bits, which makes it easier for man-in-the-middle attackers to decrypt or intercept SSH sessions via unspecified vectors, aka a \"bits/bytes confusion bug.\"\n\n## Package\nlibssh2_org\n\n## Files to modify\n- src/agent.c\n- libssh2-1.4.3.orig/src/knownhost.c\n- libssh2-1.4.3.orig/src/userauth.c\n- libssh2-1.4.3.orig/src/agent.c\n- src/userauth.c\n\n## Target Source Code\n\n### src/agent.c\n\n#### agent_connect_unix() [lines 164-198]\n```c\n\n#ifdef PF_UNIX\nstatic int\nagent_connect_unix(LIBSSH2_AGENT agent)\n{\n const char path;\n struct sockaddr_un s_un;\n\n path = agent->identity_agent_path;\n if(!path) {\n path = getenv(\"SSH_AUTH_SOCK\");\n if(!path)\n return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_USE,\n \"no auth sock variable\");\n }\n\n agent->fd = socket(PF_UNIX, SOCK_STREAM, 0);\n if(agent->fd < 0)\n return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_SOCKET,\n \"failed creating socket\");\n\n s_un.sun_family = AF_UNIX;\n strncpy(s_un.sun_path, path, sizeof(s_un.sun_path));\n s_un.sun_path[sizeof(s_un.sun_path)-1] = 0; /* make sure there's a trailing\n zero /\n if(connect(agent->fd, (struct sockaddr)(&s_un), sizeof(s_un)) != 0) {\n close(agent->fd);\n return _libssh2_error(agent->session, LIBSSH2_ERROR_AGENT_PROTOCOL,\n \"failed connecting with agent\");\n }\n\n return LIBSSH2_ERROR_NONE;\n}\n\n#define RECV_SEND_ALL(func, socket, buffer, length, flags, abstract) \\\n```\n\n### src/knownhost.c\n\n#### libssh2_knownhost_readfile() [lines 949-984]\n```c\n /\n\nLIBSSH2_API int\nlibssh2_knownhost_readfile(LIBSSH2_KNOWNHOSTS hosts,\n const char filename, int type)\n{\n FILE file;\n int num = 0;\n char buf[4092];\n\n if(type != LIBSSH2_KNOWNHOST_FILE_OPENSSH)\n return _libssh2_error(hosts->session,\n LIBSSH2_ERROR_METHOD_NOT_SUPPORTED,\n \"Unsupported type of known-host information \"\n \"store\");\n\n file = fopen(filename, FOPEN_READTEXT);\n if(file) {\n while(fgets(buf, sizeof(buf), file)) {\n if(libssh2_knownhost_readline(hosts, buf, strlen(buf), type)) {\n num = _libssh2_error(hosts->session, LIBSSH2_ERROR_KNOWN_HOSTS,\n \"Failed to parse known hosts file\");\n break;\n }\n num++;\n }\n fclose(file);\n }\n else\n return _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE,\n \"Failed to open file\");\n\n return num;\n}\n\n/\n```\n\n#### libssh2_knownhost_writefile() [lines 1187-1234]\n```c\n Write hosts+key pairs to the given file.\n /\nLIBSSH2_API int\nlibssh2_knownhost_writefile(LIBSSH2_KNOWNHOSTS hosts,\n const char filename, int type)\n{\n struct known_host node;\n FILE file;\n int rc = LIBSSH2_ERROR_NONE;\n char buffer[4092];\n\n / we only support this single file type for now, bail out on all other\n attempts /\n if(type != LIBSSH2_KNOWNHOST_FILE_OPENSSH)\n return _libssh2_error(hosts->session,\n LIBSSH2_ERROR_METHOD_NOT_SUPPORTED,\n \"Unsupported type of known-host information \"\n \"store\");\n\n file = fopen(filename, FOPEN_WRITETEXT);\n if(!file)\n return _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE,\n \"Failed to open file\");\n\n for(node = _libssh2_list_first(&hosts->head);\n node;\n node = _libssh2_list_next(&node->node)) {\n size_t wrote = 0;\n size_t nwrote;\n rc = knownhost_writeline(hosts, node, buffer, sizeof(buffer), &wrote,\n type);\n if(rc)\n break;\n\n nwrote = fwrite(buffer, 1, wrote, file);\n if(nwrote != wrote) {\n / failed to write the whole thing, bail out /\n rc = _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE,\n \"Write failed\");\n break;\n }\n }\n fclose(file);\n\n return rc;\n}\n\n\n```\n\n### src/userauth.c\n\n#### file_read_publickey() [lines 1019-1116]\n```c\n sizeof(session->userauth_host_packet_requirev_state));\n\n if(publickey) {\n rc = file_read_publickey(session, &session->userauth_host_method,\n &session->userauth_host_method_len,\n &pubkeydata, &pubkeydata_len, publickey);\n if(rc)\n / Note: file_read_publickey() calls _libssh2_error() /\n return rc;\n }\n else {\n / Compute public key from private key. /\n rc = _libssh2_pub_priv_keyfile(session,\n &session->userauth_host_method,\n &session->userauth_host_method_len,\n &pubkeydata, &pubkeydata_len,\n privatekey, passphrase);\n if(rc)\n / libssh2_pub_priv_keyfile() calls _libssh2_error() /\n return rc;\n }\n\n /\n * 52 = packet_type(1) + username_len(4) + servicename_len(4) +\n * service_name(14)\"ssh-connection\" + authmethod_len(4) +\n * authmethod(9)\"hostbased\" + method_len(4) + pubkeydata_len(4) +\n * hostname_len(4) + local_username_len(4)\n /\n session->userauth_host_packet_len =\n username_len + session->userauth_host_method_len + hostname_len +\n local_username_len + pubkeydata_len + 52;\n\n /\n * Preallocate space for an overall length, method name again,\n * and the signature, which won't be any larger than the size of\n * the publickeydata itself\n /\n session->userauth_host_s = session->userauth_host_packet =\n LIBSSH2_ALLOC(session,\n session->userauth_host_packet_len + 4 +\n (4 + session->userauth_host_method_len) +\n (4 + pubkeydata_len));\n if(!session->userauth_host_packet) {\n LIBSSH2_FREE(session, session->userauth_host_method);\n session->userauth_host_method = NULL;\n LIBSSH2_FREE(session, pubkeydata);\n return _libssh2_error(session, LIBSSH2_ERROR_ALLOC,\n \"Out of memory\");\n }\n\n (session->userauth_host_s++) = SSH_MSG_USERAUTH_REQUEST;\n _libssh2_store_str(&session->userauth_host_s, username, username_len);\n _libssh2_store_str(&session->userauth_host_s, \"ssh-connection\", 14);\n _libssh2_store_str(&session->userauth_host_s, \"hostbased\", 9);\n _libssh2_store_str(&session->userauth_host_s,\n (const char )session->userauth_host_method,\n session->userauth_host_method_len);\n _libssh2_store_str(&session->userauth_host_s, (const char )pubkeydata,\n pubkeydata_len);\n LIBSSH2_FREE(session, pubkeydata);\n _libssh2_store_str(&session->userauth_host_s, hostname, hostname_len);\n _libssh2_store_str(&session->userauth_host_s, local_username,\n local_username_len);\n\n rc = file_read_privatekey(session, &privkeyobj, &abstract,\n session->userauth_host_method,\n session->userauth_host_method_len,\n privatekey, passphrase);\n if(rc) {\n /* Note: file_read_privatekey() calls _libssh2_error() /\n LIBSSH2_FREE(session, session->userauth_host_method);\n session->userauth_host_method = NULL;\n LIBSSH2_FREE(session, session->userauth_host_packet);\n session->userauth_host_packet = NULL;\n return rc;\n }\n\n _libssh2_htonu32(buf, session->session_id_len);\n libssh2_prepare_iovec(datavec, 4);\n datavec[0].iov_base = (void )buf;\n datavec[0].iov_len = 4;\n datavec[1].iov_base = (void )session->session_id;\n datavec[1].iov_len = session->session_id_len;\n datavec[2].iov_base = (void )session->userauth_host_packet;\n datavec[2].iov_len = session->userauth_host_packet_len;\n\n if(privkeyobj && privkeyobj->signv &&\n privkeyobj->signv(session, &sig, &sig_len, 3,\n datavec, &abstract)) {\n LIBSSH2_FREE(session, session->userauth_host_method);\n session->userauth_host_method = NULL;\n LIBSSH2_FREE(session, session->userauth_host_packet);\n session->userauth_host_packet = NULL;\n if(privkeyobj->dtor) {\n privkeyobj->dtor(session, &abstract);\n }\n return -1;\n }\n```\n\n\n## Upstream Fix\n```diff\nFrom 33a59a1905feb5d786e9d457f287dd9e81a9f747 Mon Sep 17 00:00:00 2001\nFrom: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>\nDate: Tue, 27 Dec 2011 00:33:28 -0300\nSubject: [PATCH] Use O_CLOEXEC where needed\n\n---\n src/agent.c \| 2 +-\n src/knownhost.c \| 4 ++--\n src/userauth.c \| 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\nIndex: libssh2-1.4.3/src/agent.c\n===================================================================\n--- libssh2-1.4.3.orig/src/agent.c\t2012-03-05 20:04:56.000000000 +0100\n+++ libssh2-1.4.3/src/agent.c\t2013-01-08 16:24:07.572195659 +0100\n@@ -152,7 +152,7 @@ agent_connect_unix(LIBSSH2_AGENT agent)\n return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_USE,\n \"no auth sock variable\");\n \n- agent->fd = socket(PF_UNIX, SOCK_STREAM, 0);\n+ agent->fd = socket(PF_UNIX, SOCK_STREAM \| SOCK_CLOEXEC, 0);\n if (agent->fd < 0)\n return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_SOCKET,\n \"failed creating socket\");\nIndex: libssh2-1.4.3/src/knownhost.c\n===================================================================\n--- libssh2-1.4.3.orig/src/knownhost.c\t2012-08-21 20:27:22.000000000 +0200\n+++ libssh2-1.4.3/src/knownhost.c\t2013-01-08 16:24:07.573195691 +0100\n@@ -907,7 +907,7 @@ libssh2_knownhost_readfile(LIBSSH2_KNOWN\n \"Unsupported type of known-host information \"\n \"store\");\n \n- file = fopen(filename, \"r\");\n+ file = fopen(filename, \"re\");\n if(file) {\n while(fgets(buf, sizeof(buf), file)) {\n if(libssh2_knownhost_readline(hosts, buf, strlen(buf), type)) {\n@@ -1082,7 +1082,7 @@ libssh2_knownhost_writefile(LIBSSH2_KNOW\n \"Unsupported type of known-host information \"\n \"store\");\n \n- file = fopen(filename, \"w\");\n+ file = fopen(filename, \"we\");\n if(!file)\n return _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE,\n \"Failed to open file\");\nIndex: libssh2-1.4.3/src/userauth.c\n===================================================================\n--- libssh2-1.4.3.orig/src/userauth.c\t2012-04-18 22:24:04.000000000 +0200\n+++ libssh2-1.4.3/src/userauth.c\t2013-01-08 16:24:07.573195691 +0100\n@@ -467,7 +467,7 @@ file_read_publickey(LIBSSH2_SESSION se\n _libssh2_debug(session, LIBSSH2_TRACE_AUTH, \"Loading public key file: %s\",\n pubkeyfile);\n /* Read Public Key /\n- fd = fopen(pubkeyfile, \"r\");\n+ fd = fopen(pubkeyfile, \"re\");\n if (!fd) {\n return _libssh2_error(session, LIBSSH2_ERROR_FILE,\n \"Unable to open public key file\");\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 33a59a1905feb5d786e9d457f287dd9e81a9f747 Mon Sep 17 00:00:00 2001\nFrom: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>\nDate: Tue, 27 Dec 2011 00:33:28 -0300\nSubject: [PATCH] Use O_CLOEXEC where needed\n\n---\n src/agent.c \| 2 +-\n src/knownhost.c \| 4 ++--\n src/userauth.c \| 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\nIndex: libssh2-1.4.3/src/agent.c\n===================================================================\n--- libssh2-1.4.3.orig/src/agent.c\t2012-03-05 20:04:56.000000000 +0100\n+++ libssh2-1.4.3/src/agent.c\t2013-01-08 16:24:07.572195659 +0100\n@@ -152,7 +152,7 @@ agent_connect_unix(LIBSSH2_AGENT agent)\n return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_USE,\n \"no auth sock variable\");\n \n- agent->fd = socket(PF_UNIX, SOCK_STREAM, 0);\n+ agent->fd = socket(PF_UNIX, SOCK_STREAM \| SOCK_CLOEXEC, 0);\n if (agent->fd < 0)\n return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_SOCKET,\n \"failed creating socket\");\nIndex: libssh2-1.4.3/src/knownhost.c\n===================================================================\n--- libssh2-1.4.3.orig/src/knownhost.c\t2012-08-21 20:27:22.000000000 +0200\n+++ libssh2-1.4.3/src/knownhost.c\t2013-01-08 16:24:07.573195691 +0100\n@@ -907,7 +907,7 @@ libssh2_knownhost_readfile(LIBSSH2_KNOWN\n \"Unsupported type of known-host information \"\n \"store\");\n \n- file = fopen(filename, \"r\");\n+ file = fopen(filename, \"re\");\n if(file) {\n while(fgets(buf, sizeof(buf), file)) {\n if(libssh2_knownhost_readline(hosts, buf, strlen(buf), type)) {\n@@ -1082,7 +1082,7 @@ libssh2_knownhost_writefile(LIBSSH2_KNOW\n \"Unsupported type of known-host information \"\n \"store\");\n \n- file = fopen(filename, \"w\");\n+ file = fopen(filename, \"we\");\n if(!file)\n return _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE,\n \"Failed to open file\");\nIndex: libssh2-1.4.3/src/userauth.c\n===================================================================\n--- libssh2-1.4.3.orig/src/userauth.c\t2012-04-18 22:24:04.000000000 +0200\n+++ libssh2-1.4.3/src/userauth.c\t2013-01-08 16:24:07.573195691 +0100\n@@ -467,7 +467,7 @@ file_read_publickey(LIBSSH2_SESSION * se\n _libssh2_debug(session, LIBSSH2_TRACE_AUTH, \"Loading public key file: %s\",\n pubkeyfile);\n /* Read Public Key */\n- fd = fopen(pubkeyfile, \"r\");\n+ fd = fopen(pubkeyfile, \"re\");\n if (!fd) {\n return _libssh2_error(session, LIBSSH2_ERROR_FILE,\n \"Unable to open public key file\");" } ]	{ "id": "libssh2_org-4819-libssh2-ocloexec.patch", "cves": [], "package": "libssh2_org", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 8, "patch_files_count": 3, "total_tokens_est": 1585, "has_source_context": true, "upstream_enriched": false, "suse_license": "BSD-3-Clause", "upstream_license": "BSD-3-Clause", "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2016-0787\n\nThe diffie_hellman_sha256 function in kex.c in libssh2 before 1.7.0 improperly truncates secrets to 128 or 256 bits, which makes it easier for man-in-the-middle attackers to decrypt or intercept SSH sessions via unspecified vectors, aka a \"bits/bytes confusion bug.\"\n\n## Package\nlibssh2_org\n\n## Files to modify\n- src/kex.c\n\n## Target Source Code\n\n### src/kex.c\n\n#### kex_agree_comp() [lines 3657-3709]\n```c\n/* kex_agree_comp\n * Agree on a compression scheme\n /\nstatic int kex_agree_comp(LIBSSH2_SESSION session,\n libssh2_endpoint_data endpoint, unsigned char comp,\n size_t comp_len)\n{\n const LIBSSH2_COMP_METHOD *compp = _libssh2_comp_methods(session);\n unsigned char s;\n (void)session;\n\n if(endpoint->comp_prefs) {\n s = (unsigned char ) endpoint->comp_prefs;\n\n while(s && s) {\n unsigned char p = (unsigned char ) strchr((char ) s, ',');\n size_t method_len = (p ? (size_t)(p - s) : strlen((char ) s));\n\n if(kex_agree_instr(comp, comp_len, s, method_len)) {\n const LIBSSH2_COMP_METHOD method =\n (const LIBSSH2_COMP_METHOD )\n kex_get_method_by_name((char ) s, method_len,\n (const LIBSSH2_COMMON_METHOD )\n compp);\n\n if(!method) {\n / Invalid method -- Should never be reached /\n return -1;\n }\n\n endpoint->comp = method;\n return 0;\n }\n\n s = p ? p + 1 : NULL;\n }\n return -1;\n }\n\n while(compp && (compp)->name) {\n s = kex_agree_instr(comp, comp_len, (unsigned char ) (compp)->name,\n strlen((compp)->name));\n if(s) {\n endpoint->comp = compp;\n return 0;\n }\n compp++;\n }\n\n return -1;\n}\n\n\n```\n\n#### kex_agree_methods() [lines 3714-3824]\n```c\n/ kex_agree_methods\n * Decide which specific method to use of the methods offered by each party\n /\nstatic int kex_agree_methods(LIBSSH2_SESSION session, unsigned char data,\n size_t data_len)\n{\n unsigned char kex, hostkey, crypt_cs, crypt_sc, comp_cs, comp_sc,\n mac_cs, mac_sc;\n size_t kex_len, hostkey_len, crypt_cs_len, crypt_sc_len, comp_cs_len;\n size_t comp_sc_len, mac_cs_len, mac_sc_len;\n struct string_buf buf;\n\n if(data_len < 17)\n return -1;\n\n buf.data = (unsigned char )data;\n buf.len = data_len;\n buf.dataptr = buf.data;\n buf.dataptr++; /* advance past packet type /\n\n / Skip cookie, don't worry, it's preserved in the kexinit field /\n buf.dataptr += 16;\n\n / Locate each string /\n if(_libssh2_get_string(&buf, &kex, &kex_len))\n return -1;\n if(_libssh2_get_string(&buf, &hostkey, &hostkey_len))\n return -1;\n if(_libssh2_get_string(&buf, &crypt_cs, &crypt_cs_len))\n return -1;\n if(_libssh2_get_string(&buf, &crypt_sc, &crypt_sc_len))\n return -1;\n if(_libssh2_get_string(&buf, &mac_cs, &mac_cs_len))\n return -1;\n if(_libssh2_get_string(&buf, &mac_sc, &mac_sc_len))\n return -1;\n if(_libssh2_get_string(&buf, &comp_cs, &comp_cs_len))\n return -1;\n if(_libssh2_get_string(&buf, &comp_sc, &comp_sc_len))\n return -1;\n\n / If the server sent an optimistic packet, assume that it guessed wrong.\n * If the guess is determined to be right (by kex_agree_kex_hostkey)\n * This flag will be reset to zero so that it's not ignored /\n if(_libssh2_check_length(&buf, 1)) {\n session->burn_optimistic_kexinit = (buf.dataptr++);\n }\n else {\n return -1;\n }\n\n /* Next uint32 in packet is all zeros (reserved) /\n\n if(kex_agree_kex_hostkey(session, kex, kex_len, hostkey, hostkey_len)) {\n return -1;\n }\n\n if(kex_agree_crypt(session, &session->local, crypt_cs, crypt_cs_len)\n \|\| kex_agree_crypt(session, &session->remote, crypt_sc, crypt_sc_len)) {\n return -1;\n }\n\n / This must happen after kex_agree_crypt since some MACs depend on the\n negotiated crypto method /\n if(kex_agree_mac(session, &session->local, mac_cs, mac_cs_len)\n \|\| kex_agree_mac(session, &session->remote, mac_sc, mac_sc_len)) {\n return -1;\n }\n\n if(kex_agree_comp(session, &session->local, comp_cs, comp_cs_len)\n \|\| kex_agree_comp(session, &session->remote, comp_sc, comp_sc_len)) {\n return -1;\n }\n\n#if 0\n if(libssh2_kex_agree_lang(session, &session->local, lang_cs, lang_cs_len)\n \|\| libssh2_kex_agree_lang(session, &session->remote, lang_sc,\n lang_sc_len)) {\n return -1;\n }\n#endif\n\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on KEX method: %s\",\n session->kex->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on HOSTKEY method: %s\",\n session->hostkey->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on CRYPT_CS method: %s\",\n session->local.crypt->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on CRYPT_SC method: %s\",\n session->remote.crypt->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on MAC_CS method: %s\",\n session->local.mac->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on MAC_SC method: %s\",\n session->remote.mac->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on COMP_CS method: %s\",\n session->local.comp->name));\n _libssh2_debug((session, LIBSSH2_TRACE_KEX,\n \"Agreed on COMP_SC method: %s\",\n session->remote.comp->name));\n\n return 0;\n}\n\n\n```\n\n\n## Upstream Fix\n```diff\nFrom c7f66cca285033da9b8c9de8eceff52d7b3c3ef3 Mon Sep 17 00:00:00 2001\nFrom: Mariusz Ziulek <mzet@owasp.org>\nDate: Sat, 21 Feb 2015 23:31:36 +0100\nSubject: [PATCH] kex: bail out on rubbish in the incoming packet\n\n---\n src/kex.c \| 73 +++++++++++++++++++++++++++++++++++----------------------------\n 1 file changed, 41 insertions(+), 32 deletions(-)\n\ndiff --git a/src/kex.c b/src/kex.c\nindex fa4c4e1..ad7498a 100644\n--- a/src/kex.c\n+++ b/src/kex.c\n@@ -1547,10 +1547,34 @@ static int kex_agree_comp(LIBSSH2_SESSION session,\n \n /* TODO: When in server mode we need to turn this logic on its head\n * The Client gets to make the final call on \"agreed methods\"\n /\n \n+/\n+ * kex_string_pair() extracts a string from the packet and makes sure it fits\n+ * within the given packet.\n+ /\n+static int kex_string_pair(unsigned char sp, / parsing position /\n+ unsigned char data, /* start pointer to packet /\n+ size_t data_len, / size of total packet /\n+ size_t lenp, /* length of the string /\n+ unsigned char strp) / pointer to string start /\n+{\n+ unsigned char s = sp;\n+ lenp = _libssh2_ntohu32(s);\n+\n+ /* the length of the string must fit within the current pointer and the\n+ end of the packet /\n+ if (lenp > (data_len - (s - data) -4))\n+ return 1;\n+ strp = s + 4;\n+ s += 4 + lenp;\n+\n+ sp = s;\n+ return 0;\n+}\n+\n / kex_agree_methods\n * Decide which specific method to use of the methods offered by each party\n /\n static int kex_agree_methods(LIBSSH2_SESSION session, unsigned char data,\n unsigned data_len)\n@@ -1566,42 +1590,27 @@ static int kex_agree_methods(LIBSSH2_SESSION session, unsigned char data,\n \n / Skip cookie, don't worry, it's preserved in the kexinit field /\n s += 16;\n \n / Locate each string /\n- kex_len = _libssh2_ntohu32(s);\n- kex = s + 4;\n- s += 4 + kex_len;\n- hostkey_len = _libssh2_ntohu32(s);\n- hostkey = s + 4;\n- s += 4 + hostkey_len;\n- crypt_cs_len = _libssh2_ntohu32(s);\n- crypt_cs = s + 4;\n- s += 4 + crypt_cs_len;\n- crypt_sc_len = _libssh2_ntohu32(s);\n- crypt_sc = s + 4;\n- s += 4 + crypt_sc_len;\n- mac_cs_len = _libssh2_ntohu32(s);\n- mac_cs = s + 4;\n- s += 4 + mac_cs_len;\n- mac_sc_len = _libssh2_ntohu32(s);\n- mac_sc = s + 4;\n- s += 4 + mac_sc_len;\n- comp_cs_len = _libssh2_ntohu32(s);\n- comp_cs = s + 4;\n- s += 4 + comp_cs_len;\n- comp_sc_len = _libssh2_ntohu32(s);\n- comp_sc = s + 4;\n-#if 0\n- s += 4 + comp_sc_len;\n- lang_cs_len = _libssh2_ntohu32(s);\n- lang_cs = s + 4;\n- s += 4 + lang_cs_len;\n- lang_sc_len = _libssh2_ntohu32(s);\n- lang_sc = s + 4;\n- s += 4 + lang_sc_len;\n-#endif\n+ if(kex_string_pair(&s, data, data_len, &kex_len, &kex))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &hostkey_len, &hostkey))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &crypt_cs_len, &crypt_cs))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &crypt_sc_len, &crypt_sc))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &mac_cs_len, &mac_cs))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &mac_sc_len, &mac_sc))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &comp_cs_len, &comp_cs))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &comp_sc_len, &comp_sc))\n+ return -1;\n+\n / If the server sent an optimistic packet, assume that it guessed wrong.\n * If the guess is determined to be right (by kex_agree_kex_hostkey)\n * This flag will be reset to zero so that it's not ignored /\n session->burn_optimistic_kexinit = (s++);\n /* Next uint32 in packet is all zeros (reserved) /\n-- \n2.1.4\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From c7f66cca285033da9b8c9de8eceff52d7b3c3ef3 Mon Sep 17 00:00:00 2001\nFrom: Mariusz Ziulek <mzet@owasp.org>\nDate: Sat, 21 Feb 2015 23:31:36 +0100\nSubject: [PATCH] kex: bail out on rubbish in the incoming packet\n\n---\n src/kex.c \| 73 +++++++++++++++++++++++++++++++++++----------------------------\n 1 file changed, 41 insertions(+), 32 deletions(-)\n\ndiff --git a/src/kex.c b/src/kex.c\nindex fa4c4e1..ad7498a 100644\n--- a/src/kex.c\n+++ b/src/kex.c\n@@ -1547,10 +1547,34 @@ static int kex_agree_comp(LIBSSH2_SESSION session,\n \n /* TODO: When in server mode we need to turn this logic on its head\n * The Client gets to make the final call on \"agreed methods\"\n /\n \n+/\n+ * kex_string_pair() extracts a string from the packet and makes sure it fits\n+ * within the given packet.\n+ /\n+static int kex_string_pair(unsigned char sp, / parsing position /\n+ unsigned char data, /* start pointer to packet /\n+ size_t data_len, / size of total packet /\n+ size_t lenp, /* length of the string /\n+ unsigned char strp) / pointer to string start /\n+{\n+ unsigned char s = sp;\n+ lenp = _libssh2_ntohu32(s);\n+\n+ /* the length of the string must fit within the current pointer and the\n+ end of the packet /\n+ if (lenp > (data_len - (s - data) -4))\n+ return 1;\n+ strp = s + 4;\n+ s += 4 + lenp;\n+\n+ sp = s;\n+ return 0;\n+}\n+\n / kex_agree_methods\n * Decide which specific method to use of the methods offered by each party\n /\n static int kex_agree_methods(LIBSSH2_SESSION session, unsigned char data,\n unsigned data_len)\n@@ -1566,42 +1590,27 @@ static int kex_agree_methods(LIBSSH2_SESSION session, unsigned char data,\n \n / Skip cookie, don't worry, it's preserved in the kexinit field /\n s += 16;\n \n / Locate each string /\n- kex_len = _libssh2_ntohu32(s);\n- kex = s + 4;\n- s += 4 + kex_len;\n- hostkey_len = _libssh2_ntohu32(s);\n- hostkey = s + 4;\n- s += 4 + hostkey_len;\n- crypt_cs_len = _libssh2_ntohu32(s);\n- crypt_cs = s + 4;\n- s += 4 + crypt_cs_len;\n- crypt_sc_len = _libssh2_ntohu32(s);\n- crypt_sc = s + 4;\n- s += 4 + crypt_sc_len;\n- mac_cs_len = _libssh2_ntohu32(s);\n- mac_cs = s + 4;\n- s += 4 + mac_cs_len;\n- mac_sc_len = _libssh2_ntohu32(s);\n- mac_sc = s + 4;\n- s += 4 + mac_sc_len;\n- comp_cs_len = _libssh2_ntohu32(s);\n- comp_cs = s + 4;\n- s += 4 + comp_cs_len;\n- comp_sc_len = _libssh2_ntohu32(s);\n- comp_sc = s + 4;\n-#if 0\n- s += 4 + comp_sc_len;\n- lang_cs_len = _libssh2_ntohu32(s);\n- lang_cs = s + 4;\n- s += 4 + lang_cs_len;\n- lang_sc_len = _libssh2_ntohu32(s);\n- lang_sc = s + 4;\n- s += 4 + lang_sc_len;\n-#endif\n+ if(kex_string_pair(&s, data, data_len, &kex_len, &kex))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &hostkey_len, &hostkey))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &crypt_cs_len, &crypt_cs))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &crypt_sc_len, &crypt_sc))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &mac_cs_len, &mac_cs))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &mac_sc_len, &mac_sc))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &comp_cs_len, &comp_cs))\n+ return -1;\n+ if(kex_string_pair(&s, data, data_len, &comp_sc_len, &comp_sc))\n+ return -1;\n+\n / If the server sent an optimistic packet, assume that it guessed wrong.\n * If the guess is determined to be right (by kex_agree_kex_hostkey)\n * This flag will be reset to zero so that it's not ignored /\n session->burn_optimistic_kexinit = (s++);\n /* Next uint32 in packet is all zeros (reserved) */\n-- \n2.1.4" } ]	{ "id": "libssh2_org-4819-CVE-2015-1782.patch", "cves": [], "package": "libssh2_org", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 74, "patch_files_count": 1, "total_tokens_est": 2109, "has_source_context": true, "upstream_enriched": false, "suse_license": "BSD-3-Clause", "upstream_license": "BSD-3-Clause", "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2016-0787\n\nThe diffie_hellman_sha256 function in kex.c in libssh2 before 1.7.0 improperly truncates secrets to 128 or 256 bits, which makes it easier for man-in-the-middle attackers to decrypt or intercept SSH sessions via unspecified vectors, aka a \"bits/bytes confusion bug.\"\n\n## Package\nlibssh2_org\n\n## Files to modify\n- libssh2-1.4.3.orig/src/openssl.h\n- src/transport.c\n- libssh2-1.4.3.orig/src/libgcrypt.h\n- libssh2-1.4.3.orig/src/mac.c\n- src/openssl.h\n\n## Target Source Code\n\n### src/libgcrypt.h\n\n#### region() [lines 1-99]\n```c\n#ifndef __LIBSSH2_LIBGCRYPT_H\n#define __LIBSSH2_LIBGCRYPT_H\n/\n Copyright (C) 2008, 2009, 2010 Simon Josefsson\n * Copyright (C) 2006, 2007, The Written Word, Inc.\n * All rights reserved.\n \n Redistribution and use in source and binary forms,\n * with or without modification, are permitted provided\n * that the following conditions are met:\n \n Redistributions of source code must retain the above\n * copyright notice, this list of conditions and the\n * following disclaimer.\n \n Redistributions in binary form must reproduce the above\n * copyright notice, this list of conditions and the following\n * disclaimer in the documentation and/or other materials\n * provided with the distribution.\n \n Neither the name of the copyright holder nor the names\n * of any other contributors may be used to endorse or\n * promote products derived from this software without\n * specific prior written permission.\n \n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n * CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE\n * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY\n * OF SUCH DAMAGE.\n /\n\n#define LIBSSH2_CRYPTO_ENGINE libssh2_gcrypt\n\n#include <gcrypt.h>\n\n#define LIBSSH2_MD5 1\n\n#define LIBSSH2_HMAC_RIPEMD 1\n#define LIBSSH2_HMAC_SHA256 1\n#define LIBSSH2_HMAC_SHA512 1\n\n#define LIBSSH2_AES_CBC 1\n#define LIBSSH2_AES_CTR 1\n#define LIBSSH2_AES_GCM 0\n#define LIBSSH2_BLOWFISH 1\n#define LIBSSH2_RC4 1\n#define LIBSSH2_CAST 1\n#define LIBSSH2_3DES 1\n\n#define LIBSSH2_RSA 1\n#define LIBSSH2_RSA_SHA1 1\n#define LIBSSH2_RSA_SHA2 0\n#define LIBSSH2_DSA 1\n#define LIBSSH2_ECDSA 0\n#define LIBSSH2_ED25519 0\n\n#define MD5_DIGEST_LENGTH 16\n#define SHA_DIGEST_LENGTH 20\n#define SHA256_DIGEST_LENGTH 32\n#define SHA384_DIGEST_LENGTH 48\n#define SHA512_DIGEST_LENGTH 64\n\n#define EC_MAX_POINT_LEN ((528 2 / 8) + 1)\n\n#define _libssh2_random(buf, len) \\\n (gcry_randomize((buf), (len), GCRY_STRONG_RANDOM), 0)\n\n#define libssh2_prepare_iovec(vec, len) /* Empty. /\n\n#define libssh2_sha1_ctx gcry_md_hd_t\n\n/ returns 0 in case of failure /\n#define libssh2_sha1_init(ctx) \\\n (GPG_ERR_NO_ERROR == gcry_md_open(ctx, GCRY_MD_SHA1, 0))\n#define libssh2_sha1_update(ctx, data, len) \\\n gcry_md_write(ctx, (unsigned char ) data, len)\n#define libssh2_sha1_final(ctx, out) \\\n memcpy(out, gcry_md_read(ctx, 0), SHA_DIGEST_LENGTH), gcry_md_close(ctx)\n#define libssh2_sha1(message, len, out) \\\n gcry_md_hash_buffer(GCRY_MD_SHA1, out, message, len)\n\n#define libssh2_sha256_ctx gcry_md_hd_t\n\n#define libssh2_sha256_init(ctx) \\\n (GPG_ERR_NO_ERROR == gcry_md_open(ctx, GCRY_MD_SHA256, 0))\n#define libssh2_sha256_update(ctx, data, len) \\\n gcry_md_write(ctx, (unsigned char ) data, len)\n#define libssh2_sha256_final(ctx, out) \\\n memcpy(out, gcry_md_read(ctx, 0), SHA256_DIGEST_LENGTH), gcry_md_close(ctx)\n```\n\n#### region() [lines 40-146]\n```c\n /\n\n#define LIBSSH2_CRYPTO_ENGINE libssh2_gcrypt\n\n#include <gcrypt.h>\n\n#define LIBSSH2_MD5 1\n\n#define LIBSSH2_HMAC_RIPEMD 1\n#define LIBSSH2_HMAC_SHA256 1\n#define LIBSSH2_HMAC_SHA512 1\n\n#define LIBSSH2_AES_CBC 1\n#define LIBSSH2_AES_CTR 1\n#define LIBSSH2_AES_GCM 0\n#define LIBSSH2_BLOWFISH 1\n#define LIBSSH2_RC4 1\n#define LIBSSH2_CAST 1\n#define LIBSSH2_3DES 1\n\n#define LIBSSH2_RSA 1\n#define LIBSSH2_RSA_SHA1 1\n#define LIBSSH2_RSA_SHA2 0\n#define LIBSSH2_DSA 1\n#define LIBSSH2_ECDSA 0\n#d\n/* ... truncated ... /\n```\n\n### src/mac.c\n\n#### mac_method_common_dtor() [lines 96-109]\n```c\n Cleanup simple mac methods\n /\nstatic int\nmac_method_common_dtor(LIBSSH2_SESSION session, void *abstract)\n{\n if(abstract) {\n LIBSSH2_FREE(session, abstract);\n }\n abstract = NULL;\n\n return 0;\n}\n\n\n```\n\n#### region() [lines 242-348]\n```c\n libssh2_hmac_sha1_init(&ctx, abstract, 20);\n libssh2_hmac_update(ctx, seqno_buf, 4);\n libssh2_hmac_update(ctx, packet, packet_len);\n if(addtl && addtl_len) {\n libssh2_hmac_update(ctx, addtl, addtl_len);\n }\n libssh2_hmac_final(ctx, buf);\n libssh2_hmac_cleanup(&ctx);\n\n return 0;\n}\n\n\n\nstatic const LIBSSH2_MAC_METHOD mac_method_hmac_sha1 = {\n \"hmac-sha1\",\n 20,\n 20,\n mac_method_common_init,\n mac_method_hmac_sha1_hash,\n mac_method_common_dtor,\n 0\n};\n\nstatic const LIBSSH2_MAC_METHOD mac_method_hmac_sha1_etm = {\n \"hmac-sha1-etm@openssh.com\",\n 20,\n 20,\n mac_method_common_init,\n mac_method_hmac_sha1_hash,\n mac_method_common_dtor,\n 1\n};\n\n/ mac_method_hmac_sha1_96_hash\n * Calculate hash using first 96 bits of sha1 value\n /\nstatic int\nmac_method_hmac_sha1_96_hash(LIBSSH2_SESSION session,\n unsigned char buf, uint32_t seqno,\n const unsigned char packet,\n size_t packet_len,\n const unsigned char addtl,\n size_t addtl_len, void abstract)\n{\n unsigned char temp[SHA_DIGEST_LENGTH];\n\n mac_method_hmac_sha1_hash(session, temp, seqno, packet, packet_len,\n addtl, addtl_len, abstract);\n memcpy(buf, (char ) temp, 96 / 8);\n\n return 0;\n}\n\n\n\nstatic const LIBSSH2_MAC_METHOD mac_method_hmac_sha1_96 = {\n \"hmac-sha1-96\",\n 12,\n 20,\n mac_method_common_init,\n mac_method_hmac_sha1_96_hash,\n mac_method_common_dtor,\n 0\n};\n\n#if LIBSSH2_MD5\n/* mac_method_hmac_md5_hash\n * Calculate hash using full md5 value\n /\nstatic int\nmac_method_hmac_md5_hash(LIBSSH2_SESSION session, unsigned char buf,\n uint32_t seqno,\n const unsigned char packet,\n size_t packet_len,\n const unsigned char addtl,\n size_t addtl_len, void abstract)\n{\n libssh2_hmac_ctx ctx;\n unsigned char seqno_buf[4];\n (void)session;\n\n _libssh2_htonu32(seqno_buf, seqno);\n\n libssh2_hmac_ctx_init(ctx);\n libssh2_hmac_md5_init(&ctx, abstract, 16);\n libssh2_hmac_update(ctx, seqno_buf, 4);\n libssh2_hmac_update(ctx, packet, packet_len);\n if(addtl && addtl_len) {\n libssh2_hmac_update(ctx, addtl, addtl_len);\n }\n libssh2_hmac_final(ctx, buf);\n libssh2_hmac_cleanup(&ctx);\n\n return 0;\n}\n\n\n\nstatic const LIBSSH2_MAC_METHOD mac_method_hmac_md5 = {\n \"hmac-md5\",\n 16,\n 16,\n mac_method_common_init,\n mac_method_hmac_md5_hash,\n mac_method_common_dtor,\n 0\n```\n\n### src/openssl.h\n\n#### region() [lines 23-129]\n```c\n * promote products derived from this software without\n * specific prior written permission.\n \n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n * CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE\n * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY\n * OF SUCH DAMAGE.\n /\n\n#define LIBSSH2_CRYPTO_ENGINE libssh2_openssl\n\n/ disable deprecated warnings in OpenSSL 3 /\n#define OPENSSL_SUPPRESS_DEPRECATED\n\n#ifdef LIBSSH2_WOLFSSL\n\n#include <wolfssl/options.h>\n#include <openssl/ecdh.h>\n\n#if defined(NO_DSA) \|\| defined(HAVE_FIPS)\n#define OPENSSL_NO_DSA\n#endif\n\n#if defined(NO_MD5) \|\| defined(HAVE_FIPS)\n#define OPENSSL_NO_MD5\n#endif\n\n#if !defined(WOLFSSL_RIPEMD) \|\| defined(HAVE_FIPS)\n#define OPENSSL_NO_RIPEMD\n#endif\n\n#if defined(NO_RC4) \|\| defined(HAVE_FIPS)\n#define OPENSSL_NO_RC4\n#endif\n\n#ifdef NO_DES3\n#define OPENSSL_NO_DES\n#endif\n\n/ wolfSSL doesn't support Blowfish or CAST. /\n#define OPENSSL_NO_BF\n#define OPENSSL_NO_CAST\n/ wolfSSL has no engine framework. /\n#define OPENSSL_NO_ENGINE\n\n#endif / LIBSSH2_WOLFSSL /\n\n#include <openssl/opensslconf.h>\n#include <openssl/sha.h>\n#include <openssl/rsa.h>\n#ifndef OPENSSL_NO_ENGINE\n#include <openssl/engine.h>\n#endif\n#ifndef OPENSSL_NO_DSA\n#include <openssl/dsa.h>\n#endif\n#ifndef OPENSSL_NO_MD5\n#include <openssl/md5.h>\n#endif\n#include <openssl/err.h>\n#include <openssl/evp.h>\n#include <openssl/hmac.h>\n#include <openssl/bn.h>\n#include <openssl/pem.h>\n#include <openssl/rand.h>\n\n#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \\\n !defined(LIBRESSL_VERSION_NUMBER)) \|\| defined(LIBSSH2_WOLFSSL) \|\| \\\n LIBRESSL_VERSION_NUMBER >= 0x3050000fL\n/ For wolfSSL, whether the structs are truly opaque or not, it's best to not\n * rely on their internal data members being exposed publicly. /\n# define HAVE_OPAQUE_STRUCTS 1\n#endif\n\n#ifdef OPENSSL_NO_RSA\n# define LIBSSH2_RSA 0\n# define LIBSSH2_RSA_SHA1 0\n# define LIBSSH2_RSA_SHA2 0\n#else\n# define LIBSSH2_RSA 1\n# define LIBSSH2_RSA_SHA1 1\n# define LIBSSH2_RSA_SHA2 1\n#endif\n\n#ifdef OPENSSL_NO_DSA\n# define LIBSSH2_DSA 0\n#else\n# define LIBSSH2_DSA 1\n#endif\n\n#if defined(OPENSSL_NO_ECDSA) \|\| defined(OPENSSL_NO_EC)\n# define LIBSSH2_ECDSA 0\n#else\n# define LIBSSH2_ECDSA 1\n#endif\n\n#if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \\\n```\n\n#### libssh2_sha1() [lines 73-185]\n```c\n#define OPENSSL_NO_BF\n#define OPENSSL_NO_CAST\n/ wolfSSL has no engine framework. /\n#define OPENSSL_NO_ENGINE\n\n#endif / LIBSSH2_WOLFSSL /\n\n#include <openssl/opensslconf.h>\n#include <openssl/sha.h>\n#include <openssl/rsa.h>\n#ifndef OPENSSL_NO_ENGINE\n#include <openssl/engine.h>\n#endif\n#ifndef OPENSSL_NO_DSA\n#include <openssl/dsa.h>\n#endif\n#ifndef OPENSSL_NO_MD5\n#include <openssl/md5.h>\n#endif\n#include <openssl/err.h>\n#include <openssl/evp.h>\n#include <openssl/hmac.h>\n#include <openssl/bn.h>\n#include <openssl/pem.h>\n#include <openssl/rand.h>\n\n#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \\\n !defined(LIBRESSL_VERSION_NUMBER)) \|\| defined(LIBSSH2_WOLFSSL) \|\| \\\n LIBRESSL_VERSION_NUMBER >= 0x3050000fL\n/ For wolfSSL, whether the structs are truly opaque or not, it's best to not\n * rely on their internal data members being exposed publicly. /\n# define HAVE_OPAQUE_STRUCTS 1\n#endif\n\n#ifdef OPENSSL_NO_RSA\n# define LIBSSH2_RSA 0\n# define LIBSSH2_RSA_SHA1 0\n# define LIBSSH2_RSA_SHA2 0\n#else\n# define LIBSSH2_RSA 1\n# define LIBSSH2_RSA_SHA1 1\n# defin\n/ ... truncated ... /\n```\n\n### src/transport.c\n\n#### region() [lines 3-110]\n```c\n Author: Daniel Stenberg <daniel@haxx.se>\n \n Redistribution and use in source and binary forms,\n * with or without modification, are permitted provided\n * that the following conditions are met:\n \n Redistributions of source code must retain the above\n * copyright notice, this list of conditions and the\n * following disclaimer.\n \n Redistributions in binary form must reproduce the above\n * copyright notice, this list of conditions and the following\n * disclaimer in the documentation and/or other materials\n * provided with the distribution.\n \n Neither the name of the copyright holder nor the names\n * of any other contributors may be used to endorse or\n * promote products derived from this software without\n * specific prior written permission.\n \n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND\n * CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES,\n * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE\n * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY\n * OF SUCH DAMAGE.\n /\n\n/\n * This file handles reading and writing to the SECSH transport layer. RFC4253.\n /\n\n#include \"libssh2_priv.h\"\n\n#include <errno.h>\n#include <ctype.h>\n#include <assert.h>\n\n#include \"transport.h\"\n#include \"mac.h\"\n\n#define MAX_BLOCKSIZE 32 / MUST fit biggest crypto block size we use/get /\n#define MAX_MACSIZE 64 / MUST fit biggest MAC length we support /\n\n#ifdef LIBSSH2DEBUG\n#define UNPRINTABLE_CHAR '.'\nstatic void\ndebugdump(LIBSSH2_SESSION session,\n const char desc, const unsigned char ptr, size_t size)\n{\n size_t i;\n size_t c;\n unsigned int width = 0x10;\n char buffer[256]; /* Must be enough for width4 + about 30 or so /\n size_t used;\n static const char hex_chars = \"0123456789ABCDEF\";\n\n if(!(session->showmask & LIBSSH2_TRACE_TRANS)) {\n / not asked for, bail out /\n return;\n }\n\n used = snprintf(buffer, sizeof(buffer), \"=> %s (%d bytes)\\n\",\n desc, (int) size);\n if(session->tracehandler)\n (session->tracehandler)(session, session->tracehandler_context,\n buffer, used);\n else\n fprintf(stderr, \"%s\", buffer);\n\n for(i = 0; i < size; i += width) {\n\n used = snprintf(buffer, sizeof(buffer), \"%04lx: \", (long)i);\n\n / hex not disabled, show it /\n for(c = 0; c < width; c++) {\n if(i + c < size) {\n buffer[used++] = hex_chars[(ptr[i + c] >> 4) & 0xF];\n buffer[used++] = hex_chars[ptr[i + c] & 0xF];\n }\n else {\n buffer[used++] = ' ';\n buffer[used++] = ' ';\n }\n\n buffer[used++] = ' ';\n if((width/2) - 1 == c)\n buffer[used++] = ' ';\n }\n\n buffer[used++] = ':';\n buffer[used++] = ' ';\n\n for(c = 0; (c < width) && (i + c < size); c++) {\n buffer[used++] = isprint(ptr[i + c]) ?\n ptr[i + c] : UNPRINTABLE_CHAR;\n }\n buffer[used++] = '\\n';\n buffer[used] = 0;\n\n```\n\n\n## Upstream Fix\n```diff\nFrom a53cebba34e6cde2cd4cdc7daec593992cd47e21 Mon Sep 17 00:00:00 2001\nFrom: \"brian m. carlson\" <sandals@crustytoothpaste.net>\nDate: Sun, 6 Sep 2015 14:02:44 +0000\nSubject: [PATCH] Add support for HMAC-SHA-256 and HMAC-SHA-512.\n\nImplement support for these algorithms and wire them up to the libgcrypt\nand OpenSSL backends. Increase the maximum MAC buffer size to 64 bytes\nto prevent buffer overflows. Prefer HMAC-SHA-256 over HMAC-SHA-512, and\nthat over HMAC-SHA-1, as OpenSSH does.\n\nCloses #40\n---\n src/libgcrypt.h \| 8 ++++\n src/mac.c \| 97 +++++++++++++++++++++++++++++++++++++++++++++++++\n src/openssl.h \| 7 ++++\n src/transport.c \| 2 +-\n src/wincng.h \| 6 +++\n 5 files changed, 119 insertions(+), 1 deletion(-)\n\ndiff --git a/src/libgcrypt.h b/src/libgcrypt.h\nindex f9da52bb26..e2eb4d28c2 100644\n--- a/src/libgcrypt.h\n+++ b/src/libgcrypt.h\n@@ -42,6 +42,8 @@\n #define LIBSSH2_MD5 1\n \n #define LIBSSH2_HMAC_RIPEMD 1\n+#define LIBSSH2_HMAC_SHA256 1\n+#define LIBSSH2_HMAC_SHA512 1\n \n #define LIBSSH2_AES 1\n #define LIBSSH2_AES_CTR 1\n@@ -95,6 +97,12 @@\n #define libssh2_hmac_ripemd160_init(ctx, key, keylen) \\\n gcry_md_open (ctx, GCRY_MD_RMD160, GCRY_MD_FLAG_HMAC), \\\n gcry_md_setkey (ctx, key, keylen)\n+#define libssh2_hmac_sha256_init(ctx, key, keylen) \\\n+ gcry_md_open (ctx, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC), \\\n+ gcry_md_setkey (ctx, key, keylen)\n+#define libssh2_hmac_sha512_init(ctx, key, keylen) \\\n+ gcry_md_open (ctx, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC), \\\n+ gcry_md_setkey (ctx, key, keylen)\n #define libssh2_hmac_update(ctx, data, datalen) \\\n gcry_md_write (ctx, (unsigned char ) data, datalen)\n #define libssh2_hmac_final(ctx, data) \\\ndiff --git a/src/mac.c b/src/mac.c\nindex 786a95381b..5ec26eb3b4 100644\n--- a/src/mac.c\n+++ b/src/mac.c\n@@ -96,6 +96,97 @@ mac_method_common_dtor(LIBSSH2_SESSION session, void *abstract)\n \n \n \n+#if LIBSSH2_HMAC_SHA512\n+/ mac_method_hmac_sha512_hash\n+ * Calculate hash using full sha512 value\n+ /\n+static int\n+mac_method_hmac_sha2_512_hash(LIBSSH2_SESSION session,\n+ unsigned char buf, uint32_t seqno,\n+ const unsigned char packet,\n+ uint32_t packet_len,\n+ const unsigned char addtl,\n+ uint32_t addtl_len, void abstract)\n+{\n+ libssh2_hmac_ctx ctx;\n+ unsigned char seqno_buf[4];\n+ (void) session;\n+\n+ _libssh2_htonu32(seqno_buf, seqno);\n+\n+ libssh2_hmac_ctx_init(ctx);\n+ libssh2_hmac_sha512_init(&ctx, abstract, 64);\n+ libssh2_hmac_update(ctx, seqno_buf, 4);\n+ libssh2_hmac_update(ctx, packet, packet_len);\n+ if (addtl && addtl_len) {\n+ libssh2_hmac_update(ctx, addtl, addtl_len);\n+ }\n+ libssh2_hmac_final(ctx, buf);\n+ libssh2_hmac_cleanup(&ctx);\n+\n+ return 0;\n+}\n+\n+\n+\n+static const LIBSSH2_MAC_METHOD mac_method_hmac_sha2_512 = {\n+ \"hmac-sha2-512\",\n+ 64,\n+ 64,\n+ mac_method_common_init,\n+ mac_method_hmac_sha2_512_hash,\n+ mac_method_common_dtor,\n+};\n+#endif\n+\n+\n+\n+#if LIBSSH2_HMAC_SHA256\n+/* mac_method_hmac_sha256_hash\n+ * Calculate hash using full sha256 value\n+ /\n+static int\n+mac_method_hmac_sha2_256_hash(LIBSSH2_SESSION session,\n+ unsigned char buf, uint32_t seqno,\n+ const unsigned char packet,\n+ uint32_t packet_len,\n+ const unsigned char addtl,\n+ uint32_t addtl_len, void abstract)\n+{\n+ libssh2_hmac_ctx ctx;\n+ unsigned char seqno_buf[4];\n+ (void) session;\n+\n+ _libssh2_htonu32(seqno_buf, seqno);\n+\n+ libssh2_hmac_ctx_init(ctx);\n+ libssh2_hmac_sha256_init(&ctx, abstract, 32);\n+ libssh2_hmac_update(ctx, seqno_buf, 4);\n+ libssh2_hmac_update(ctx, packet, packet_len);\n+ if (addtl && addtl_len) {\n+ libssh2_hmac_update(ctx, addtl, addtl_len);\n+ }\n+ libssh2_hmac_final(ctx, buf);\n+ libssh2_hmac_cleanup(&ctx);\n+\n+ return 0;\n+}\n+\n+\n+\n+static const LIBSSH2_MAC_METHOD mac_method_hmac_sha2_256 = {\n+ \"hmac-sha2-256\",\n+ 32,\n+ 32,\n+ mac_method_common_init,\n+ mac_method_hmac_sha2_256_hash,\n+ mac_method_common_dtor,\n+};\n+#endif\n+\n+\n+\n+\n /* mac_method_hmac_sha1_hash\n * Calculate hash using full sha1 value\n /\n@@ -294,6 +385,12 @@ static const LIBSSH2_MAC_METHOD mac_method_hmac_ripemd160_openssh_com = {\n #endif / LIBSSH2_HMAC_RIPEMD /\n \n static const LIBSSH2_MAC_METHOD mac_methods[] = {\n+#if LIBSSH2_HMAC_SHA256\n+ &mac_method_hmac_sha2_256,\n+#endif\n+#if LIBSSH2_HMAC_SHA512\n+ &mac_method_hmac_sha2_512,\n+#endif\n &mac_method_hmac_sha1,\n &mac_method_hmac_sha1_96,\n #if LIBSSH2_MD5\ndiff --git a/src/openssl.h b/src/openssl.h\nindex a571309da0..4c3fe89ad5 100644\n--- a/src/openssl.h\n+++ b/src/openssl.h\n@@ -76,6 +76,9 @@\n # define LIBSSH2_HMAC_RIPEMD 1\n #endif\n \n+#define LIBSSH2_HMAC_SHA256 1\n+#define LIBSSH2_HMAC_SHA512 1\n+\n #if OPENSSL_VERSION_NUMBER >= 0x00907000L && !defined(OPENSSL_NO_AES)\n # define LIBSSH2_AES_CTR 1\n # define LIBSSH2_AES 1\n@@ -138,6 +141,10 @@ int _libssh2_md5_init(libssh2_md5_ctx );\n HMAC_Init(ctx, key, keylen, EVP_md5())\n #define libssh2_hmac_ripemd160_init(ctx, key, keylen) \\\n HMAC_Init(ctx, key, keylen, EVP_ripemd160())\n+#define libssh2_hmac_sha256_init(ctx, key, keylen) \\\n+ HMAC_Init(ctx, key, keylen, EVP_sha256())\n+#define libssh2_hmac_sha512_init(ctx, key, keylen) \\\n+ HMAC_Init(ctx, key, keylen, EVP_sha512())\n #define libssh2_hmac_update(ctx, data, datalen) \\\n HMAC_Update(&(ctx), data, datalen)\n #define libssh2_hmac_final(ctx, data) HMAC_Final(&(ctx), data, NULL)\ndiff --git a/src/transport.c b/src/transport.c\nindex 5b3d66d8db..8725da0950 100644\n--- a/src/transport.c\n+++ b/src/transport.c\n@@ -52,7 +52,7 @@\n #include \"mac.h\"\n \n #define MAX_BLOCKSIZE 32 / MUST fit biggest crypto block size we use/get /\n-#define MAX_MACSIZE 20 / MUST fit biggest MAC length we support /\n+#define MAX_MACSIZE 64 / MUST fit biggest MAC length we support /\n \n #ifdef LIBSSH2DEBUG\n #define UNPRINTABLE_CHAR '.'\ndiff --git a/src/wincng.h b/src/wincng.h\nindex 429192c636..0381247352 100644\n--- a/src/wincng.h\n+++ b/src/wincng.h\n@@ -51,6 +51,8 @@\n #define LIBSSH2_MD5 1\n \n #define LIBSSH2_HMAC_RIPEMD 0\n+#define LIBSSH2_HMAC_SHA256 0\n+#define LIBSSH2_HMAC_SHA512 0\n \n #define LIBSSH2_AES 1\n #define LIBSSH2_AES_CTR 0\n@@ -158,6 +160,10 @@ typedef struct __libssh2_wincng_hash_ctx {\n MD5_DIGEST_LENGTH, key, keylen)\n #define libssh2_hmac_ripemd160_init(ctx, key, keylen)\n / not implemented /\n+#define libssh2_hmac_sha256_init(ctx, key, keylen)\n+ / not implemented /\n+#define libssh2_hmac_sha512_init(ctx, key, keylen)\n+ / not implemented /\n #define libssh2_hmac_update(ctx, data, datalen) \\\n _libssh2_wincng_hash_update(&ctx, (unsigned char ) data, datalen)\n #define libssh2_hmac_final(ctx, hash) \\\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From a53cebba34e6cde2cd4cdc7daec593992cd47e21 Mon Sep 17 00:00:00 2001\nFrom: \"brian m. carlson\" <sandals@crustytoothpaste.net>\nDate: Sun, 6 Sep 2015 14:02:44 +0000\nSubject: [PATCH] Add support for HMAC-SHA-256 and HMAC-SHA-512.\n\nImplement support for these algorithms and wire them up to the libgcrypt\nand OpenSSL backends. Increase the maximum MAC buffer size to 64 bytes\nto prevent buffer overflows. Prefer HMAC-SHA-256 over HMAC-SHA-512, and\nthat over HMAC-SHA-1, as OpenSSH does.\n\nCloses #40\n---\n src/libgcrypt.h \| 8 +++++\n src/mac.c \| 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n src/openssl.h \| 7 +++++\n src/transport.c \| 2 +-\n src/wincng.h \| 6 ++++\n 5 files changed, 119 insertions(+), 1 deletion(-)\n\nIndex: libssh2-1.4.3/src/libgcrypt.h\n===================================================================\n--- libssh2-1.4.3.orig/src/libgcrypt.h\t2012-10-08 14:54:30.000000000 +0200\n+++ libssh2-1.4.3/src/libgcrypt.h\t2016-02-23 15:28:39.264493076 +0100\n@@ -42,6 +42,8 @@\n #define LIBSSH2_MD5 1\n \n #define LIBSSH2_HMAC_RIPEMD 1\n+#define LIBSSH2_HMAC_SHA256 1\n+#define LIBSSH2_HMAC_SHA512 1\n \n #define LIBSSH2_AES 1\n #define LIBSSH2_AES_CTR 1\n@@ -89,6 +91,12 @@\n #define libssh2_hmac_ripemd160_init(ctx, key, keylen) \\\n gcry_md_open (ctx, GCRY_MD_RMD160, GCRY_MD_FLAG_HMAC), \\\n gcry_md_setkey (ctx, key, keylen)\n+#define libssh2_hmac_sha256_init(ctx, key, keylen) \\\n+ gcry_md_open (ctx, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC), \\\n+ gcry_md_setkey (ctx, key, keylen)\n+#define libssh2_hmac_sha512_init(ctx, key, keylen) \\\n+ gcry_md_open (ctx, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC), \\\n+ gcry_md_setkey (ctx, key, keylen)\n #define libssh2_hmac_update(ctx, data, datalen) \\\n gcry_md_write (ctx, data, datalen)\n #define libssh2_hmac_final(ctx, data) \\\nIndex: libssh2-1.4.3/src/mac.c\n===================================================================\n--- libssh2-1.4.3.orig/src/mac.c\t2010-12-15 09:37:31.000000000 +0100\n+++ libssh2-1.4.3/src/mac.c\t2016-02-23 13:49:02.169231812 +0100\n@@ -96,6 +96,97 @@ mac_method_common_dtor(LIBSSH2_SESSION \n \n \n \n+#if LIBSSH2_HMAC_SHA512\n+/* mac_method_hmac_sha512_hash\n+ * Calculate hash using full sha512 value\n+ /\n+static int\n+mac_method_hmac_sha2_512_hash(LIBSSH2_SESSION session,\n+ unsigned char buf, uint32_t seqno,\n+ const unsigned char packet,\n+ uint32_t packet_len,\n+ const unsigned char addtl,\n+ uint32_t addtl_len, void abstract)\n+{\n+ libssh2_hmac_ctx ctx;\n+ unsigned char seqno_buf[4];\n+ (void) session;\n+\n+ _libssh2_htonu32(seqno_buf, seqno);\n+\n+ libssh2_hmac_ctx_init(ctx);\n+ libssh2_hmac_sha512_init(&ctx, abstract, 64);\n+ libssh2_hmac_update(ctx, seqno_buf, 4);\n+ libssh2_hmac_update(ctx, packet, packet_len);\n+ if (addtl && addtl_len) {\n+ libssh2_hmac_update(ctx, addtl, addtl_len);\n+ }\n+ libssh2_hmac_final(ctx, buf);\n+ libssh2_hmac_cleanup(&ctx);\n+\n+ return 0;\n+}\n+\n+\n+\n+static const LIBSSH2_MAC_METHOD mac_method_hmac_sha2_512 = {\n+ \"hmac-sha2-512\",\n+ 64,\n+ 64,\n+ mac_method_common_init,\n+ mac_method_hmac_sha2_512_hash,\n+ mac_method_common_dtor,\n+};\n+#endif\n+\n+\n+\n+#if LIBSSH2_HMAC_SHA256\n+/* mac_method_hmac_sha256_hash\n+ * Calculate hash using full sha256 value\n+ /\n+static int\n+mac_method_hmac_sha2_256_hash(LIBSSH2_SESSION session,\n+ unsigned char buf, uint32_t seqno,\n+ const unsigned char packet,\n+ uint32_t packet_len,\n+ const unsigned char addtl,\n+ uint32_t addtl_len, void abstract)\n+{\n+ libssh2_hmac_ctx ctx;\n+ unsigned char seqno_buf[4];\n+ (void) session;\n+\n+ _libssh2_htonu32(seqno_buf, seqno);\n+\n+ libssh2_hmac_ctx_init(ctx);\n+ libssh2_hmac_sha256_init(&ctx, abstract, 32);\n+ libssh2_hmac_update(ctx, seqno_buf, 4);\n+ libssh2_hmac_update(ctx, packet, packet_len);\n+ if (addtl && addtl_len) {\n+ libssh2_hmac_update(ctx, addtl, addtl_len);\n+ }\n+ libssh2_hmac_final(ctx, buf);\n+ libssh2_hmac_cleanup(&ctx);\n+\n+ return 0;\n+}\n+\n+\n+\n+static const LIBSSH2_MAC_METHOD mac_method_hmac_sha2_256 = {\n+ \"hmac-sha2-256\",\n+ 32,\n+ 32,\n+ mac_method_common_init,\n+ mac_method_hmac_sha2_256_hash,\n+ mac_method_common_dtor,\n+};\n+#endif\n+\n+\n+\n+\n /* mac_method_hmac_sha1_hash\n * Calculate hash using full sha1 value\n /\n@@ -291,6 +382,12 @@ static const LIBSSH2_MAC_METHOD mac_meth\n #endif / LIBSSH2_HMAC_RIPEMD /\n \n static const LIBSSH2_MAC_METHOD mac_methods[] = {\n+#if LIBSSH2_HMAC_SHA256\n+ &mac_method_hmac_sha2_256,\n+#endif\n+#if LIBSSH2_HMAC_SHA512\n+ &mac_method_hmac_sha2_512,\n+#endif\n &mac_method_hmac_sha1,\n &mac_method_hmac_sha1_96,\n #if LIBSSH2_MD5\nIndex: libssh2-1.4.3/src/openssl.h\n===================================================================\n--- libssh2-1.4.3.orig/src/openssl.h\t2012-10-08 14:54:30.000000000 +0200\n+++ libssh2-1.4.3/src/openssl.h\t2016-02-23 15:29:38.014446452 +0100\n@@ -72,6 +72,9 @@\n # define LIBSSH2_HMAC_RIPEMD 1\n #endif\n \n+#define LIBSSH2_HMAC_SHA256 1\n+#define LIBSSH2_HMAC_SHA512 1\n+\n #if OPENSSL_VERSION_NUMBER >= 0x00907000L && !defined(OPENSSL_NO_AES)\n # define LIBSSH2_AES_CTR 1\n # define LIBSSH2_AES 1\n@@ -122,12 +125,18 @@ void libssh2_sha1(const unsigned char m\n void libssh2_md5(const unsigned char message, unsigned long len, unsigned char out);\n \n #define libssh2_hmac_ctx HMAC_CTX\n+#define libssh2_hmac_ctx_init(ctx) \\\n+ HMAC_CTX_init(&ctx)\n #define libssh2_hmac_sha1_init(ctx, key, keylen) \\\n HMAC_Init(ctx, key, keylen, EVP_sha1())\n #define libssh2_hmac_md5_init(ctx, key, keylen) \\\n HMAC_Init(ctx, key, keylen, EVP_md5())\n #define libssh2_hmac_ripemd160_init(ctx, key, keylen) \\\n HMAC_Init(ctx, key, keylen, EVP_ripemd160())\n+#define libssh2_hmac_sha256_init(ctx, key, keylen) \\\n+ HMAC_Init(ctx, key, keylen, EVP_sha256())\n+#define libssh2_hmac_sha512_init(ctx, key, keylen) \\\n+ HMAC_Init(ctx, key, keylen, EVP_sha512())\n #define libssh2_hmac_update(ctx, data, datalen) \\\n HMAC_Update(&(ctx), data, datalen)\n #define libssh2_hmac_final(ctx, data) HMAC_Final(&(ctx), data, NULL)\nIndex: libssh2-1.4.3/src/transport.c\n===================================================================\n--- libssh2-1.4.3.orig/src/transport.c\t2012-10-08 14:54:30.000000000 +0200\n+++ libssh2-1.4.3/src/transport.c\t2016-02-23 13:49:02.169231812 +0100\n@@ -52,7 +52,7 @@\n #include \"mac.h\"\n \n #define MAX_BLOCKSIZE 32 / MUST fit biggest crypto block size we use/get /\n-#define MAX_MACSIZE 20 / MUST fit biggest MAC length we support /\n+#define MAX_MACSIZE 64 / MUST fit biggest MAC length we support */\n \n #ifdef LIBSSH2DEBUG\n #define UNPRINTABLE_CHAR '.'" } ]	{ "id": "libssh2_org-4819-0001-Add-support-for-HMAC-SHA-", "cves": [], "package": "libssh2_org", "incident_id": 0, "patch_name": "", "tier": "adapted", "language": "c", "patch_lines_changed": 116, "patch_files_count": 4, "total_tokens_est": 3637, "has_source_context": true, "upstream_enriched": true, "suse_license": "BSD-3-Clause", "upstream_license": "BSD-3-Clause", "cve_id": null, "upstream_commit": "a53cebba34e6cde2cd4cdc7daec593992cd47e21", "upstream_repo": "libssh2/libssh2" }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#8051 add DN qualifier\n\n## Package\nopenldap2\n\n## Files to modify\n- doc/man/man5/slapd-sock.5\n- servers/slapd/back-sock/back-sock.h\n- servers/slapd/back-sock/config.c\n\n## Target Source Code\n\n### doc/man/man5/slapd-sock.5\n\n#### region() [lines 9-115]\n```\n.SH DESCRIPTION\nThe Socket backend to\n.BR slapd (8)\nuses an external program to handle queries, similarly to\n.BR slapd\\-shell (5).\nHowever, in this case the external program listens on a Unix domain socket.\nThis makes it possible to have a pool of processes, which persist between\nrequests. This allows multithreaded operation and a higher level of\nefficiency. The external program must have been started independently;\n.BR slapd (8)\nitself will not start it.\n\nThis module may also be used as an overlay on top of some other database.\nUse as an overlay allows external actions to be triggered in response to\noperations on the main database.\n.SH CONFIGURATION\nThese\n.B slapd.conf\noptions apply to the SOCK backend database.\nThat is, they must follow a \"database sock\" line and come before any\nsubsequent \"backend\" or \"database\" lines.\nOther database options are described in the\n.BR slapd.conf (5)\nmanual page.\n\nAlternatively, to use this module as an overlay, these directives must\nfollow an \"overlay sock\" line within an existing database definition.\n.TP\n.B extensions [ binddn \| peername \| ssf \| connid ]\nEnables the sending of additional meta-attributes with each request.\n.nf\nbinddn: <bound DN>\npeername: IP=<address>:<port>\nssf: <SSF value>\nconnid: <connection ID>\n.fi\n.TP\n.B socketpath <pathname>\nGives the path to a Unix domain socket to which the commands will\nbe sent and from which replies are received.\n\nWhen used as an overlay, these additional directives are defined:\n.TP\n.B sockops\t[ bind \| unbind \| search \| compare \| modify \| modrdn \| add \| delete ]\nSpecify which request types to send to the external program. The default is\nempty (no requests are sent).\n.TP\n.B sockresps [ result \| search ]\nSpecify which response types to send to the external program. \"result\"\nsends just the results of an operation. \"search\" sends all entries that\nthe database returned for a search request. The default is empty\n(no responses are sent).\n\n.SH PROTOCOL\nThe protocol is essentially the same as\n.BR slapd\\-shell (5)\nwith the addition of a newline to terminate the command parameters. The\nfollowing commands are sent:\n.RS\n.nf\nADD\nmsgid: <message id>\n<repeat { \"suffix:\" <database suffix DN> }>\n<entry in LDIF format>\n<blank line>\n.fi\n.RE\n.PP\n.RS\n.nf\nBIND\nmsgid: <message id>\n<repeat { \"suffix:\" <database suffix DN> }>\ndn: <DN>\nmethod: <method number>\ncredlen: <length of <credentials>>\ncred: <credentials>\n<blank line>\n.fi\n.RE\n.PP\n.RS\n.nf\nCOMPARE\nmsgid: <message id>\n<repeat { \"suffix:\" <database suffix DN> }>\ndn: <DN>\n<attribute>: <value>\n<blank line>\n.fi\n.RE\n.PP\n.RS\n.nf\nDELETE\nmsgid: <message id>\n<repeat { \"suffix:\" <database suffix DN> }>\ndn: <DN>\n<blank line>\n.fi\n.RE\n.PP\n.RS\n.nf\nMODIFY\nmsgid: <message id>\n<repeat { \"suffix:\" <database suffix DN> }>\n```\n\n### servers/slapd/back-sock/back-sock.h\n\n#### region() [lines 1-60]\n```c\n/ sock.h - socket backend header file /\n/ $OpenLDAP$ /\n/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n \n Copyright 2007-2015 The OpenLDAP Foundation.\n * All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n * modification, are permitted only as authorized by the OpenLDAP\n * Public License.\n \n A copy of this license is available in the file LICENSE in the\n * top-level directory of the distribution or, alternatively, at\n * <http://www.OpenLDAP.org/license.html>.\n /\n/ ACKNOWLEDGEMENTS:\n * This work was initially developed by Brian Candler for inclusion\n * in OpenLDAP Software.\n /\n\n#ifndef SLAPD_SOCK_H\n#define SLAPD_SOCK_H\n\n#include \"proto-sock.h\"\n\nLDAP_BEGIN_DECL\n\nstruct sockinfo {\n\tconst char\tsi_sockpath;\n\tslap_mask_t\tsi_extensions;\n\tslap_mask_t\tsi_ops;\t\t/* overlay: operations to act on /\n\tslap_mask_t\tsi_resps;\t/ overlay: responses to forward /\n};\n\n#define\tSOCK_EXT_BINDDN\t1\n#define\tSOCK_EXT_PEERNAME\t2\n#define\tSOCK_EXT_SSF\t\t4\n#define\tSOCK_EXT_CONNID\t\t8\n\nextern FILE opensock LDAP_P((\n\tconst char sockpath));\n\nextern void sock_print_suffixes LDAP_P((\n\tFILE fp,\n\tBackendDB bd));\n\nextern void sock_print_conn LDAP_P((\n\tFILE fp,\n\tConnection conn,\n\tstruct sockinfo si));\n\nextern int sock_read_and_send_results LDAP_P((\n\tOperation op,\n\tSlapReply rs,\n\tFILE fp));\n\nLDAP_END_DECL\n\n#endif\n\n```\n\n### servers/slapd/back-sock/config.c\n\n#### region() [lines 1-98]\n```c\n/ config.c - sock backend configuration file routine /\n/ $OpenLDAP$ /\n/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n \n Copyright 2007-2015 The OpenLDAP Foundation.\n * All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n * modification, are permitted only as authorized by the OpenLDAP\n * Public License.\n \n A copy of this license is available in the file LICENSE in the\n * top-level directory of the distribution or, alternatively, at\n * <http://www.OpenLDAP.org/license.html>.\n /\n/ ACKNOWLEDGEMENTS:\n * This work was initially developed by Brian Candler for inclusion\n * in OpenLDAP Software. Dynamic config support by Howard Chu.\n /\n\n#include \"portable.h\"\n\n#include <stdio.h>\n\n#include <ac/string.h>\n#include <ac/socket.h>\n\n#include \"slap.h\"\n#include \"config.h\"\n#include \"back-sock.h\"\n\nstatic ConfigDriver bs_cf_gen;\nstatic int sock_over_setup();\nstatic slap_response sock_over_response;\n\nenum {\n\tBS_EXT = 1,\n\tBS_OPS,\n\tBS_RESP\n};\n\n/ The number of overlay-only config attrs /\n#define NUM_OV_ATTRS\t2\n\nstatic ConfigTable bscfg[] = {\n\t{ \"sockops\", \"ops\", 2, 0, 0, ARG_MAGIC\|BS_OPS,\n\t\tbs_cf_gen, \"( OLcfgDbAt:7.3 NAME 'olcOvSocketOps' \"\n\t\t\t\"DESC 'Operation types to forward' \"\n\t\t\t\"EQUALITY caseIgnoreMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n\t{ \"sockresps\", \"resps\", 2, 0, 0, ARG_MAGIC\|BS_RESP,\n\t\tbs_cf_gen, \"( OLcfgDbAt:7.4 NAME 'olcOvSocketResps' \"\n\t\t\t\"DESC 'Response types to forward' \"\n\t\t\t\"EQUALITY caseIgnoreMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n\n\t{ \"socketpath\", \"pathname\", 2, 2, 0, ARG_STRING\|ARG_OFFSET,\n\t\t(void )offsetof(struct sockinfo, si_sockpath),\n\t\t\"( OLcfgDbAt:7.1 NAME 'olcDbSocketPath' \"\n\t\t\t\"DESC 'Pathname for Unix domain socket' \"\n\t\t\t\"EQUALITY caseExactMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString SINGLE-VALUE )\", NULL, NULL },\n\t{ \"extensions\", \"ext\", 2, 0, 0, ARG_MAGIC\|BS_EXT,\n\t\tbs_cf_gen, \"( OLcfgDbAt:7.2 NAME 'olcDbSocketExtensions' \"\n\t\t\t\"DESC 'binddn, peername, or ssf' \"\n\t\t\t\"EQUALITY caseIgnoreMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n\t{ NULL, NULL }\n};\n\nstatic ConfigOCs bsocs[] = {\n\t{ \"( OLcfgDbOc:7.1 \"\n\t\t\"NAME 'olcDbSocketConfig' \"\n\t\t\"DESC 'Socket backend configuration' \"\n\t\t\"SUP olcDatabaseConfig \"\n\t\t\"MUST olcDbSocketPath \"\n\t\t\"MAY olcDbSocketExtensions )\",\n\t\t\tCft_Database, bscfg+NUM_OV_ATTRS },\n\t{ NULL, 0, NULL }\n};\n\nstatic ConfigOCs osocs[] = {\n\t{ \"( OLcfgDbOc:7.2 \"\n\t\t\"NAME 'olcOvSocketConfig' \"\n\t\t\"DESC 'Socket overlay configuration' \"\n\t\t\"SUP olcOverlayConfig \"\n\t\t\"MUST olcDbSocketPath \"\n\t\t\"MAY ( olcDbSocketExtensions $ \"\n\t\t\t\" olcOvSocketOps $ olcOvSocketResps ) )\",\n\t\t\tCft_Overlay, bscfg },\n\t{ NULL, 0, NULL }\n};\n\n#define SOCK_OP_BIND\t0x001\n#define SOCK_OP_UNBIND\t0x002\n#define SOCK_OP_SEARCH\t0x004\n#define SOCK_OP_COMPARE\t0x008\n#define SOCK_OP_MODIFY\t0x010\n```\n\n#### region() [lines 4-110]\n```c\n \n Copyright 2007-2015 The OpenLDAP Foundation.\n * All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n * modification, are permitted only as authorized by the OpenLDAP\n * Public License.\n \n A copy of this license is available in the file LICENSE in the\n * top-level directory of the distribution or, alternatively, at\n * <http://www.OpenLDAP.org/license.html>.\n /\n/ ACKNOWLEDGEMENTS:\n * This work was initially developed by Brian Candler for inclusion\n * in OpenLDAP Software. Dynamic config support by Howard Chu.\n /\n\n#include \"portable.h\"\n\n#include <stdio.h>\n\n#include <ac/string.h>\n#include <ac/socket.h>\n\n#include \"slap.h\"\n#include \"config.h\"\n#include \"back-sock.h\"\n\nstatic ConfigDriver bs_cf_gen;\nstatic int sock_over_setup();\nstatic slap_response sock_over_response;\n\nenum {\n\tBS_EXT = 1,\n\tBS_OPS,\n\tBS_RESP\n};\n\n/ The number of overlay-only config attrs /\n#define NUM_OV_ATTRS\t2\n\nstatic ConfigTable bscfg[] = {\n\t{ \"sockops\", \"ops\", 2, 0, 0, ARG_MAGIC\|BS_OPS,\n\t\tbs_cf_gen, \"( OLcfgDbAt:7.3 NAME 'olcOvSocketOps' \"\n\t\t\t\"DESC 'Operation types to forward' \"\n\t\t\t\"EQUALITY caseIgnoreMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n\t{ \"sockresps\", \"resps\", 2, 0, 0, ARG_MAGIC\|BS_RESP,\n\t\tbs_cf_gen, \"( OLcfgDbAt:7.4 NAME 'olcOvSocketResps' \"\n\t\t\t\"DESC 'Response types to forward' \"\n\t\t\t\"EQUALITY caseIgnoreMatc\n/ ... truncated ... /\n```\n\n\n### Type definitions\n\n```c\n/ from back-sock.h /\nstruct sockinfo {\n\tconst char\tsi_sockpath;\n\tslap_mask_t\tsi_extensions;\n\tslap_mask_t\tsi_ops;\t\t/* overlay: operations to act on /\n\tslap_mask_t\tsi_resps;\t/ overlay: responses to forward /\n};\n```\n\n\n## Upstream Fix\n```diff\nFrom 328612d3370290c7f42ad835e1b0e3189eadef7b Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Wed, 4 Feb 2015 03:53:13 +0000\nSubject: [PATCH] ITS#8051 add DN qualifier\n\n---\n doc/man/man5/slapd-sock.5 \| 5 +++++\n servers/slapd/back-sock/back-sock.h \| 2 ++\n servers/slapd/back-sock/config.c \| 32 +++++++++++++++++++++++++++++---\n 3 files changed, 36 insertions(+), 3 deletions(-)\n\ndiff --git a/doc/man/man5/slapd-sock.5 b/doc/man/man5/slapd-sock.5\nindex ee8cc919f..1ac4f7fdd 100644\n--- a/doc/man/man5/slapd-sock.5\n+++ b/doc/man/man5/slapd-sock.5\n@@ -58,6 +58,11 @@ Specify which response types to send to the external program. \"result\"\n sends just the results of an operation. \"search\" sends all entries that\n the database returned for a search request. The default is empty\n (no responses are sent).\n+.TP\n+.B sockdnpat\t<regexp>\n+Specify DN patterns for which the overlay will act. Only operations on\n+DNs matching the specified regular expression will be processed. The default\n+is empty (all DNs are processed).\n \n .SH PROTOCOL\n The protocol is essentially the same as\ndiff --git a/servers/slapd/back-sock/back-sock.h b/servers/slapd/back-sock/back-sock.h\nindex 15495a6bc..7a083a8df 100644\n--- a/servers/slapd/back-sock/back-sock.h\n+++ b/servers/slapd/back-sock/back-sock.h\n@@ -30,6 +30,8 @@ struct sockinfo {\n \tslap_mask_t\tsi_extensions;\n \tslap_mask_t\tsi_ops;\t\t/ overlay: operations to act on /\n \tslap_mask_t\tsi_resps;\t/ overlay: responses to forward /\n+\tregex_t\tsi_dnpat;\t\t/ overlay: DN pattern to match /\n+\tstruct berval \tsi_dnpatstr;\n };\n \n #define\tSOCK_EXT_BINDDN\t1\ndiff --git a/servers/slapd/back-sock/config.c b/servers/slapd/back-sock/config.c\nindex d8ff95ceb..dc3f1365c 100644\n--- a/servers/slapd/back-sock/config.c\n+++ b/servers/slapd/back-sock/config.c\n@@ -36,11 +36,12 @@ static slap_response sock_over_response;\n enum {\n \tBS_EXT = 1,\n \tBS_OPS,\n-\tBS_RESP\n+\tBS_RESP,\n+\tBS_DNPAT\n };\n \n / The number of overlay-only config attrs /\n-#define NUM_OV_ATTRS\t2\n+#define NUM_OV_ATTRS\t3\n \n static ConfigTable bscfg[] = {\n \t{ \"sockops\", \"ops\", 2, 0, 0, ARG_MAGIC\|BS_OPS,\n@@ -53,6 +54,11 @@ static ConfigTable bscfg[] = {\n \t\t\t\"DESC 'Response types to forward' \"\n \t\t\t\"EQUALITY caseIgnoreMatch \"\n \t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n+\t{ \"sockdnpat\", \"regexp\", 2, 2, 0, ARG_MAGIC\|BS_DNPAT,\n+\t\tbs_cf_gen, \"( OLcfgDbAt:7.5 NAME 'olcOvSocketDNpat' \"\n+\t\t\t\"DESC 'DN pattern to match' \"\n+\t\t\t\"EQUALITY caseIgnoreMatch \"\n+\t\t\t\"SYNTAX OMsDirectoryString SINGLE-VALUE )\", NULL, NULL },\n \n \t{ \"socketpath\", \"pathname\", 2, 2, 0, ARG_STRING\|ARG_OFFSET,\n \t\t(void )offsetof(struct sockinfo, si_sockpath),\n@@ -86,7 +92,8 @@ static ConfigOCs osocs[] = {\n \t\t\"SUP olcOverlayConfig \"\n \t\t\"MUST olcDbSocketPath \"\n \t\t\"MAY ( olcDbSocketExtensions $ \"\n-\t\t\t\" olcOvSocketOps $ olcOvSocketResps ) )\",\n+\t\t\t\" olcOvSocketOps $ olcOvSocketResps $ \"\n+\t\t\t\" olcOvSocketDNpat ) )\",\n \t\t\tCft_Overlay, bscfg },\n \t{ NULL, 0, NULL }\n };\n@@ -150,6 +157,9 @@ bs_cf_gen( ConfigArgs c )\n \t\t\treturn mask_to_verbs( ov_ops, si->si_ops, &c->rvalue_vals );\n \t\tcase BS_RESP:\n \t\t\treturn mask_to_verbs( ov_resps, si->si_resps, &c->rvalue_vals );\n+\t\tcase BS_DNPAT:\n+\t\t\tvalue_add_one( &c->rvalue_vals, &si->si_dnpatstr );\n+\t\t\treturn 0;\n \t\t}\n \t} else if ( c->op == LDAP_MOD_DELETE ) {\n \t\tswitch( c->type ) {\n@@ -186,6 +196,11 @@ bs_cf_gen( ConfigArgs c )\n \t\t\t\t\tsi->si_resps ^= dels;\n \t\t\t}\n \t\t\treturn rc;\n+\t\tcase BS_DNPAT:\n+\t\t\tregfree( &si->si_dnpat );\n+\t\t\tch_free( si->si_dnpatstr.bv_val );\n+\t\t\tBER_BVZERO( &si->si_dnpatstr );\n+\t\t\treturn 0;\n \t\t}\n \n \t} else {\n@@ -196,6 +211,13 @@ bs_cf_gen( ConfigArgs c )\n \t\t\treturn verbs_to_mask( c->argc, c->argv, ov_ops, &si->si_ops );\n \t\tcase BS_RESP:\n \t\t\treturn verbs_to_mask( c->argc, c->argv, ov_resps, &si->si_resps );\n+\t\tcase BS_DNPAT:\n+\t\t\tif ( !regcomp( &si->si_dnpat, c->argv[1], REG_EXTENDED\|REG_ICASE\|REG_NOSUB )) {\n+\t\t\t\tber_str2bv( c->argv[1], 0, 1, &si->si_dnpatstr );\n+\t\t\t\treturn 0;\n+\t\t\t} else {\n+\t\t\t\treturn 1;\n+\t\t\t}\n \t\t}\n \t}\n \treturn 1;\n@@ -268,6 +290,10 @@ static int sock_over_op(\n \tif ( !(si->si_ops & sockopflags[which]))\n \t\treturn SLAP_CB_CONTINUE;\n \n+\tif ( !BER_BVISEMPTY( &si->si_dnpatstr ) &&\n+\t\tregexec( &si->si_dnpat, op->o_req_ndn.bv_val, 0, NULL, 0 ))\n+\t\treturn SLAP_CB_CONTINUE;\n+\n \top->o_bd->be_private = si;\n \tsc = op->o_callback;\n \top->o_callback = NULL;\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 328612d3370290c7f42ad835e1b0e3189eadef7b Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Wed, 4 Feb 2015 03:53:13 +0000\nSubject: [PATCH] ITS#8051 add DN qualifier\n\n---\n doc/man/man5/slapd-sock.5 \| 5 +++++\n servers/slapd/back-sock/back-sock.h \| 2 ++\n servers/slapd/back-sock/config.c \| 32 +++++++++++++++++++++++++++++---\n 3 files changed, 36 insertions(+), 3 deletions(-)\n\ndiff --git a/doc/man/man5/slapd-sock.5 b/doc/man/man5/slapd-sock.5\nindex ee8cc919f..1ac4f7fdd 100644\n--- a/doc/man/man5/slapd-sock.5\n+++ b/doc/man/man5/slapd-sock.5\n@@ -58,6 +58,11 @@ Specify which response types to send to the external program. \"result\"\n sends just the results of an operation. \"search\" sends all entries that\n the database returned for a search request. The default is empty\n (no responses are sent).\n+.TP\n+.B sockdnpat\t<regexp>\n+Specify DN patterns for which the overlay will act. Only operations on\n+DNs matching the specified regular expression will be processed. The default\n+is empty (all DNs are processed).\n \n .SH PROTOCOL\n The protocol is essentially the same as\ndiff --git a/servers/slapd/back-sock/back-sock.h b/servers/slapd/back-sock/back-sock.h\nindex 15495a6bc..7a083a8df 100644\n--- a/servers/slapd/back-sock/back-sock.h\n+++ b/servers/slapd/back-sock/back-sock.h\n@@ -30,6 +30,8 @@ struct sockinfo {\n \tslap_mask_t\tsi_extensions;\n \tslap_mask_t\tsi_ops;\t\t/ overlay: operations to act on /\n \tslap_mask_t\tsi_resps;\t/ overlay: responses to forward /\n+\tregex_t\tsi_dnpat;\t\t/ overlay: DN pattern to match /\n+\tstruct berval \tsi_dnpatstr;\n };\n \n #define\tSOCK_EXT_BINDDN\t1\ndiff --git a/servers/slapd/back-sock/config.c b/servers/slapd/back-sock/config.c\nindex d8ff95ceb..dc3f1365c 100644\n--- a/servers/slapd/back-sock/config.c\n+++ b/servers/slapd/back-sock/config.c\n@@ -36,11 +36,12 @@ static slap_response sock_over_response;\n enum {\n \tBS_EXT = 1,\n \tBS_OPS,\n-\tBS_RESP\n+\tBS_RESP,\n+\tBS_DNPAT\n };\n \n / The number of overlay-only config attrs /\n-#define NUM_OV_ATTRS\t2\n+#define NUM_OV_ATTRS\t3\n \n static ConfigTable bscfg[] = {\n \t{ \"sockops\", \"ops\", 2, 0, 0, ARG_MAGIC\|BS_OPS,\n@@ -53,6 +54,11 @@ static ConfigTable bscfg[] = {\n \t\t\t\"DESC 'Response types to forward' \"\n \t\t\t\"EQUALITY caseIgnoreMatch \"\n \t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n+\t{ \"sockdnpat\", \"regexp\", 2, 2, 0, ARG_MAGIC\|BS_DNPAT,\n+\t\tbs_cf_gen, \"( OLcfgDbAt:7.5 NAME 'olcOvSocketDNpat' \"\n+\t\t\t\"DESC 'DN pattern to match' \"\n+\t\t\t\"EQUALITY caseIgnoreMatch \"\n+\t\t\t\"SYNTAX OMsDirectoryString SINGLE-VALUE )\", NULL, NULL },\n \n \t{ \"socketpath\", \"pathname\", 2, 2, 0, ARG_STRING\|ARG_OFFSET,\n \t\t(void )offsetof(struct sockinfo, si_sockpath),\n@@ -86,7 +92,8 @@ static ConfigOCs osocs[] = {\n \t\t\"SUP olcOverlayConfig \"\n \t\t\"MUST olcDbSocketPath \"\n \t\t\"MAY ( olcDbSocketExtensions $ \"\n-\t\t\t\" olcOvSocketOps $ olcOvSocketResps ) )\",\n+\t\t\t\" olcOvSocketOps $ olcOvSocketResps $ \"\n+\t\t\t\" olcOvSocketDNpat ) )\",\n \t\t\tCft_Overlay, bscfg },\n \t{ NULL, 0, NULL }\n };\n@@ -150,6 +157,9 @@ bs_cf_gen( ConfigArgs c )\n \t\t\treturn mask_to_verbs( ov_ops, si->si_ops, &c->rvalue_vals );\n \t\tcase BS_RESP:\n \t\t\treturn mask_to_verbs( ov_resps, si->si_resps, &c->rvalue_vals );\n+\t\tcase BS_DNPAT:\n+\t\t\tvalue_add_one( &c->rvalue_vals, &si->si_dnpatstr );\n+\t\t\treturn 0;\n \t\t}\n \t} else if ( c->op == LDAP_MOD_DELETE ) {\n \t\tswitch( c->type ) {\n@@ -186,6 +196,11 @@ bs_cf_gen( ConfigArgs c )\n \t\t\t\t\tsi->si_resps ^= dels;\n \t\t\t}\n \t\t\treturn rc;\n+\t\tcase BS_DNPAT:\n+\t\t\tregfree( &si->si_dnpat );\n+\t\t\tch_free( si->si_dnpatstr.bv_val );\n+\t\t\tBER_BVZERO( &si->si_dnpatstr );\n+\t\t\treturn 0;\n \t\t}\n \n \t} else {\n@@ -196,6 +211,13 @@ bs_cf_gen( ConfigArgs *c )\n \t\t\treturn verbs_to_mask( c->argc, c->argv, ov_ops, &si->si_ops );\n \t\tcase BS_RESP:\n \t\t\treturn verbs_to_mask( c->argc, c->argv, ov_resps, &si->si_resps );\n+\t\tcase BS_DNPAT:\n+\t\t\tif ( !regcomp( &si->si_dnpat, c->argv[1], REG_EXTENDED\|REG_ICASE\|REG_NOSUB )) {\n+\t\t\t\tber_str2bv( c->argv[1], 0, 1, &si->si_dnpatstr );\n+\t\t\t\treturn 0;\n+\t\t\t} else {\n+\t\t\t\treturn 1;\n+\t\t\t}\n \t\t}\n \t}\n \treturn 1;\n@@ -268,6 +290,10 @@ static int sock_over_op(\n \tif ( !(si->si_ops & sockopflags[which]))\n \t\treturn SLAP_CB_CONTINUE;\n \n+\tif ( !BER_BVISEMPTY( &si->si_dnpatstr ) &&\n+\t\tregexec( &si->si_dnpat, op->o_req_ndn.bv_val, 0, NULL, 0 ))\n+\t\treturn SLAP_CB_CONTINUE;\n+\n \top->o_bd->be_private = si;\n \tsc = op->o_callback;\n \top->o_callback = NULL;\n" } ]	{ "id": "openldap2-15919-0012-ITS8051-sockdnpat.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0012-ITS8051-sockdnpat.patch", "tier": "identical", "language": "c", "patch_lines_changed": 39, "patch_files_count": 3, "total_tokens_est": 2340, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nindex 71e3ea4..bafef72 100644\n\n## Package\nopenldap2\n\n## Files to modify\n- servers/slapd/back-bdb/filterindex.c\n- servers/slapd/back-mdb/filterindex.c\n\n## Target Source Code\n\n### servers/slapd/back-bdb/filterindex.c\n\n#### equality_candidates() [lines 692-799]\n```c\n\t\t(long) ids[0],\n\t\t(long) BDB_IDL_FIRST(ids),\n\t\t(long) BDB_IDL_LAST(ids) );\n\ndone:\n\treturn rc;\n}\n\nstatic int\nequality_candidates(\n\tOperation op,\n\tDB_TXN rtxn,\n\tAttributeAssertion ava,\n\tID ids,\n\tID tmp )\n{\n\tstruct bdb_info bdb = (struct bdb_info ) op->o_bd->be_private;\n\tDB\tdb;\n\tint i;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> bdb_equality_candidates (%s)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\n\tif ( ava->aa_desc == slap_schema.si_ad_entryDN ) {\n\t\tEntryInfo ei = NULL;\n\t\trc = bdb_cache_find_ndn( op, rtxn, &ava->aa_value, &ei );\n\t\tif ( rc == LDAP_SUCCESS ) {\n\t\t\t/ exactly one ID can match /\n\t\t\tids[0] = 1;\n\t\t\tids[1] = ei->bei_id;\n\t\t}\n\t\tif ( ei ) {\n\t\t\tbdb_cache_entryinfo_unlock( ei );\n\t\t}\n\t\tif ( rc == DB_NOTFOUND ) {\n\t\t\tBDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t}\n\t\treturn rc;\n\t}\n\n\tBDB_IDL_ALL( bdb, ids );\n\n\trc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,\n\t\t&db, &mask, &prefix );\n\n\tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= bdb_equality_candidates: (%s) not indexed\\n\", \n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= bdb_equality_candidates: (%s) \"\n\t\t\t\"index_param failed (%d)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tmr = ava->aa_desc->ad_type->sat_equality;\n\tif( !mr ) {\n\t\treturn 0;\n\t}\n\n\tif( !mr->smr_filter ) {\n\t\treturn 0;\n\t}\n\n\trc = (mr->smr_filter)(\n\t\tLDAP_FILTER_EQUALITY,\n\t\tmask,\n\t\tava->aa_desc->ad_type->sat_syntax,\n\t\tmr,\n\t\t&prefix,\n\t\t&ava->aa_value,\n\t\t&keys, op->o_tmpmemctx );\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= bdb_equality_candidates: (%s, %s) \"\n\t\t\t\"MR filter failed (%d)\\n\",\n\t\t\tprefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );\n\t\treturn 0;\n\t}\n\n\tif( keys == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= bdb_equality_candidates: (%s) no keys\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tfor ( i= 0; keys[i].bv_val != NULL; i++ ) {\n\t\trc = bdb_key_read( op->o_bd, db, rtxn, &keys[i], tmp, NULL, 0 );\n\n\t\tif( rc == DB_NOTFOUND ) {\n\t\t\tBDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t\tbreak;\n\t\t} else if( rc != LDAP_SUCCESS ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n```\n\n#### approx_candidates() [lines 809-916]\n```c\n\t\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\t\tBDB_IDL_ZERO( ids );\n\t\t\tbreak;\n\t\t}\n\n\t\tif ( i == 0 ) {\n\t\t\tBDB_IDL_CPY( ids, tmp );\n\t\t} else {\n\t\t\tbdb_idl_intersection( ids, tmp );\n\t\t}\n\n\t\tif( BDB_IDL_IS_ZERO( ids ) )\n\t\t\tbreak;\n\t}\n\n\tber_bvarray_free_x( keys, op->o_tmpmemctx );\n\n\tDebug( LDAP_DEBUG_TRACE,\n\t\t\"<= bdb_equality_candidates: id=%ld, first=%ld, last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) BDB_IDL_FIRST(ids),\n\t\t(long) BDB_IDL_LAST(ids) );\n\treturn( rc );\n}\n\n\nstatic int\napprox_candidates(\n\tOperation op,\n\tDB_TXN rtxn,\n\tAttributeAssertion ava,\n\tID ids,\n\tID tmp )\n{\n\tstruct bdb_info bdb = (struct bdb_info ) op->o_bd->be_private;\n\tDB\tdb;\n\tint i;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> bdb_approx_candidates (%s)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\n\tBDB_IDL_ALL( bdb, ids );\n\n\trc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,\n\t\t&db, &mask, &prefix );\n\n\tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= bdb_approx_candidates: (%s) not indexed\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= bdb_approx_candidates: (%s) \"\n\t\t\t\"index_param failed (%d)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tmr = ava->aa_desc->ad_type->sat_approx;\n\tif( !mr ) {\n\t\t/ no approx matching rule, try equality matching rule /\n\t\tmr = ava->aa_desc->ad_type->sat_equality;\n\t}\n\n\tif( !mr ) {\n\t\treturn 0;\n\t}\n\n\tif( !mr->smr_filter ) {\n\t\treturn 0;\n\t}\n\n\trc = (mr->smr_filter)(\n\t\tLDAP_FILTER_APPROX,\n\t\tmask,\n\t\tava->aa_desc->ad_type->sat_syntax,\n\t\tmr,\n\t\t&prefix,\n\t\t&ava->aa_value,\n\t\t&keys, op->o_tmpmemctx );\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= bdb_approx_candidates: (%s, %s) \"\n\t\t\t\"MR filter failed (%d)\\n\",\n\t\t\tprefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );\n\t\treturn 0;\n\t}\n\n\tif( keys == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= bdb_approx_candidates: (%s) no keys (%s)\\n\",\n\t\t\tprefix.bv_val, ava->aa_desc->ad_cname.bv_val, 0 );\n\t\treturn 0;\n\t}\n\n\tfor ( i= 0; keys[i].bv_val != NULL; i++ ) {\n\t\trc = bdb_key_read( op->o_bd, db, rtxn, &keys[i], tmp, NULL, 0 );\n\n\t\tif( rc == DB_NOTFOUND ) {\n```\n\n#### substring_candidates() [lines 929-1036]\n```c\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= bdb_approx_candidates: (%s) NULL\\n\",\n\t\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\t\tBDB_IDL_ZERO( ids );\n\t\t\tbreak;\n\t\t}\n\n\t\tif ( i == 0 ) {\n\t\t\tBDB_IDL_CPY( ids, tmp );\n\t\t} else {\n\t\t\tbdb_idl_intersection( ids, tmp );\n\t\t}\n\n\t\tif( BDB_IDL_IS_ZERO( ids ) )\n\t\t\tbreak;\n\t}\n\n\tber_bvarray_free_x( keys, op->o_tmpmemctx );\n\n\tDebug( LDAP_DEBUG_TRACE, \"<= bdb_approx_candidates %ld, first=%ld, last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) BDB_IDL_FIRST(ids),\n\t\t(long) BDB_IDL_LAST(ids) );\n\treturn( rc );\n}\n\nstatic int\nsubstring_candidates(\n\tOperation op,\n\tDB_TXN rtxn,\n\tSubstringsAssertion\tsub,\n\tID ids,\n\tID tmp )\n{\n\tstruct bdb_info bdb = (struct bdb_info ) op->o_bd->be_private;\n\tDB\tdb;\n\tint i;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> bdb_substring_candidates (%s)\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n\n\tBDB_IDL_ALL( bdb, ids );\n\n\trc = bdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,\n\t\t&db, &mask, &prefix );\n\n\tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= bdb_substring_candidates: (%s) not indexed\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= bdb_substring_candidates: (%s) \"\n\t\t\t\"index_param failed (%d)\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tmr = sub->sa_desc->ad_type->sat_substr;\n\n\tif( !mr ) {\n\t\treturn 0;\n\t}\n\n\tif( !mr->smr_filter ) {\n\t\treturn 0;\n\t}\n\n\trc = (mr->smr_filter)(\n\t\tLDAP_FILTER_SUBSTRINGS,\n\t\tmask,\n\t\tsub->sa_desc->ad_type->sat_syntax,\n\t\tmr,\n\t\t&prefix,\n\t\tsub,\n\t\t&keys, op->o_tmpmemctx );\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= bdb_substring_candidates: (%s) \"\n\t\t\t\"MR filter failed (%d)\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tif( keys == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= bdb_substring_candidates: (0x%04lx) no keys (%s)\\n\",\n\t\t\tmask, sub->sa_desc->ad_cname.bv_val, 0 );\n\t\treturn 0;\n\t}\n\n\tfor ( i= 0; keys[i].bv_val != NULL; i++ ) {\n\t\trc = bdb_key_read( op->o_bd, db, rtxn, &keys[i], tmp, NULL, 0 );\n\n\t\tif( rc == DB_NOTFOUND ) {\n\t\t\tBDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t\tbreak;\n\t\t} else if( rc != LDAP_SUCCESS ) {\n```\n\n#### inequality_candidates() [lines 1046-1153]\n```c\n\t\t\t\t\"<= bdb_substring_candidates: (%s) NULL\\n\",\n\t\t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n\t\t\tBDB_IDL_ZERO( ids );\n\t\t\tbreak;\n\t\t}\n\n\t\tif ( i == 0 ) {\n\t\t\tBDB_IDL_CPY( ids, tmp );\n\t\t} else {\n\t\t\tbdb_idl_intersection( ids, tmp );\n\t\t}\n\n\t\tif( BDB_IDL_IS_ZERO( ids ) )\n\t\t\tbreak;\n\t}\n\n\tber_bvarray_free_x( keys, op->o_tmpmemctx );\n\n\tDebug( LDAP_DEBUG_TRACE, \"<= bdb_substring_candidates: %ld, first=%ld, last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) BDB_IDL_FIRST(ids),\n\t\t(long) BDB_IDL_LAST(ids) );\n\treturn( rc );\n}\n\nstatic int\ninequality_candidates(\n\tOperation op,\n\tDB_TXN rtxn,\n\tAttributeAssertion ava,\n\tID ids,\n\tID tmp,\n\tint gtorlt )\n{\n\tstruct bdb_info bdb = (struct bdb_info ) op->o_bd->be_private;\n\tDB\tdb;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\tDBC cursor = NULL;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> bdb_inequality_candidates (%s)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\n\tBDB_IDL_ALL( bdb, ids );\n\n\trc = bdb_index_param( op->o_bd, ava->aa_desc, LD\n/* ... truncated ... /\n```\n\n### servers/slapd/back-mdb/filterindex.c\n\n#### equality_candidates() [lines 660-767]\n```c\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= mdb_presence_candidates: (%s) index_param \"\n\t\t\t\"returned=%d\\n\",\n\t\t\tdesc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tif( prefix.bv_val == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= mdb_presence_candidates: (%s) no prefix\\n\",\n\t\t\tdesc->ad_cname.bv_val, 0, 0 );\n\t\treturn -1;\n\t}\n\n\trc = mdb_key_read( op->o_bd, rtxn, dbi, &prefix, ids, NULL, 0 );\n\n\tif( rc == MDB_NOTFOUND ) {\n\t\tMDB_IDL_ZERO( ids );\n\t\trc = 0;\n\t} else if( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= mdb_presense_candidates: (%s) \"\n\t\t\t\"key read failed (%d)\\n\",\n\t\t\tdesc->ad_cname.bv_val, rc, 0 );\n\t\tgoto done;\n\t}\n\n\tDebug(LDAP_DEBUG_TRACE,\n\t\t\"<= mdb_presence_candidates: id=%ld first=%ld last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) MDB_IDL_FIRST(ids),\n\t\t(long) MDB_IDL_LAST(ids) );\n\ndone:\n\treturn rc;\n}\n\nstatic int\nequality_candidates(\n\tOperation op,\n\tMDB_txn rtxn,\n\tAttributeAssertion ava,\n\tID ids,\n\tID tmp )\n{\n\tMDB_dbi\tdbi;\n\tint i;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> mdb_equality_candidates (%s)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\n\tif ( ava->aa_desc == slap_schema.si_ad_entryDN ) {\n\t\tID id;\n\t\trc = mdb_dn2id( op, rtxn, NULL, &ava->aa_value, &id, NULL, NULL, NULL );\n\t\tif ( rc == LDAP_SUCCESS ) {\n\t\t\t/* exactly one ID can match /\n\t\t\tids[0] = 1;\n\t\t\tids[1] = id;\n\t\t}\n\t\tif ( rc == MDB_NOTFOUND ) {\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t}\n\t\treturn rc;\n\t}\n\n\tMDB_IDL_ALL( ids );\n\n\trc = mdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,\n\t\t&dbi, &mask, &prefix );\n\n\tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= mdb_equality_candidates: (%s) not indexed\\n\", \n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= mdb_equality_candidates: (%s) \"\n\t\t\t\"index_param failed (%d)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tmr = ava->aa_desc->ad_type->sat_equality;\n\tif( !mr ) {\n\t\treturn 0;\n\t}\n\n\tif( !mr->smr_filter ) {\n\t\treturn 0;\n\t}\n\n\trc = (mr->smr_filter)(\n\t\tLDAP_FILTER_EQUALITY,\n\t\tmask,\n\t\tava->aa_desc->ad_type->sat_syntax,\n\t\tmr,\n\t\t&prefix,\n\t\t&ava->aa_value,\n\t\t&keys, op->o_tmpmemctx );\n```\n\n#### approx_candidates() [lines 776-883]\n```c\n\n\tif( keys == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= mdb_equality_candidates: (%s) no keys\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tfor ( i= 0; keys[i].bv_val != NULL; i++ ) {\n\t\trc = mdb_key_read( op->o_bd, rtxn, dbi, &keys[i], tmp, NULL, 0 );\n\n\t\tif( rc == MDB_NOTFOUND ) {\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t\tbreak;\n\t\t} else if( rc != LDAP_SUCCESS ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= mdb_equality_candidates: (%s) \"\n\t\t\t\t\"key read failed (%d)\\n\",\n\t\t\t\tava->aa_desc->ad_cname.bv_val, rc, 0 );\n\t\t\tbreak;\n\t\t}\n\n\t\tif( MDB_IDL_IS_ZERO( tmp ) ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= mdb_equality_candidates: (%s) NULL\\n\", \n\t\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\tbreak;\n\t\t}\n\n\t\tif ( i == 0 ) {\n\t\t\tMDB_IDL_CPY( ids, tmp );\n\t\t} else {\n\t\t\tmdb_idl_intersection( ids, tmp );\n\t\t}\n\n\t\tif( MDB_IDL_IS_ZERO( ids ) )\n\t\t\tbreak;\n\t}\n\n\tber_bvarray_free_x( keys, op->o_tmpmemctx );\n\n\tDebug( LDAP_DEBUG_TRACE,\n\t\t\"<= mdb_equality_candidates: id=%ld, first=%ld, last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) MDB_IDL_FIRST(ids),\n\t\t(long) MDB_IDL_LAST(ids) );\n\treturn( rc );\n}\n\n\nstatic int\napprox_candidates(\n\tOperation op,\n\tMDB_txn rtxn,\n\tAttributeAssertion ava,\n\tID ids,\n\tID tmp )\n{\n\tMDB_dbi\tdbi;\n\tint i;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> mdb_approx_candidates (%s)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\n\tMDB_IDL_ALL( ids );\n\n\trc = mdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,\n\t\t&dbi, &mask, &prefix );\n\n\tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= mdb_approx_candidates: (%s) not indexed\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= mdb_approx_candidates: (%s) \"\n\t\t\t\"index_param failed (%d)\\n\",\n\t\t\tava->aa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tmr = ava->aa_desc->ad_type->sat_approx;\n\tif( !mr ) {\n\t\t/* no approx matching rule, try equality matching rule /\n\t\tmr = ava->aa_desc->ad_type->sat_equality;\n\t}\n\n\tif( !mr ) {\n\t\treturn 0;\n\t}\n\n\tif( !mr->smr_filter ) {\n\t\treturn 0;\n\t}\n\n\trc = (mr->smr_filter)(\n\t\tLDAP_FILTER_APPROX,\n\t\tmask,\n```\n\n#### substring_candidates() [lines 895-1002]\n```c\n\t\treturn 0;\n\t}\n\n\tif( keys == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= mdb_approx_candidates: (%s) no keys (%s)\\n\",\n\t\t\tprefix.bv_val, ava->aa_desc->ad_cname.bv_val, 0 );\n\t\treturn 0;\n\t}\n\n\tfor ( i= 0; keys[i].bv_val != NULL; i++ ) {\n\t\trc = mdb_key_read( op->o_bd, rtxn, dbi, &keys[i], tmp, NULL, 0 );\n\n\t\tif( rc == MDB_NOTFOUND ) {\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t\tbreak;\n\t\t} else if( rc != LDAP_SUCCESS ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= mdb_approx_candidates: (%s) \"\n\t\t\t\t\"key read failed (%d)\\n\",\n\t\t\t\tava->aa_desc->ad_cname.bv_val, rc, 0 );\n\t\t\tbreak;\n\t\t}\n\n\t\tif( MDB_IDL_IS_ZERO( tmp ) ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= mdb_approx_candidates: (%s) NULL\\n\",\n\t\t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\tbreak;\n\t\t}\n\n\t\tif ( i == 0 ) {\n\t\t\tMDB_IDL_CPY( ids, tmp );\n\t\t} else {\n\t\t\tmdb_idl_intersection( ids, tmp );\n\t\t}\n\n\t\tif( MDB_IDL_IS_ZERO( ids ) )\n\t\t\tbreak;\n\t}\n\n\tber_bvarray_free_x( keys, op->o_tmpmemctx );\n\n\tDebug( LDAP_DEBUG_TRACE, \"<= mdb_approx_candidates %ld, first=%ld, last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) MDB_IDL_FIRST(ids),\n\t\t(long) MDB_IDL_LAST(ids) );\n\treturn( rc );\n}\n\nstatic int\nsubstring_candidates(\n\tOperation op,\n\tMDB_txn rtxn,\n\tSubstringsAssertion\tsub,\n\tID ids,\n\tID tmp )\n{\n\tMDB_dbi\tdbi;\n\tint i;\n\tint rc;\n\tslap_mask_t mask;\n\tstruct berval prefix = {0, NULL};\n\tstruct berval keys = NULL;\n\tMatchingRule mr;\n\n\tDebug( LDAP_DEBUG_TRACE, \"=> mdb_substring_candidates (%s)\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n\n\tMDB_IDL_ALL( ids );\n\n\trc = mdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,\n\t\t&dbi, &mask, &prefix );\n\n\tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= mdb_substring_candidates: (%s) not indexed\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n\t\treturn 0;\n\t}\n\n\tif( rc != LDAP_SUCCESS ) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"<= mdb_substring_candidates: (%s) \"\n\t\t\t\"index_param failed (%d)\\n\",\n\t\t\tsub->sa_desc->ad_cname.bv_val, rc, 0 );\n\t\treturn 0;\n\t}\n\n\tmr = sub->sa_desc->ad_type->sat_substr;\n\n\tif( !mr ) {\n\t\treturn 0;\n\t}\n\n\tif( !mr->smr_filter ) {\n\t\treturn 0;\n\t}\n\n\trc = (mr->smr_filter)(\n\t\tLDAP_FILTER_SUBSTRINGS,\n\t\tmask,\n\t\tsub->sa_desc->ad_type->sat_syntax,\n\t\tmr,\n\t\t&prefix,\n\t\tsub,\n```\n\n#### inequality_candidates() [lines 1011-1118]\n```c\n\t}\n\n\tif( keys == NULL ) {\n\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\"<= mdb_substring_candidates: (0x%04lx) no keys (%s)\\n\",\n\t\t\tmask, sub->sa_desc->ad_cname.bv_val, 0 );\n\t\treturn 0;\n\t}\n\n\tfor ( i= 0; keys[i].bv_val != NULL; i++ ) {\n\t\trc = mdb_key_read( op->o_bd, rtxn, dbi, &keys[i], tmp, NULL, 0 );\n\n\t\tif( rc == MDB_NOTFOUND ) {\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\trc = 0;\n\t\t\tbreak;\n\t\t} else if( rc != LDAP_SUCCESS ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= mdb_substring_candidates: (%s) \"\n\t\t\t\t\"key read failed (%d)\\n\",\n\t\t\t\tsub->sa_desc->ad_cname.bv_val, rc, 0 );\n\t\t\tbreak;\n\t\t}\n\n\t\tif( MDB_IDL_IS_ZERO( tmp ) ) {\n\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\"<= mdb_substring_candidates: (%s) NULL\\n\",\n\t\t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n\t\t\tMDB_IDL_ZERO( ids );\n\t\t\tbreak;\n\t\t}\n\n\t\tif ( i == 0 ) {\n\t\t\tMDB_IDL_CPY( ids, tmp );\n\t\t} else {\n\t\t\tmdb_idl_intersection( ids, tmp );\n\t\t}\n\n\t\tif( MDB_IDL_IS_ZERO( ids ) )\n\t\t\tbreak;\n\t}\n\n\tber_bvarray_free_x( keys, op->o_tmpmemctx );\n\n\tDebug( LDAP_DEBUG_TRACE, \"<= mdb_substring_candidates: %ld, first=%ld, last=%ld\\n\",\n\t\t(long) ids[0],\n\t\t(long) MDB\n/* ... truncated ... */\n\n## Upstream Fix\n```diff\ndiff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c\nindex 71e3ea4..bafef72 100644\n--- a/servers/slapd/back-bdb/filterindex.c\n+++ b/servers/slapd/back-bdb/filterindex.c\n@@ -741,7 +741,7 @@ equality_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_equality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -858,7 +858,7 @@ approx_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_approx_candidates: (%s) not indexed\\n\",\n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -978,7 +978,7 @@ substring_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_substring_candidates: (%s) not indexed\\n\",\n \t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -1095,7 +1095,7 @@ inequality_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_inequality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\ndiff --git a/servers/slapd/back-mdb/filterindex.c b/servers/slapd/back-mdb/filterindex.c\nindex 58c1cc8..20c58b7 100644\n--- a/servers/slapd/back-mdb/filterindex.c\n+++ b/servers/slapd/back-mdb/filterindex.c\n@@ -709,7 +709,7 @@ equality_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_equality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -825,7 +825,7 @@ approx_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_approx_candidates: (%s) not indexed\\n\",\n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -944,7 +944,7 @@ substring_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_substring_candidates: (%s) not indexed\\n\",\n \t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -1060,7 +1060,7 @@ inequality_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_inequality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c\nindex 71e3ea4..bafef72 100644\n--- a/servers/slapd/back-bdb/filterindex.c\n+++ b/servers/slapd/back-bdb/filterindex.c\n@@ -741,7 +741,7 @@ equality_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_equality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -858,7 +858,7 @@ approx_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_approx_candidates: (%s) not indexed\\n\",\n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -978,7 +978,7 @@ substring_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_substring_candidates: (%s) not indexed\\n\",\n \t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -1095,7 +1095,7 @@ inequality_candidates(\n \t\t&db, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= bdb_inequality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\ndiff --git a/servers/slapd/back-mdb/filterindex.c b/servers/slapd/back-mdb/filterindex.c\nindex 58c1cc8..20c58b7 100644\n--- a/servers/slapd/back-mdb/filterindex.c\n+++ b/servers/slapd/back-mdb/filterindex.c\n@@ -709,7 +709,7 @@ equality_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_equality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -825,7 +825,7 @@ approx_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_approx_candidates: (%s) not indexed\\n\",\n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -944,7 +944,7 @@ substring_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_substring_candidates: (%s) not indexed\\n\",\n \t\t\tsub->sa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n@@ -1060,7 +1060,7 @@ inequality_candidates(\n \t\t&dbi, &mask, &prefix );\n \n \tif ( rc == LDAP_INAPPROPRIATE_MATCHING ) {\n-\t\tDebug( LDAP_DEBUG_ANY,\n+\t\tDebug( LDAP_DEBUG_TRACE,\n \t\t\t\"<= mdb_inequality_candidates: (%s) not indexed\\n\", \n \t\t\tava->aa_desc->ad_cname.bv_val, 0, 0 );\n \t\treturn 0;\n" } ]	{ "id": "openldap2-15919-0011-openldap-re24-its7796.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0011-openldap-re24-its7796.patch", "tier": "identical", "language": "c", "patch_lines_changed": 16, "patch_files_count": 2, "total_tokens_est": 1501, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#9423 ldap_X509dn2bv: check for invalid BER after\n\n## Package\nopenldap2\n\n## Files to modify\n- libraries/libldap/tls2.c\n\n## Target Source Code\n\n### libraries/libldap/tls2.c\n\n#### ldap_X509dn2bv() [lines 1172-1374]\n```c\n * Otherwise the DN will use shortNames from a hardcoded table.\n /\nint\nldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n\tunsigned flags )\n{\n\tLDAPDN\tnewDN;\n\tLDAPRDN\tnewRDN;\n\tLDAPAVA newAVA, baseAVA;\n\tBerElementBuffer berbuf;\n\tBerElement ber = (BerElement )&berbuf;\n\tchar oids[8192], oidptr = oids, oidbuf = NULL;\n\tvoid ptrs[2048];\n\tchar dn_end, rdn_end;\n\tint i, navas, nrdns, rc = LDAP_SUCCESS;\n\tsize_t dnsize, oidrem = sizeof(oids), oidsize = 0;\n\tint csize;\n\tber_tag_t tag;\n\tber_len_t len;\n\toid_name oidname;\n\n\tstruct berval\tOid, Val, oid2, in = x509_name;\n\n\tassert( bv != NULL );\n\n\tbv->bv_len = 0;\n\tbv->bv_val = NULL;\n\n\tnavas = 0;\n\tnrdns = 0;\n\n\t/ A DN is a SEQUENCE of RDNs. An RDN is a SET of AVAs.\n\t * An AVA is a SEQUENCE of attr and value.\n\t * Count the number of AVAs and RDNs\n\t /\n\tber_init2( ber, in, LBER_USE_DER );\n\ttag = ber_peek_tag( ber, &len );\n\tif ( tag != LBER_SEQUENCE )\n\t\treturn LDAP_DECODING_ERROR;\n\n\tfor ( tag = ber_first_element( ber, &len, &dn_end );\n\t\ttag == LBER_SET;\n\t\ttag = ber_next_element( ber, &len, dn_end )) {\n\t\tnrdns++;\n\t\tfor ( tag = ber_first_element( ber, &len, &rdn_end );\n\t\t\ttag == LBER_SEQUENCE;\n\t\t\ttag = ber_next_element( ber, &len, rdn_end )) {\n\t\t\ttag = ber_skip_tag( ber, &len );\n\t\t\tber_skip_data( ber, len );\n\t\t\tnavas++;\n\t\t}\n\t}\n\n\t/ Allocate the DN/RDN/AVA stuff as a single block / \n\tdnsize = sizeof(LDAPRDN) (nrdns+1);\n\tdnsize += sizeof(LDAPAVA ) (navas+nrdns);\n\tdnsize += sizeof(LDAPAVA) * navas;\n\tif (dnsize > sizeof(ptrs)) {\n\t\tnewDN = (LDAPDN)LDAP_MALLOC( dnsize );\n\t\tif ( newDN == NULL )\n\t\t\treturn LDAP_NO_MEMORY;\n\t} else {\n\t\tnewDN = (LDAPDN)(char )ptrs;\n\t}\n\t\n/ ... 118 lines omitted ... /\n\t}\n\n\trc = ldap_dn2bv_x( newDN, bv, LDAP_DN_FORMAT_LDAPV3, NULL );\n\nnomem:\n\tfor (;baseAVA < newAVA; baseAVA++) {\n\t\tif (baseAVA->la_flags & LDAP_AVA_FREE_ATTR)\n\t\t\tLDAP_FREE( baseAVA->la_attr.bv_val );\n\t\tif (baseAVA->la_flags & LDAP_AVA_FREE_VALUE)\n\t\t\tLDAP_FREE( baseAVA->la_value.bv_val );\n\t}\n\n\tif ( oidsize != 0 )\n\t\tLDAP_FREE( oidbuf );\n\tif ( newDN != (LDAPDN)(char ) ptrs )\n\t\tLDAP_FREE( newDN );\n\treturn rc;\n}\n\n\n```\n\n\n## Upstream Fix\n```diff\nFrom bd843f03d4137756b1d1ba0695cb583fbe91d905 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Sun, 13 Dec 2020 21:48:45 +0000\nSubject: [PATCH 220/224] ITS#9423 ldap_X509dn2bv: check for invalid BER after\n RDN count\n\n---\n libraries/libldap/tls2.c \| 12 +++++++-----\n 1 file changed, 7 insertions(+), 5 deletions(-)\n\ndiff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c\nindex d25c190ea..c642469d9 100644\n--- a/libraries/libldap/tls2.c\n+++ b/libraries/libldap/tls2.c\n@@ -1220,6 +1220,12 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t\t}\n \t}\n \n+\t/ Rewind and prepare to extract /\n+\tber_rewind( ber );\n+\ttag = ber_first_element( ber, &len, &dn_end );\n+\tif ( tag == LBER_DEFAULT )\n+\t\treturn LDAP_DECODING_ERROR;\n+\n \t/ Allocate the DN/RDN/AVA stuff as a single block / \n \tdnsize = sizeof(LDAPRDN) (nrdns+1);\n \tdnsize += sizeof(LDAPAVA ) (navas+nrdns);\n@@ -1231,16 +1237,12 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t} else {\n \t\tnewDN = (LDAPDN)(char )ptrs;\n \t}\n-\t\n+\n \tnewDN[nrdns] = NULL;\n \tnewRDN = (LDAPRDN)(newDN + nrdns+1);\n \tnewAVA = (LDAPAVA )(newRDN + navas + nrdns);\n \tbaseAVA = newAVA;\n \n-\t/ Rewind and start extracting /\n-\tber_rewind( ber );\n-\n-\ttag = ber_first_element( ber, &len, &dn_end );\n \tfor ( i = nrdns - 1; i >= 0; i-- ) {\n \t\tnewDN[i] = newRDN;\n \n-- \n2.30.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From bd843f03d4137756b1d1ba0695cb583fbe91d905 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Sun, 13 Dec 2020 21:48:45 +0000\nSubject: [PATCH 220/224] ITS#9423 ldap_X509dn2bv: check for invalid BER after\n RDN count\n\n---\n libraries/libldap/tls2.c \| 12 +++++++-----\n 1 file changed, 7 insertions(+), 5 deletions(-)\n\ndiff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c\nindex d25c190ea..c642469d9 100644\n--- a/libraries/libldap/tls2.c\n+++ b/libraries/libldap/tls2.c\n@@ -1220,6 +1220,12 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t\t}\n \t}\n \n+\t/* Rewind and prepare to extract /\n+\tber_rewind( ber );\n+\ttag = ber_first_element( ber, &len, &dn_end );\n+\tif ( tag == LBER_DEFAULT )\n+\t\treturn LDAP_DECODING_ERROR;\n+\n \t/ Allocate the DN/RDN/AVA stuff as a single block / \n \tdnsize = sizeof(LDAPRDN) (nrdns+1);\n \tdnsize += sizeof(LDAPAVA ) (navas+nrdns);\n@@ -1231,16 +1237,12 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t} else {\n \t\tnewDN = (LDAPDN)(char )ptrs;\n \t}\n-\t\n+\n \tnewDN[nrdns] = NULL;\n \tnewRDN = (LDAPRDN)(newDN + nrdns+1);\n \tnewAVA = (LDAPAVA )(newRDN + navas + nrdns);\n \tbaseAVA = newAVA;\n \n-\t/ Rewind and start extracting */\n-\tber_rewind( ber );\n-\n-\ttag = ber_first_element( ber, &len, &dn_end );\n \tfor ( i = nrdns - 1; i >= 0; i-- ) {\n \t\tnewDN[i] = newRDN;\n \n-- \n2.30.0\n\n" } ]	{ "id": "openldap2-15919-0220-ITS-9423-ldap_X509dn2bv-check-for-invalid-BER-after-.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0220-ITS-9423-ldap_X509dn2bv-check-for-invalid-BER-after-.patch", "tier": "identical", "language": "c", "patch_lines_changed": 13, "patch_files_count": 1, "total_tokens_est": 866, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#9425 add more checks to ldap_X509dn2bv\n\n## Package\nopenldap2\n\n## Files to modify\n- libraries/libldap/tls2.c\n\n## Target Source Code\n\n### libraries/libldap/tls2.c\n\n#### ldap_X509dn2bv() [lines 1172-1374]\n```c\n * Otherwise the DN will use shortNames from a hardcoded table.\n /\nint\nldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n\tunsigned flags )\n{\n\tLDAPDN\tnewDN;\n\tLDAPRDN\tnewRDN;\n\tLDAPAVA newAVA, baseAVA;\n\tBerElementBuffer berbuf;\n\tBerElement ber = (BerElement )&berbuf;\n\tchar oids[8192], oidptr = oids, oidbuf = NULL;\n\tvoid ptrs[2048];\n\tchar dn_end, rdn_end;\n\tint i, navas, nrdns, rc = LDAP_SUCCESS;\n\tsize_t dnsize, oidrem = sizeof(oids), oidsize = 0;\n\tint csize;\n\tber_tag_t tag;\n\tber_len_t len;\n\toid_name oidname;\n\n\tstruct berval\tOid, Val, oid2, in = x509_name;\n\n\tassert( bv != NULL );\n\n\tbv->bv_len = 0;\n\tbv->bv_val = NULL;\n\n\tnavas = 0;\n\tnrdns = 0;\n\n\t/ A DN is a SEQUENCE of RDNs. An RDN is a SET of AVAs.\n\t * An AVA is a SEQUENCE of attr and value.\n\t * Count the number of AVAs and RDNs\n\t /\n\tber_init2( ber, in, LBER_USE_DER );\n\ttag = ber_peek_tag( ber, &len );\n\tif ( tag != LBER_SEQUENCE )\n\t\treturn LDAP_DECODING_ERROR;\n\n\tfor ( tag = ber_first_element( ber, &len, &dn_end );\n\t\ttag == LBER_SET;\n\t\ttag = ber_next_element( ber, &len, dn_end )) {\n\t\tnrdns++;\n\t\tfor ( tag = ber_first_element( ber, &len, &rdn_end );\n\t\t\ttag == LBER_SEQUENCE;\n\t\t\ttag = ber_next_element( ber, &len, rdn_end )) {\n\t\t\ttag = ber_skip_tag( ber, &len );\n\t\t\tber_skip_data( ber, len );\n\t\t\tnavas++;\n\t\t}\n\t}\n\n\t/ Allocate the DN/RDN/AVA stuff as a single block / \n\tdnsize = sizeof(LDAPRDN) (nrdns+1);\n\tdnsize += sizeof(LDAPAVA ) (navas+nrdns);\n\tdnsize += sizeof(LDAPAVA) * navas;\n\tif (dnsize > sizeof(ptrs)) {\n\t\tnewDN = (LDAPDN)LDAP_MALLOC( dnsize );\n/* ... 124 lines omitted ... /\n\t}\n\n\trc = ldap_dn2bv_x( newDN, bv, LDAP_DN_FORMAT_LDAPV3, NULL );\n\nnomem:\n\tfor (;baseAVA < newAVA; baseAVA++) {\n\t\tif (baseAVA->la_flags & LDAP_AVA_FREE_ATTR)\n\t\t\tLDAP_FREE( baseAVA->la_attr.bv_val );\n\t\tif (baseAVA->la_flags & LDAP_AVA_FREE_VALUE)\n\t\t\tLDAP_FREE( baseAVA->la_value.bv_val );\n\t}\n\n\tif ( oidsize != 0 )\n\t\tLDAP_FREE( oidbuf );\n\tif ( newDN != (LDAPDN)(char ) ptrs )\n\t\tLDAP_FREE( newDN );\n\treturn rc;\n}\n\n\n```\n\n#### region() [lines 1308-1346]\n```c\n\t\t\tnewAVA->la_private = NULL;\n\t\t\tnewAVA->la_flags = LDAP_AVA_STRING;\n\t\t\ttag = ber_get_stringbv( ber, &Val, LBER_BV_NOTERM );\n\t\t\tswitch(tag) {\n\t\t\tcase LBER_TAG_UNIVERSAL:\n\t\t\t\t/* This uses 32-bit ISO 10646-1 /\n\t\t\t\tcsize = 4; goto to_utf8;\n\t\t\tcase LBER_TAG_BMP:\n\t\t\t\t/ This uses 16-bit ISO 10646-1 /\n\t\t\t\tcsize = 2; goto to_utf8;\n\t\t\tcase LBER_TAG_TELETEX:\n\t\t\t\t/ This uses 8-bit, assume ISO 8859-1 /\n\t\t\t\tcsize = 1;\nto_utf8:\t\trc = ldap_ucs_to_utf8s( &Val, csize, &newAVA->la_value );\n\t\t\t\tnewAVA->la_flags \|= LDAP_AVA_NONPRINTABLE;\nallocd:\n\t\t\t\tnewAVA->la_flags \|= LDAP_AVA_FREE_VALUE;\n\t\t\t\tif (rc != LDAP_SUCCESS) goto nomem;\n\t\t\t\tbreak;\n\t\t\tcase LBER_TAG_UTF8:\n\t\t\t\tnewAVA->la_flags \|= LDAP_AVA_NONPRINTABLE;\n\t\t\t\t/ This is already in UTF-8 encoding /\n\t\t\tcase LBER_TAG_IA5:\n\t\t\tcase LBER_TAG_PRINTABLE:\n\t\t\t\t/ These are always 7-bit strings /\n\t\t\t\tnewAVA->la_value = Val;\n\t\t\t\tbreak;\n\t\t\tcase LBER_BITSTRING:\n\t\t\t\t/ X.690 bitString value converted to RFC4517 Bit String /\n\t\t\t\trc = der_to_ldap_BitString( &Val, &newAVA->la_value );\n\t\t\t\tgoto allocd;\n\t\t\tdefault:\n\t\t\t\t/ Not a string type at all /\n\t\t\t\tnewAVA->la_flags = 0;\n\t\t\t\tnewAVA->la_value = Val;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tnewAVA++;\n\t\t}\n```\n\n\n## Upstream Fix\n```diff\nFrom 959971b245f1676a2aa4d25d3a1d1898eda5b0a7 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Mon, 14 Dec 2020 20:05:44 +0000\nSubject: [PATCH 222/224] ITS#9425 add more checks to ldap_X509dn2bv\n\n---\n libraries/libldap/tls2.c \| 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\ndiff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c\nindex c642469d9..16c9d0487 100644\n--- a/libraries/libldap/tls2.c\n+++ b/libraries/libldap/tls2.c\n@@ -1214,6 +1214,8 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t\tfor ( tag = ber_first_element( ber, &len, &rdn_end );\n \t\t\ttag == LBER_SEQUENCE;\n \t\t\ttag = ber_next_element( ber, &len, rdn_end )) {\n+\t\t\tif ( rdn_end > dn_end )\n+\t\t\t\treturn LDAP_DECODING_ERROR;\n \t\t\ttag = ber_skip_tag( ber, &len );\n \t\t\tber_skip_data( ber, len );\n \t\t\tnavas++;\n@@ -1223,7 +1225,7 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t/ Rewind and prepare to extract /\n \tber_rewind( ber );\n \ttag = ber_first_element( ber, &len, &dn_end );\n-\tif ( tag == LBER_DEFAULT )\n+\tif ( tag != LBER_SET )\n \t\treturn LDAP_DECODING_ERROR;\n \n \t/ Allocate the DN/RDN/AVA stuff as a single block / \n@@ -1336,6 +1338,10 @@ allocd:\n \t\t\t\t/ X.690 bitString value converted to RFC4517 Bit String /\n \t\t\t\trc = der_to_ldap_BitString( &Val, &newAVA->la_value );\n \t\t\t\tgoto allocd;\n+\t\t\tcase LBER_DEFAULT:\n+\t\t\t\t/ decode error /\n+\t\t\t\trc = LDAP_DECODING_ERROR;\n+\t\t\t\tgoto nomem;\n \t\t\tdefault:\n \t\t\t\t/ Not a string type at all /\n \t\t\t\tnewAVA->la_flags = 0;\n-- \n2.30.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 959971b245f1676a2aa4d25d3a1d1898eda5b0a7 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Mon, 14 Dec 2020 20:05:44 +0000\nSubject: [PATCH 222/224] ITS#9425 add more checks to ldap_X509dn2bv\n\n---\n libraries/libldap/tls2.c \| 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\ndiff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c\nindex c642469d9..16c9d0487 100644\n--- a/libraries/libldap/tls2.c\n+++ b/libraries/libldap/tls2.c\n@@ -1214,6 +1214,8 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t\tfor ( tag = ber_first_element( ber, &len, &rdn_end );\n \t\t\ttag == LBER_SEQUENCE;\n \t\t\ttag = ber_next_element( ber, &len, rdn_end )) {\n+\t\t\tif ( rdn_end > dn_end )\n+\t\t\t\treturn LDAP_DECODING_ERROR;\n \t\t\ttag = ber_skip_tag( ber, &len );\n \t\t\tber_skip_data( ber, len );\n \t\t\tnavas++;\n@@ -1223,7 +1225,7 @@ ldap_X509dn2bv( void x509_name, struct berval bv, LDAPDN_rewrite_func func,\n \t/ Rewind and prepare to extract /\n \tber_rewind( ber );\n \ttag = ber_first_element( ber, &len, &dn_end );\n-\tif ( tag == LBER_DEFAULT )\n+\tif ( tag != LBER_SET )\n \t\treturn LDAP_DECODING_ERROR;\n \n \t/ Allocate the DN/RDN/AVA stuff as a single block / \n@@ -1336,6 +1338,10 @@ allocd:\n \t\t\t\t/ X.690 bitString value converted to RFC4517 Bit String /\n \t\t\t\trc = der_to_ldap_BitString( &Val, &newAVA->la_value );\n \t\t\t\tgoto allocd;\n+\t\t\tcase LBER_DEFAULT:\n+\t\t\t\t/ decode error /\n+\t\t\t\trc = LDAP_DECODING_ERROR;\n+\t\t\t\tgoto nomem;\n \t\t\tdefault:\n \t\t\t\t/ Not a string type at all */\n \t\t\t\tnewAVA->la_flags = 0;\n-- \n2.30.0\n\n" } ]	{ "id": "openldap2-15919-0222-ITS-9425-add-more-checks-to-ldap_X509dn2bv.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0222-ITS-9425-add-more-checks-to-ldap_X509dn2bv.patch", "tier": "identical", "language": "c", "patch_lines_changed": 9, "patch_files_count": 1, "total_tokens_est": 945, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nbsc#1170771 - limit depth of nested filters\n\n## Package\nopenldap2\n\n## Files to modify\n- servers/slapd/filter.c\n\n## Target Source Code\n\n### servers/slapd/filter.c\n\n#### region() [lines 1-99]\n```c\n/* filter.c - routines for parsing and dealing with filters /\n/ $OpenLDAP$ /\n/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n \n Copyright 1998-2015 The OpenLDAP Foundation.\n * All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n * modification, are permitted only as authorized by the OpenLDAP\n * Public License.\n \n A copy of this license is available in the file LICENSE in the\n * top-level directory of the distribution or, alternatively, at\n * <http://www.OpenLDAP.org/license.html>.\n /\n/ Portions Copyright (c) 1995 Regents of the University of Michigan.\n * All rights reserved.\n \n Redistribution and use in source and binary forms are permitted\n * provided that this notice is preserved and that due credit is given\n * to the University of Michigan at Ann Arbor. The name of the University\n * may not be used to endorse or promote products derived from this\n * software without specific prior written permission. This software\n * is provided ``as is'' without express or implied warranty.\n /\n\n#include \"portable.h\"\n\n#include <stdio.h>\n\n#include <ac/socket.h>\n#include <ac/string.h>\n\n#include \"slap.h\"\n#include \"lutil.h\"\n\nconst Filter slap_filter_objectClass_pres;\nconst struct berval slap_filterstr_objectClass_pres;\n\nstatic int\tget_filter_list(\n\tOperation op,\n\tBerElement ber,\n\tFilter f,\n\tconst char text );\n\nstatic int\tget_ssa(\n\tOperation op,\n\tBerElement ber,\n\tFilter f,\n\tconst char *text );\n\nstatic void simple_vrFilter2bv(\n\tOperation op,\n\tValuesReturnFilter f,\n\tstruct berval fstr );\n\nstatic int\tget_simple_vrFilter(\n\tOperation op,\n\tBerElement ber,\n\tValuesReturnFilter f,\n\tconst char text );\n\nint\nfilter_init( void )\n{\n\tstatic Filter filter_objectClass_pres = { LDAP_FILTER_PRESENT };\n\tstatic struct berval filterstr_objectClass_pres = BER_BVC(\"(objectClass=)\");\n\n\tfilter_objectClass_pres.f_desc = slap_schema.si_ad_objectClass;\n\n\tslap_filter_objectClass_pres = &filter_objectClass_pres;\n\tslap_filterstr_objectClass_pres = &filterstr_objectClass_pres;\n\n\treturn 0;\n}\n\nvoid\nfilter_destroy( void )\n{\n\treturn;\n}\n\nint\nget_filter(\n\tOperation op,\n\tBerElement ber,\n\tFilter filt,\n\tconst char text )\n{\n\tber_tag_t\ttag;\n\tber_len_t\tlen;\n\tint\t\terr;\n\tFilter\t\tf;\n\n\tDebug( LDAP_DEBUG_FILTER, \"begin get_filter\\n\", 0, 0, 0 );\n\t/\n\t * A filter looks like this coming in:\n\t \tFilter ::= CHOICE {\n\t \t\tand\t\t[0]\tSET OF Filter,\n```\n\n#### filter_destroy() [lines 75-83]\n```c\n}\n\nvoid\nfilter_destroy( void )\n{\n\treturn;\n}\n\nint\n```\n\n#### get_filter() [lines 77-183]\n```c\nvoid\nfilter_destroy( void )\n{\n\treturn;\n}\n\nint\nget_filter(\n\tOperation op,\n\tBerElement ber,\n\tFilter filt,\n\tconst char text )\n{\n\tber_tag_t\ttag;\n\tber_len_t\tlen;\n\tint\t\terr;\n\tFilter\t\tf;\n\n\tDebug( LDAP_DEBUG_FILTER, \"begin get_filter\\n\", 0, 0, 0 );\n\t/\n\t A filter looks like this coming in:\n\t \tFilter ::= CHOICE {\n\t \t\tand\t\t[0]\tSET OF Filter,\n\t \t\tor\t\t[1]\tSET OF Filter,\n\t \t\tnot\t\t[2]\tFilter,\n\t \t\tequalityMatch\t[3]\tAttributeValueAssertion,\n\t \t\tsubstrings\t[4]\tSubstringFilter,\n\t \t\tgreaterOrEqual\t[5]\tAttributeValueAssertion,\n\t \t\tlessOrEqual\t[6]\tAttributeValueAssertion,\n\t \t\tpresent\t\t[7]\tAttributeType,\n\t \t\tapproxMatch\t[8]\tAttributeValueAssertion,\n\t \t\textensibleMatch [9]\tMatchingRuleAssertion\n\t \t}\n\t \n\t \tSubstringFilter ::= SEQUENCE {\n\t \t\ttype\t\t AttributeType,\n\t \t\tSEQUENCE OF CHOICE {\n\t \t\t\tinitial\t\t [0] IA5String,\n\t \t\t\tany\t\t [1] IA5String,\n\t \t\t\tfinal\t\t [2] IA5String\n\t \t\t}\n\t \t}\n\t \n\t \tMatchingRuleAssertion ::= SEQUENCE {\n\t \t\tmatchingRule\t[1] MatchingRuleId OPTIONAL,\n\t \t\ttype\t\t[2] AttributeDescription OPTIONAL,\n\t \t\tmatchValue\t[3] AssertionValue,\n\t \t\tdnAttributes\t[4] BOOLEAN DEFAULT FALSE\n\t \t}\n\t \n\t /\n\n\ttag = ber_peek_tag( ber, &len );\n\n\tif( tag == LBER_ERROR ) {\n\t\ttext = \"error decoding filter\";\n\t\treturn SLAPD_DISCONNECT;\n\t}\n\n\terr = LDAP_SUCCESS;\n\n\tf.f_next = NULL;\n\tf.f_choice = tag; \n\n\tswitch ( f.f_choice ) {\n\tcase LDAP_FILTER_EQUALITY:\n\t\tDebug( LDAP_DEBUG_FILTER, \"EQUALITY\\n\", 0, 0, 0 );\n\t\terr = get_ava( op, ber, &f, SLAP_MR_EQUALITY, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_SUBSTRINGS:\n\t\tDebug( LDAP_DEBUG_FILTER, \"SUBSTRINGS\\n\", 0, 0, 0 );\n\t\terr = get_ssa( op, ber, &f, text );\n\t\tif( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_sub != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_GE:\n\t\tDebug( LDAP_DEBUG_FILTER, \"GE\\n\", 0, 0, 0 );\n\t\terr = get_ava( op, ber, &f, SLAP_MR_ORDERING, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_LE:\n\t\tDebug( LDAP_DEBUG_FILTER, \"LE\\n\", 0, 0, 0 );\n\t\terr = get_ava( op, ber, &f, SLAP_MR_ORDERING, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_PRESENT: {\n\t\tstruct berval type;\n\n\t\tDebug( LDAP_DEBUG_FILTER, \"PRESENT\\n\", 0, 0, 0 );\n\t\tif ( ber_scanf( ber, \"m\", &type ) == LBER_ERROR ) {\n```\n\n#### get_filter() [lines 172-279]\n```c\n\t\terr = get_ava( op, ber, &f, SLAP_MR_ORDERING, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_PRESENT: {\n\t\tstruct berval type;\n\n\t\tDebug( LDAP_DEBUG_FILTER, \"PRESENT\\n\", 0, 0, 0 );\n\t\tif ( ber_scanf( ber, \"m\", &type ) == LBER_ERROR ) {\n\t\t\terr = SLAPD_DISCONNECT;\n\t\t\ttext = \"error decoding filter\";\n\t\t\tbreak;\n\t\t}\n\n\t\tf.f_desc = NULL;\n\t\terr = slap_bv2ad( &type, &f.f_desc, text );\n\n\t\tif( err != LDAP_SUCCESS ) {\n\t\t\tf.f_choice \|= SLAPD_FILTER_UNDEFINED;\n\t\t\terr = slap_bv2undef_ad( &type, &f.f_desc, text,\n\t\t\t\tSLAP_AD_PROXIED\|SLAP_AD_NOINSERT );\n\n\t\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\t\t/* unrecognized attribute description or other error /\n\t\t\t\tDebug( LDAP_DEBUG_ANY, \n\t\t\t\t\t\"get_filter: conn %lu unknown attribute \"\n\t\t\t\t\t\"type=%s (%d)\\n\",\n\t\t\t\t\top->o_connid, type.bv_val, err );\n\n\t\t\t\terr = LDAP_SUCCESS;\n\t\t\t\tf.f_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );\n\t\t\t}\n\t\t\ttext = NULL;\n\t\t}\n\n\t\tassert( f.f_desc != NULL );\n\t\t} break;\n\n\tcase LDAP_FILTER_APPROX:\n\t\tDebug( LDAP_DEBUG_FILTER, \"APPROX\\n\", 0, 0, 0 );\n\t\terr = get_ava( op, ber, &f, SLAP_MR_EQUALITY_APPROX, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_AND:\n\t\tDebug( LDAP_DEBUG_FILTER, \"AND\\n\", 0, 0, 0 );\n\t\terr = get_filter_list( op, ber, &f.f_and, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tif ( f.f_and == NULL ) {\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\tf.f_result = LDAP_COMPARE_TRUE;\n\t\t}\n\t\t/* no assert - list could be empty /\n\t\tbreak;\n\n\tcase LDAP_FILTER_OR:\n\t\tDebug( LDAP_DEBUG_FILTER, \"OR\\n\", 0, 0, 0 );\n\t\terr = get_filter_list( op, ber, &f.f_or, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tif ( f.f_or == NULL ) {\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\tf.f_result = LDAP_COMPARE_FALSE;\n\t\t}\n\t\t/ no assert - list could be empty /\n\t\tbreak;\n\n\tcase LDAP_FILTER_NOT:\n\t\tDebug( LDAP_DEBUG_FILTER, \"NOT\\n\", 0, 0, 0 );\n\t\t(void) ber_skip_tag( ber, &len );\n\t\terr = get_filter( op, ber, &f.f_not, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\n\t\tassert( f.f_not != NULL );\n\t\tif ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {\n\t\t\tint fresult = f.f_not->f_result;\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\top->o_tmpfree( f.f_not, op->o_tmpmemctx );\n\t\t\tf.f_not = NULL;\n\n\t\t\tswitch( fresult ) {\n\t\t\tcase LDAP_COMPARE_TRUE:\n\t\t\t\tf.f_result = LDAP_COMPARE_FALSE;\n\t\t\t\tbreak;\n\t\t\tcase LDAP_COMPARE_FALSE:\n\t\t\t\tf.f_result = LDAP_COMPARE_TRUE;\n\t\t\t\tbreak;\n\t\t\tdefault: ;\n\t\t\t\t/ (!Undefined) is Undefined /\n\t\t\t}\n\t\t}\n\t\tbreak;\n\n\tcase LDAP_FILTER_EXT:\n\t\tDebug( LDAP_DEBUG_FILTER, \"EXTENSIBLE\\n\", 0, 0, 0 );\n\n\t\terr = get_mra( op, ber, &f, text );\n```\n\n#### get_filter() [lines 185-292]\n```c\n\t\t\ttext = \"error decoding filter\";\n\t\t\tbreak;\n\t\t}\n\n\t\tf.f_desc = NULL;\n\t\terr = slap_bv2ad( &type, &f.f_desc, text );\n\n\t\tif( err != LDAP_SUCCESS ) {\n\t\t\tf.f_choice \|= SLAPD_FILTER_UNDEFINED;\n\t\t\terr = slap_bv2undef_ad( &type, &f.f_desc, text,\n\t\t\t\tSLAP_AD_PROXIED\|SLAP_AD_NOINSERT );\n\n\t\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\t\t/* unrecognized attribute description or other error /\n\t\t\t\tDebug( LDAP_DEBUG_ANY, \n\t\t\t\t\t\"get_filter: conn %lu unknown attribute \"\n\t\t\t\t\t\"type=%s (%d)\\n\",\n\t\t\t\t\top->o_connid, type.bv_val, err );\n\n\t\t\t\terr = LDAP_SUCCESS;\n\t\t\t\tf.f_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );\n\t\t\t}\n\t\t\ttext = NULL;\n\t\t}\n\n\t\tassert( f.f_desc != NULL );\n\t\t} break;\n\n\tcase LDAP_FILTER_APPROX:\n\t\tDebug( LDAP_DEBUG_FILTER, \"APPROX\\n\", 0, 0, 0 );\n\t\terr = get_ava( op, ber, &f, SLAP_MR_EQUALITY_APPROX, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_AND:\n\t\tDebug( LDAP_DEBUG_FILTER, \"AND\\n\", 0, 0, 0 );\n\t\terr = get_filter_list( op, ber, &f.f_and, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tif ( f.f_and == NULL ) {\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\tf.f_result = LDAP_COMPARE_TRUE;\n\t\t}\n\t\t/* no assert - list could be empty /\n\t\tbreak;\n\n\tcase LDAP_FILTER_OR:\n\t\tDebug( LDAP_DEBUG_FILTER, \"OR\\n\", 0, 0, 0 );\n\t\terr = get_filter_list( op, ber, &f.f_or, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tif ( f.f_or == NULL ) {\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\tf.f_result = LDAP_COMPARE_FALSE;\n\t\t}\n\t\t/ no assert - list could be empty /\n\t\tbreak;\n\n\tcase LDAP_FILTER_NOT:\n\t\tDebug( LDAP_DEBUG_FILTER, \"NOT\\n\", 0, 0, 0 );\n\t\t(void) ber_skip_tag( ber, &len );\n\t\terr = get_filter( op, ber, &f.f_not, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\n\t\tassert( f.f_not != NULL );\n\t\tif ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {\n\t\t\tint fresult = f.f_not->f_result;\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\top->o_tmpfree( f.f_not, op->o_tmpmemctx );\n\t\t\tf.f_not = NULL;\n\n\t\t\tswitch( fresult ) {\n\t\t\tcase LDAP_COMPARE_TRUE:\n\t\t\t\tf.f_result = LDAP_COMPARE_FALSE;\n\t\t\t\tbreak;\n\t\t\tcase LDAP_COMPARE_FALSE:\n\t\t\t\tf.f_result = LDAP_COMPARE_TRUE;\n\t\t\t\tbreak;\n\t\t\tdefault: ;\n\t\t\t\t/ (!Undefined) is Undefined /\n\t\t\t}\n\t\t}\n\t\tbreak;\n\n\tcase LDAP_FILTER_EXT:\n\t\tDebug( LDAP_DEBUG_FILTER, \"EXTENSIBLE\\n\", 0, 0, 0 );\n\n\t\terr = get_mra( op, ber, &f, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\n\t\tassert( f.f_mra != NULL );\n\t\tbreak;\n\n\tdefault:\n\t\t(void) ber_scanf( ber, \"x\" ); / skip the element /\n\t\tDebug( LDAP_DEBUG_ANY, \"get_filter: unknown filter type=%lu\\n\",\n\t\t\tf.f_choice, 0, 0 );\n\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\tf.f_result = SLAPD_COMPARE_UNDEFINED;\n```\n\n#### get_filter() [lines 199-306]\n```c\n\t\t\t\tDebug( LDAP_DEBUG_ANY, \n\t\t\t\t\t\"get_filter: conn %lu unknown attribute \"\n\t\t\t\t\t\"type=%s (%d)\\n\",\n\t\t\t\t\top->o_connid, type.bv_val, err );\n\n\t\t\t\terr = LDAP_SUCCESS;\n\t\t\t\tf.f_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );\n\t\t\t}\n\t\t\ttext = NULL;\n\t\t}\n\n\t\tassert( f.f_desc != NULL );\n\t\t} break;\n\n\tcase LDAP_FILTER_APPROX:\n\t\tDebug( LDAP_DEBUG_FILTER, \"APPROX\\n\", 0, 0, 0 );\n\t\terr = get_ava( op, ber, &f, SLAP_MR_EQUALITY_APPROX, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tassert( f.f_ava != NULL );\n\t\tbreak;\n\n\tcase LDAP_FILTER_AND:\n\t\tDebug( LDAP_DEBUG_FILTER, \"AND\\n\", 0, 0, 0 );\n\t\terr = get_filter_list( op, ber, &f.f_and, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tif ( f.f_and == NULL ) {\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\tf.f_result = LDAP_COMPARE_TRUE;\n\t\t}\n\t\t/* no assert - list could be empty /\n\t\tbreak;\n\n\tcase LDAP_FILTER_OR:\n\t\tDebug( LDAP_DEBUG_FILTER, \"OR\\n\", 0, 0, 0 );\n\t\terr = get_filter_list( op, ber, &f.f_or, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\t\tif ( f.f_or == NULL ) {\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\tf.f_result = LDAP_COMPARE_FALSE;\n\t\t}\n\t\t/ no assert - list could be empty /\n\t\tbreak;\n\n\tcase LDAP_FILTER_NOT:\n\t\tDebug( LDAP_DEBUG_FILTER, \"NOT\\n\", 0, 0, 0 );\n\t\t(void) ber_skip_tag( ber, &len );\n\t\terr = get_filter( op, ber, &f.f_not, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\n\t\tassert( f.f_not != NULL );\n\t\tif ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {\n\t\t\tint fresult = f.f_not->f_result;\n\t\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\t\top->o_tmpfree( f.f_not, op->o_tmpmemctx );\n\t\t\tf.f_not = NULL;\n\n\t\t\tswitch( fresult ) {\n\t\t\tcase LDAP_COMPARE_TRUE:\n\t\t\t\tf.f_result = LDAP_COMPARE_FALSE;\n\t\t\t\tbreak;\n\t\t\tcase LDAP_COMPARE_FALSE:\n\t\t\t\tf.f_result = LDAP_COMPARE_TRUE;\n\t\t\t\tbreak;\n\t\t\tdefault: ;\n\t\t\t\t/ (!Undefined) is Undefined /\n\t\t\t}\n\t\t}\n\t\tbreak;\n\n\tcase LDAP_FILTER_EXT:\n\t\tDebug( LDAP_DEBUG_FILTER, \"EXTENSIBLE\\n\", 0, 0, 0 );\n\n\t\terr = get_mra( op, ber, &f, text );\n\t\tif ( err != LDAP_SUCCESS ) {\n\t\t\tbreak;\n\t\t}\n\n\t\tassert( f.f_mra != NULL );\n\t\tbreak;\n\n\tdefault:\n\t\t(void) ber_scanf( ber, \"x\" ); / skip the element /\n\t\tDebug( LDAP_DEBUG_ANY, \"get_filter: unknown filter type=%lu\\n\",\n\t\t\tf.f_choice, 0, 0 );\n\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\tf.f_result = SLAPD_COMPARE_UNDEFINED;\n\t\tbreak;\n\t}\n\n\tif( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {\n\t\t/ ignore error /\n\t\ttext = NULL;\n\t\tf.f_choice = SLAPD_FILTER_COMPUTED;\n\t\tf.f_result = SLAPD_COMPARE_UNDEFINED;\n\t\terr = LDAP_SUC\n/* ... truncated ... /\n```\n\n\n## Upstream Fix\n```diff\nFrom 7a96c04e0f8bd325a00bd846ea3d244465474e2a Mon Sep 17 00:00:00 2001\nFrom: William Brown <wbrown@suse.de>\nDate: Thu, 30 Apr 2020 08:57:57 +1000\nSubject: [PATCH] bsc#1170771 - limit depth of nested filters\n\nOriginal Commit Message:\nd38d48fc8f572dedfb67b9da61a2ba3b125ced91\n[PATCH] ITS#9202 limit depth of nested filters\n\nUsing a hardcoded limit for now; no reasonable apps\nshould ever run into it.\n---\n servers/slapd/filter.c \| 40 +++++++++++++++++++++++++++++++---------\n 1 file changed, 31 insertions(+), 9 deletions(-)\n\ndiff --git a/servers/slapd/filter.c b/servers/slapd/filter.c\nindex e76dc08..95a20fe 100644\n--- a/servers/slapd/filter.c\n+++ b/servers/slapd/filter.c\n@@ -37,11 +37,16 @@\n const Filter slap_filter_objectClass_pres;\n const struct berval slap_filterstr_objectClass_pres;\n \n+#ifndef SLAPD_MAX_FILTER_DEPTH\n+#define SLAPD_MAX_FILTER_DEPTH 5000\n+#endif\n+\n static int\tget_filter_list(\n \tOperation op,\n \tBerElement ber,\n \tFilter f,\n-\tconst char text );\n+\tconst char text,\n+\tint depth );\n \n static int\tget_ssa(\n \tOperation op,\n@@ -80,12 +85,13 @@ filter_destroy( void )\n \treturn;\n }\n \n-int\n-get_filter(\n+static int\n+get_filter0(\n \tOperation op,\n \tBerElement ber,\n \tFilter filt,\n-\tconst char text )\n+\tconst char *text,\n+\tint depth )\n {\n \tber_tag_t\ttag;\n \tber_len_t\tlen;\n@@ -126,6 +132,11 @@ get_filter(\n \t \n \t /\n \n+\tif( depth > SLAPD_MAX_FILTER_DEPTH ) {\n+\t\ttext = \"filter nested too deeply\";\n+\t\treturn SLAPD_DISCONNECT;\n+\t}\n+\n \ttag = ber_peek_tag( ber, &len );\n \n \tif( tag == LBER_ERROR ) {\n@@ -221,7 +232,7 @@ get_filter(\n \n \tcase LDAP_FILTER_AND:\n \t\tDebug( LDAP_DEBUG_FILTER, \"AND\\n\", 0, 0, 0 );\n-\t\terr = get_filter_list( op, ber, &f.f_and, text );\n+\t\terr = get_filter_list( op, ber, &f.f_and, text, depth+1 );\n \t\tif ( err != LDAP_SUCCESS ) {\n \t\t\tbreak;\n \t\t}\n@@ -234,7 +245,7 @@ get_filter(\n \n \tcase LDAP_FILTER_OR:\n \t\tDebug( LDAP_DEBUG_FILTER, \"OR\\n\", 0, 0, 0 );\n-\t\terr = get_filter_list( op, ber, &f.f_or, text );\n+\t\terr = get_filter_list( op, ber, &f.f_or, text, depth+1 );\n \t\tif ( err != LDAP_SUCCESS ) {\n \t\t\tbreak;\n \t\t}\n@@ -248,7 +259,7 @@ get_filter(\n \tcase LDAP_FILTER_NOT:\n \t\tDebug( LDAP_DEBUG_FILTER, \"NOT\\n\", 0, 0, 0 );\n \t\t(void) ber_skip_tag( ber, &len );\n-\t\terr = get_filter( op, ber, &f.f_not, text );\n+\t\terr = get_filter0( op, ber, &f.f_not, text, depth+1 );\n \t\tif ( err != LDAP_SUCCESS ) {\n \t\t\tbreak;\n \t\t}\n@@ -311,10 +322,21 @@ get_filter(\n \treturn( err );\n }\n \n+int\n+get_filter(\n+\tOperation op,\n+\tBerElement ber,\n+\tFilter filt,\n+\tconst char text )\n+{\n+\treturn get_filter0( op, ber, filt, text, 0 );\n+}\n+\n static int\n get_filter_list( Operation op, BerElement ber,\n \tFilter f,\n-\tconst char text )\n+\tconst char text,\n+\tint depth )\n {\n \tFilter\t\tnew;\n \tint\t\terr;\n@@ -328,7 +350,7 @@ get_filter_list( Operation op, BerElement ber,\n \t\ttag != LBER_DEFAULT;\n \t\ttag = ber_next_element( ber, &len, last ) )\n \t{\n-\t\terr = get_filter( op, ber, new, text );\n+\t\terr = get_filter0( op, ber, new, text, depth );\n \t\tif ( err != LDAP_SUCCESS )\n \t\t\treturn( err );\n \t\tnew = &(new)->f_next;\n-- \n2.26.2\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 7a96c04e0f8bd325a00bd846ea3d244465474e2a Mon Sep 17 00:00:00 2001\nFrom: William Brown <wbrown@suse.de>\nDate: Thu, 30 Apr 2020 08:57:57 +1000\nSubject: [PATCH] bsc#1170771 - limit depth of nested filters\n\nOriginal Commit Message:\nd38d48fc8f572dedfb67b9da61a2ba3b125ced91\n[PATCH] ITS#9202 limit depth of nested filters\n\nUsing a hardcoded limit for now; no reasonable apps\nshould ever run into it.\n---\n servers/slapd/filter.c \| 40 +++++++++++++++++++++++++++++++---------\n 1 file changed, 31 insertions(+), 9 deletions(-)\n\ndiff --git a/servers/slapd/filter.c b/servers/slapd/filter.c\nindex e76dc08..95a20fe 100644\n--- a/servers/slapd/filter.c\n+++ b/servers/slapd/filter.c\n@@ -37,11 +37,16 @@\n const Filter slap_filter_objectClass_pres;\n const struct berval slap_filterstr_objectClass_pres;\n \n+#ifndef SLAPD_MAX_FILTER_DEPTH\n+#define SLAPD_MAX_FILTER_DEPTH 5000\n+#endif\n+\n static int\tget_filter_list(\n \tOperation op,\n \tBerElement ber,\n \tFilter f,\n-\tconst char text );\n+\tconst char text,\n+\tint depth );\n \n static int\tget_ssa(\n \tOperation op,\n@@ -80,12 +85,13 @@ filter_destroy( void )\n \treturn;\n }\n \n-int\n-get_filter(\n+static int\n+get_filter0(\n \tOperation op,\n \tBerElement ber,\n \tFilter filt,\n-\tconst char text )\n+\tconst char *text,\n+\tint depth )\n {\n \tber_tag_t\ttag;\n \tber_len_t\tlen;\n@@ -126,6 +132,11 @@ get_filter(\n \t \n \t /\n \n+\tif( depth > SLAPD_MAX_FILTER_DEPTH ) {\n+\t\ttext = \"filter nested too deeply\";\n+\t\treturn SLAPD_DISCONNECT;\n+\t}\n+\n \ttag = ber_peek_tag( ber, &len );\n \n \tif( tag == LBER_ERROR ) {\n@@ -221,7 +232,7 @@ get_filter(\n \n \tcase LDAP_FILTER_AND:\n \t\tDebug( LDAP_DEBUG_FILTER, \"AND\\n\", 0, 0, 0 );\n-\t\terr = get_filter_list( op, ber, &f.f_and, text );\n+\t\terr = get_filter_list( op, ber, &f.f_and, text, depth+1 );\n \t\tif ( err != LDAP_SUCCESS ) {\n \t\t\tbreak;\n \t\t}\n@@ -234,7 +245,7 @@ get_filter(\n \n \tcase LDAP_FILTER_OR:\n \t\tDebug( LDAP_DEBUG_FILTER, \"OR\\n\", 0, 0, 0 );\n-\t\terr = get_filter_list( op, ber, &f.f_or, text );\n+\t\terr = get_filter_list( op, ber, &f.f_or, text, depth+1 );\n \t\tif ( err != LDAP_SUCCESS ) {\n \t\t\tbreak;\n \t\t}\n@@ -248,7 +259,7 @@ get_filter(\n \tcase LDAP_FILTER_NOT:\n \t\tDebug( LDAP_DEBUG_FILTER, \"NOT\\n\", 0, 0, 0 );\n \t\t(void) ber_skip_tag( ber, &len );\n-\t\terr = get_filter( op, ber, &f.f_not, text );\n+\t\terr = get_filter0( op, ber, &f.f_not, text, depth+1 );\n \t\tif ( err != LDAP_SUCCESS ) {\n \t\t\tbreak;\n \t\t}\n@@ -311,10 +322,21 @@ get_filter(\n \treturn( err );\n }\n \n+int\n+get_filter(\n+\tOperation op,\n+\tBerElement ber,\n+\tFilter filt,\n+\tconst char text )\n+{\n+\treturn get_filter0( op, ber, filt, text, 0 );\n+}\n+\n static int\n get_filter_list( Operation op, BerElement ber,\n \tFilter f,\n-\tconst char text )\n+\tconst char text,\n+\tint depth )\n {\n \tFilter\t\tnew;\n \tint\t\terr;\n@@ -328,7 +350,7 @@ get_filter_list( Operation op, BerElement ber,\n \t\ttag != LBER_DEFAULT;\n \t\ttag = ber_next_element( ber, &len, last ) )\n \t{\n-\t\terr = get_filter( op, ber, new, text );\n+\t\terr = get_filter0( op, ber, new, text, depth );\n \t\tif ( err != LDAP_SUCCESS )\n \t\t\treturn( err );\n \t\tnew = &(*new)->f_next;\n-- \n2.26.2\n\n" } ]	{ "id": "openldap2-15919-0205-bsc-1170771-limit-depth-of-nested-filters.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0205-bsc-1170771-limit-depth-of-nested-filters.patch", "tier": "identical", "language": "c", "patch_lines_changed": 41, "patch_files_count": 1, "total_tokens_est": 1693, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#9404 fix serialNumberAndIssuerCheck\n\n## Package\nopenldap2\n\n## Files to modify\n- servers/slapd/schema_init.c\n\n## Target Source Code\n\n### servers/slapd/schema_init.c\n\n#### serialNumberAndIssuerCheck() [lines 3140-3247]\n```c\n\n\tif ( strncasecmp( out->bv_val, \"0x\", STRLENOF(\"0x\") ) == 0 ) {\n\t\tfirst = out->bv_val[2];\n\t\textra = 2;\n\n\t\tout->bv_len += STRLENOF(\"0x\");\n\t\tfor ( ; out->bv_len < in->bv_len; out->bv_len++ ) {\n\t\t\tif ( !ASCII_HEX( out->bv_val[out->bv_len] ) ) break;\n\t\t}\n\n\t} else if ( out->bv_val[0] == '\\'' ) {\n\t\tfirst = out->bv_val[1];\n\t\textra = 3;\n\n\t\tout->bv_len += STRLENOF(\"'\");\n\n\t\tfor ( ; out->bv_len < in->bv_len; out->bv_len++ ) {\n\t\t\tif ( !ASCII_HEX( out->bv_val[out->bv_len] ) ) break;\n\t\t}\n\t\tif ( strncmp( &out->bv_val[out->bv_len], \"'H\", STRLENOF(\"'H\") ) != 0 ) {\n\t\t\treturn -1;\n\t\t}\n\t\tout->bv_len += STRLENOF(\"'H\");\n\n\t} else {\n\t\tfirst = out->bv_val[0];\n\t\tfor ( ; out->bv_len < in->bv_len; out->bv_len++ ) {\n\t\t\tif ( !ASCII_DIGIT( out->bv_val[out->bv_len] ) ) break;\n\t\t}\n\t}\n\n\tif ( !( out->bv_len > neg ) ) {\n\t\treturn -1;\n\t}\n\n\tif ( ( out->bv_len > extra + 1 + neg ) && ( first == '0' ) ) {\n\t\treturn -1;\n\t}\n\n\treturn 0;\n}\n\nstatic int\nserialNumberAndIssuerCheck(\n\tstruct berval in,\n\tstruct berval sn,\n\tstruct berval is,\n\tvoid ctx )\n{\n\tber_len_t n;\n\n\tif( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX;\n\n\tif( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) {\n\t\t/* Parse old format /\n\t\tis->bv_val = ber_bvchr( in, '$' );\n\t\tif( BER_BVISNULL( is ) ) return LDAP_INVALID_SYNTAX;\n\n\t\tsn->bv_val = in->bv_val;\n\t\tsn->bv_len = is->bv_val - in->bv_val;\n\n\t\tis->bv_val++;\n\t\tis->bv_len = in->bv_len - (sn->bv_len + 1);\n\n\t\t/ eat leading zeros /\n\t\tfor( n=0; n < (sn->bv_len-1); n++ ) {\n\t\t\tif( sn->bv_val[n] != '0' ) break;\n\t\t}\n\t\tsn->bv_val += n;\n\t\tsn->bv_len -= n;\n\n\t\tfor( n=0; n < sn->bv_len; n++ ) {\n\t\t\tif( !ASCII_DIGIT(sn->bv_val[n]) ) return LDAP_INVALID_SYNTAX;\n\t\t}\n\n\t} else {\n\t\t/ Parse GSER format / \n\t\tenum {\n\t\t\tHAVE_NONE = 0x0,\n\t\t\tHAVE_ISSUER = 0x1,\n\t\t\tHAVE_SN = 0x2,\n\t\t\tHAVE_ALL = ( HAVE_ISSUER \| HAVE_SN )\n\t\t} have = HAVE_NONE;\n\n\t\tint numdquotes = 0;\n\t\tstruct berval x = in;\n\t\tstruct berval ni;\n\t\tx.bv_val++;\n\t\tx.bv_len -= 2;\n\n\t\tdo {\n\t\t\t/* eat leading spaces /\n\t\t\tfor ( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len-- ) {\n\t\t\t\t/ empty /;\n\t\t\t}\n\n\t\t\t/ should be at issuer or serialNumber NamedValue /\n\t\t\tif ( strncasecmp( x.bv_val, \"issuer\", STRLENOF(\"issuer\") ) == 0 ) {\n\t\t\t\tif ( have & HAVE_ISSUER ) return LDAP_INVALID_SYNTAX;\n\n\t\t\t\t/ parse issuer /\n\t\t\t\tx.bv_val += STRLENOF(\"issuer\");\n\t\t\t\tx.bv_len -= STRLENOF(\"issuer\");\n\n\t\t\t\tif ( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX;\n\t\t\t\tx.bv_val++;\n\t\t\t\tx.bv_len--;\n\n```\n\n#### serialNumberAndIssuerCheck() [lines 3171-3278]\n```c\n\tif ( !( out->bv_len > neg ) ) {\n\t\treturn -1;\n\t}\n\n\tif ( ( out->bv_len > extra + 1 + neg ) && ( first == '0' ) ) {\n\t\treturn -1;\n\t}\n\n\treturn 0;\n}\n\nstatic int\nserialNumberAndIssuerCheck(\n\tstruct berval in,\n\tstruct berval sn,\n\tstruct berval is,\n\tvoid ctx )\n{\n\tber_len_t n;\n\n\tif( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX;\n\n\tif( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) {\n\t\t/ Parse old format /\n\t\tis->bv_val = ber_bvchr( in, '$' );\n\t\tif( BER_BVISNULL( is ) ) return LDAP_INVALID_SYNTAX;\n\n\t\tsn->bv_val = in->bv_val;\n\t\tsn->bv_len = is->bv_val - in->bv_val;\n\n\t\tis->bv_val++;\n\t\tis->bv_len = in->bv_len - (sn->bv_len + 1);\n\n\t\t/ eat leading zeros /\n\t\tfor( n=0; n < (sn->bv_len-1); n++ ) {\n\t\t\tif( sn->bv_val[n] != '0' ) break;\n\t\t}\n\t\tsn->bv_val += n;\n\t\tsn->bv_len -= n;\n\n\t\tfor( n=0; n < sn->bv_len; n++ ) {\n\t\t\tif( !ASCII_DIGIT(sn->bv_val[n]) ) return LDAP_INVALID_SYNTAX;\n\t\t}\n\n\t} else {\n\t\t/ Parse GSER format / \n\t\tenum {\n\t\t\tHAVE_NONE = 0x0,\n\t\t\tHAVE_ISSUER = 0x1,\n\t\t\tHAVE_SN = 0x2,\n\t\t\tHAVE_ALL = ( HAVE_ISSUER \| HAVE_SN )\n\t\t} have = HAVE_NONE;\n\n\t\tint numdquotes = 0;\n\t\tstruct berval x = in;\n\t\tstruct berval ni;\n\t\tx.bv_val++;\n\t\tx.bv_len -= 2;\n\n\t\tdo {\n\t\t\t/* eat leading spaces /\n\t\t\tfor ( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len-- ) {\n\t\t\t\t/ empty /;\n\t\t\t}\n\n\t\t\t/ should be at issuer or serialNumber NamedValue /\n\t\t\tif ( strncasecmp( x.bv_val, \"issuer\", STRLENOF(\"issuer\") ) == 0 ) {\n\t\t\t\tif ( have & HAVE_ISSUER ) return LDAP_INVALID_SYNTAX;\n\n\t\t\t\t/ parse issuer /\n\t\t\t\tx.bv_val += STRLENOF(\"issuer\");\n\t\t\t\tx.bv_len -= STRLENOF(\"issuer\");\n\n\t\t\t\tif ( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX;\n\t\t\t\tx.bv_val++;\n\t\t\t\tx.bv_len--;\n\n\t\t\t\t/ eat leading spaces /\n\t\t\t\tfor ( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len-- ) {\n\t\t\t\t\t/ empty /;\n\t\t\t\t}\n\n\t\t\t\t/ For backward compatibility, this part is optional /\n\t\t\t\tif ( strncasecmp( x.bv_val, \"rdnSequence:\", STRLENOF(\"rdnSequence:\") ) == 0 ) {\n\t\t\t\t\tx.bv_val += STRLENOF(\"rdnSequence:\");\n\t\t\t\t\tx.bv_len -= STRLENOF(\"rdnSequence:\");\n\t\t\t\t}\n\n\t\t\t\tif ( x.bv_val[0] != '\"' ) return LDAP_INVALID_SYNTAX;\n\t\t\t\tx.bv_val++;\n\t\t\t\tx.bv_len--;\n\n\t\t\t\tis->bv_val = x.bv_val;\n\t\t\t\tis->bv_len = 0;\n\n\t\t\t\tfor ( ; is->bv_len < x.bv_len; ) {\n\t\t\t\t\tif ( is->bv_val[is->bv_len] != '\"' ) {\n\t\t\t\t\t\tis->bv_len++;\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tif ( is->bv_val[is->bv_len+1] == '\"' ) {\n\t\t\t\t\t\t/ double dquote /\n\t\t\t\t\t\tnumdquotes++;\n\t\t\t\t\t\tis->bv_len += 2;\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n```\n\n#### serialNumberAndIssuerCheck() [lines 3234-3286]\n```c\n\t\t\t}\n\n\t\t\t/ should be at issuer or serialNumber NamedValue /\n\t\t\tif ( strncasecmp( x.bv_val, \"issuer\", STRLENOF(\"issuer\") ) == 0 ) {\n\t\t\t\tif ( have & HAVE_ISSUER ) return LDAP_INVALID_SYNTAX;\n\n\t\t\t\t/ parse issuer /\n\t\t\t\tx.bv_val += STRLENOF(\"issuer\");\n\t\t\t\tx.bv_len -= STRLENOF(\"issuer\");\n\n\t\t\t\tif ( x.bv_val[0] != ' ' ) return LDAP_INVALID_SYNTAX;\n\t\t\t\tx.bv_val++;\n\t\t\t\tx.bv_len--;\n\n\t\t\t\t/ eat leading spaces /\n\t\t\t\tfor ( ; (x.bv_val[0] == ' ') && x.bv_len; x.bv_val++, x.bv_len-- ) {\n\t\t\t\t\t/ empty /;\n\t\t\t\t}\n\n\t\t\t\t/ For backward compatibility, this part is optional /\n\t\t\t\tif ( strncasecmp( x.bv_val, \"rdnSequence:\", STRLENOF(\"rdnSequence:\") ) == 0 ) {\n\t\t\t\t\tx.bv_val += STRLENOF(\"rdnSequence:\");\n\t\t\t\t\tx.bv_len -= STRLENOF(\"rdnSequence:\");\n\t\t\t\t}\n\n\t\t\t\tif ( x.bv_val[0] != '\"' ) return LDAP_INVALID_SYNTAX;\n\t\t\t\tx.bv_val++;\n\t\t\t\tx.bv_len--;\n\n\t\t\t\tis->bv_val = x.bv_val;\n\t\t\t\tis->bv_len = 0;\n\n\t\t\t\tfor ( ; is->bv_len < x.bv_len; ) {\n\t\t\t\t\tif ( is->bv_val[is->bv_len] != '\"' ) {\n\t\t\t\t\t\tis->bv_len++;\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tif ( is->bv_val[is->bv_len+1] == '\"' ) {\n\t\t\t\t\t\t/ double dquote /\n\t\t\t\t\t\tnumdquotes++;\n\t\t\t\t\t\tis->bv_len += 2;\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tx.bv_val += is->bv_len + 1;\n\t\t\t\tx.bv_len -= is->bv_len + 1;\n\n\t\t\t\thave \|= HAVE_ISSUER;\n\n\t\t\t} else if ( strncasecmp( x.bv_val, \"serialNumber\", STRLENOF(\"serialNumber\") ) == 0 )\n\t\t\t{\n\t\t\t\tif ( have & HAVE_SN ) return LDAP_INVALID_SYNTAX;\n```\n\n#### serialNumberAndIssuerCheck() [lines 3268-3278]\n```c\n\t\t\t\t\t\tis->bv_len++;\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tif ( is->bv_val[is->bv_len+1] == '\"' ) {\n\t\t\t\t\t\t/ double dquote /\n\t\t\t\t\t\tnumdquotes++;\n\t\t\t\t\t\tis->bv_len += 2;\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n```\n\n\n## Upstream Fix\n```diff\nFrom 02e18c2f80eb89ef9dbab323a1c4301e713c8b79 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Mon, 23 Nov 2020 17:14:00 +0000\nSubject: [PATCH 212/224] ITS#9404 fix serialNumberAndIssuerCheck\n\nTighten validity checks\n---\n servers/slapd/schema_init.c \| 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c\nindex 3c5ee3dad..f9200d362 100644\n--- a/servers/slapd/schema_init.c\n+++ b/servers/slapd/schema_init.c\n@@ -3189,7 +3189,7 @@ serialNumberAndIssuerCheck(\n \n \tif( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX;\n \n-\tif( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) {\n+\tif( in->bv_val[0] != '{' \|\| in->bv_val[in->bv_len-1] != '}' ) {\n \t\t/ Parse old format /\n \t\tis->bv_val = ber_bvchr( in, '$' );\n \t\tif( BER_BVISNULL( is ) ) return LDAP_INVALID_SYNTAX;\n@@ -3220,7 +3220,7 @@ serialNumberAndIssuerCheck(\n \t\t\tHAVE_ALL = ( HAVE_ISSUER \| HAVE_SN )\n \t\t} have = HAVE_NONE;\n \n-\t\tint numdquotes = 0;\n+\t\tint numdquotes = 0, gotquote;\n \t\tstruct berval x = in;\n \t\tstruct berval ni;\n \t\tx.bv_val++;\n@@ -3262,11 +3262,12 @@ serialNumberAndIssuerCheck(\n \t\t\t\tis->bv_val = x.bv_val;\n \t\t\t\tis->bv_len = 0;\n \n-\t\t\t\tfor ( ; is->bv_len < x.bv_len; ) {\n+\t\t\t\tfor ( gotquote=0; is->bv_len < x.bv_len; ) {\n \t\t\t\t\tif ( is->bv_val[is->bv_len] != '\"' ) {\n \t\t\t\t\t\tis->bv_len++;\n \t\t\t\t\t\tcontinue;\n \t\t\t\t\t}\n+\t\t\t\t\tgotquote = 1;\n \t\t\t\t\tif ( is->bv_val[is->bv_len+1] == '\"' ) {\n \t\t\t\t\t\t/* double dquote /\n \t\t\t\t\t\tnumdquotes++;\n@@ -3275,6 +3276,8 @@ serialNumberAndIssuerCheck(\n \t\t\t\t\t}\n \t\t\t\t\tbreak;\n \t\t\t\t}\n+\t\t\t\tif ( !gotquote ) return LDAP_INVALID_SYNTAX;\n+\n \t\t\t\tx.bv_val += is->bv_len + 1;\n \t\t\t\tx.bv_len -= is->bv_len + 1;\n \n-- \n2.30.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 02e18c2f80eb89ef9dbab323a1c4301e713c8b79 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Mon, 23 Nov 2020 17:14:00 +0000\nSubject: [PATCH 212/224] ITS#9404 fix serialNumberAndIssuerCheck\n\nTighten validity checks\n---\n servers/slapd/schema_init.c \| 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c\nindex 3c5ee3dad..f9200d362 100644\n--- a/servers/slapd/schema_init.c\n+++ b/servers/slapd/schema_init.c\n@@ -3189,7 +3189,7 @@ serialNumberAndIssuerCheck(\n \n \tif( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX;\n \n-\tif( in->bv_val[0] != '{' && in->bv_val[in->bv_len-1] != '}' ) {\n+\tif( in->bv_val[0] != '{' \|\| in->bv_val[in->bv_len-1] != '}' ) {\n \t\t/ Parse old format /\n \t\tis->bv_val = ber_bvchr( in, '$' );\n \t\tif( BER_BVISNULL( is ) ) return LDAP_INVALID_SYNTAX;\n@@ -3220,7 +3220,7 @@ serialNumberAndIssuerCheck(\n \t\t\tHAVE_ALL = ( HAVE_ISSUER \| HAVE_SN )\n \t\t} have = HAVE_NONE;\n \n-\t\tint numdquotes = 0;\n+\t\tint numdquotes = 0, gotquote;\n \t\tstruct berval x = in;\n \t\tstruct berval ni;\n \t\tx.bv_val++;\n@@ -3262,11 +3262,12 @@ serialNumberAndIssuerCheck(\n \t\t\t\tis->bv_val = x.bv_val;\n \t\t\t\tis->bv_len = 0;\n \n-\t\t\t\tfor ( ; is->bv_len < x.bv_len; ) {\n+\t\t\t\tfor ( gotquote=0; is->bv_len < x.bv_len; ) {\n \t\t\t\t\tif ( is->bv_val[is->bv_len] != '\"' ) {\n \t\t\t\t\t\tis->bv_len++;\n \t\t\t\t\t\tcontinue;\n \t\t\t\t\t}\n+\t\t\t\t\tgotquote = 1;\n \t\t\t\t\tif ( is->bv_val[is->bv_len+1] == '\"' ) {\n \t\t\t\t\t\t/* double dquote */\n \t\t\t\t\t\tnumdquotes++;\n@@ -3275,6 +3276,8 @@ serialNumberAndIssuerCheck(\n \t\t\t\t\t}\n \t\t\t\t\tbreak;\n \t\t\t\t}\n+\t\t\t\tif ( !gotquote ) return LDAP_INVALID_SYNTAX;\n+\n \t\t\t\tx.bv_val += is->bv_len + 1;\n \t\t\t\tx.bv_len -= is->bv_len + 1;\n \n-- \n2.30.0\n\n" } ]	{ "id": "openldap2-15919-0212-ITS-9404-fix-serialNumberAndIssuerCheck.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0212-ITS-9404-fix-serialNumberAndIssuerCheck.patch", "tier": "identical", "language": "c", "patch_lines_changed": 10, "patch_files_count": 1, "total_tokens_est": 1019, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#8866 slapo-unique to return filter used in diagnostic\n\n## Package\nopenldap2\n\n## Files to modify\n- servers/slapd/overlays/unique.c\n\n## Target Source Code\n\n### servers/slapd/overlays/unique.c\n\n#### unique_search() [lines 916-1022]\n```c\n\t\tif ( uri->attrs ) {\n\t\t\tfor ( attr = uri->attrs; attr; attr = attr->next ) {\n\t\t\t\tif ( ad == attr->attr ) {\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t}\n\t\t\tif ( ( domain->ignore && attr )\n\t\t\t \|\| (!domain->ignore && !attr )) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\tif ( b && b[0].bv_val ) {\n\t\t\tfor ( i = 0; b[i].bv_val; i++ ) {\n\t\t\t\tstruct berval\tbv;\n\t\t\t\tint len;\n\n\t\t\t\tldap_bv2escaped_filter_value_x( &b[i], &bv, 1, ctx );\n\t\t\t\tif (!b[i].bv_len)\n\t\t\t\t\tbv.bv_val = b[i].bv_val;\n\t\t\t\tlen = snprintf( kp, ks, \"(%s=%s)\", ad->ad_cname.bv_val, bv.bv_val );\n\t\t\t\tassert( len >= 0 && len < ks );\n\t\t\t\tkp += len;\n\t\t\t\tif ( bv.bv_val != b[i].bv_val ) {\n\t\t\t\t\tber_memfree_x( bv.bv_val, ctx );\n\t\t\t\t}\n\t\t\t}\n\t\t} else if ( domain->strict ) {\n\t\t\tint len;\n\t\t\tlen = snprintf( kp, ks, \"(%s=)\", ad->ad_cname.bv_val );\n\t\t\tassert( len >= 0 && len < ks );\n\t\t\tkp += len;\n\t\t}\n\t\tbreak;\n\t}\n\treturn kp;\n}\n\nstatic int\nunique_search(\n\tOperation op,\n\tOperation nop,\n\tstruct berval dn,\n\tint scope,\n\tSlapReply rs,\n\tstruct berval key\n)\n{\n\tslap_overinst on = (slap_overinst ) op->o_bd->bd_info;\n\tSlapReply nrs = { REP_RESULT };\n\tslap_callback cb = { NULL, NULL, NULL, NULL }; /* XXX /\n\tunique_counter uq = { NULL, 0 };\n\tint rc;\n\n\tDebug(LDAP_DEBUG_TRACE, \"==> unique_search %s\\n\", key->bv_val, 0, 0);\n\n\tnop->ors_filter = str2filter_x(nop, key->bv_val);\n\tif(nop->ors_filter == NULL) {\n\t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n\t\tsend_ldap_error(op, rs, LDAP_OTHER,\n\t\t\t\"unique_search invalid filter\");\n\t\treturn(rs->sr_err);\n\t}\n\n\tnop->ors_filterstr = key;\n\n\tcb.sc_response\t= (slap_response)count_attr_cb;\n\tcb.sc_private\t= &uq;\n\tnop->o_callback\t= &cb;\n\tnop->o_tag\t= LDAP_REQ_SEARCH;\n\tnop->ors_scope\t= scope;\n\tnop->ors_deref\t= LDAP_DEREF_NEVER;\n\tnop->ors_limit\t= NULL;\n\tnop->ors_slimit\t= SLAP_NO_LIMIT;\n\tnop->ors_tlimit\t= SLAP_NO_LIMIT;\n\tnop->ors_attrs\t= slap_anlist_no_attrs;\n\tnop->ors_attrsonly = 1;\n\n\tuq.ndn = &op->o_req_ndn;\n\n\tnop->o_req_ndn = dn;\n\tnop->o_ndn = op->o_bd->be_rootndn;\n\n\tnop->o_bd = on->on_info->oi_origdb;\n\trc = nop->o_bd->be_search(nop, &nrs);\n\tfilter_free_x(nop, nop->ors_filter, 1);\n\top->o_tmpfree( key->bv_val, op->o_tmpmemctx );\n\n\tif(rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT) {\n\t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n\t\tsend_ldap_error(op, rs, rc, \"unique_search failed\");\n\t\treturn(rs->sr_err);\n\t}\n\n\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found %d records\\n\", uq.count, 0, 0);\n\n\tif(uq.count) {\n\t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n\t\tsend_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION,\n\t\t\t\"some attributes not unique\");\n\t\treturn(rs->sr_err);\n\t}\n\n\treturn(SLAP_CB_CONTINUE);\n}\n\nstatic int\nunique_add(\n```\n\n#### unique_search() [lines 949-1073]\n```c\n\t}\n\treturn kp;\n}\n\nstatic int\nunique_search(\n\tOperation op,\n\tOperation nop,\n\tstruct berval dn,\n\tint scope,\n\tSlapReply rs,\n\tstruct berval key\n)\n{\n\tslap_overinst on = (slap_overinst ) op->o_bd->bd_info;\n\tSlapReply nrs = { REP_RESULT };\n\tslap_callback cb = { NULL, NULL, NULL, NULL }; /* XXX /\n\tunique_counter uq = { NULL, 0 };\n\tint rc;\n\n\tDebug(LDAP_DEBUG_TRACE, \"==> unique_search %s\\n\", key->bv_val, 0, 0);\n\n\tnop->ors_filter = str2filter_x(nop, key->bv_val);\n\tif(nop->ors_filter == NULL) {\n\t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n\t\tsend_ldap_error(op, rs, LDAP_OTHER,\n\t\t\t\"unique_search invalid filter\");\n\t\treturn(rs->sr_err);\n\t}\n\n\tnop->ors_filterstr = key;\n\n\tcb.sc_response\t= (slap_response)count_attr_cb;\n\tcb.sc_private\t= &uq;\n\tnop->o_callback\t= &cb;\n\tnop->o_tag\t= LDAP_REQ_SEARCH;\n\tnop->ors_scope\t= scope;\n\tnop->ors_deref\t= LDAP_DEREF_NEVER;\n\tnop->ors_limit\t= NULL;\n\tnop->ors_slimit\t= SLAP_NO_LIMIT;\n\tnop->ors_tlimit\t= SLAP_NO_LIMIT;\n\tnop->ors_attrs\t= slap_anlist_no_attrs;\n\tnop->ors_attrsonly = 1;\n\n\tuq.ndn = &op->o_req_ndn;\n\n\tnop->o_req_ndn = dn;\n\tnop->o_ndn = op->o_bd->be_rootndn;\n\n\tnop->o_bd = on->on_info->oi_origdb;\n\trc = nop->o_bd->be_search(nop, &nrs);\n\tfilter_free_x(nop, nop->ors_filter, 1);\n\top->o_tmpfree( key->bv_val, op->o_tmpmemctx );\n\n\tif(rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT) {\n\t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n\t\tsend_ldap_error(op, rs, rc, \"unique_search failed\");\n\t\treturn(rs->sr_err);\n\t}\n\n\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found %d records\\n\", uq.count, 0, 0);\n\n\tif(uq.count) {\n\t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n\t\tsend_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION,\n\t\t\t\"some attributes not unique\");\n\t\treturn(rs->sr_err);\n\t}\n\n\treturn(SLAP_CB_CONTINUE);\n}\n\nstatic int\nunique_add(\n\tOperation op,\n\tSlapReply rs\n)\n{\n\tslap_overinst on = (slap_overinst ) op->o_bd->bd_info;\n\tunique_data private = (unique_data ) on->on_bi.bi_private;\n\tunique_domain domains = private->domains;\n\tunique_domain legacy = private->legacy;\n\tunique_domain domain;\n\tOperation nop = op;\n/ ... 21 lines omitted ... /\n\t{\n\t\tunique_domain_uri uri;\n\n\t\tfor ( uri = domain->uri;\n\t\t uri;\n\t\t uri = uri->next )\n\t\t{\n\t\t\tint len;\n\t\t\tint ks = 0;\n\n\t\t\tif ( uri->ndn.bv_val\n\t\t\t && !dnIsSuffix( &op->o_req_ndn, &uri->ndn ))\n\t\t\t\tcontinue;\n\n\t\t\tif ( uri->f ) {\n\t\t\t\tif ( test_filter( NULL, op->ora_e, uri->f )\n\t\t\t\t\t== LDAP_COMPARE_FALSE )\n\t\t\t\t{\n\t\t\t\t\tDebug( LDAP_DEBUG_TRACE,\n\t\t\t\t\t\t\"==> unique_add_skip<%s>\\n\",\n```\n\n\n## Upstream Fix\n```diff\nFrom 348588561c694784a8106871b0d5fe578007ea4e Mon Sep 17 00:00:00 2001\nFrom: =?UTF-8?q?Michael=20Str=C3=B6der?= <michael@stroeder.com>\nDate: Fri, 26 Oct 2018 16:40:23 +0200\nSubject: [PATCH] ITS#8866 slapo-unique to return filter used in diagnostic\n message\n\n---\n servers/slapd/overlays/unique.c \| 27 +++++++++++++++++----------\n 1 file changed, 17 insertions(+), 10 deletions(-)\n\ndiff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c\nindex ed62d03b8..a7723cf5d 100644\n--- a/servers/slapd/overlays/unique.c\n+++ b/servers/slapd/overlays/unique.c\n@@ -965,6 +965,8 @@ unique_search(\n \tslap_callback cb = { NULL, NULL, NULL, NULL }; /* XXX /\n \tunique_counter uq = { NULL, 0 };\n \tint rc;\n+\tchar errmsg;\n+\tint errmsgsize;\n \n \tDebug(LDAP_DEBUG_TRACE, \"==> unique_search %s\\n\", key->bv_val, 0, 0);\n \n@@ -998,24 +1000,29 @@ unique_search(\n \tnop->o_bd = on->on_info->oi_origdb;\n \trc = nop->o_bd->be_search(nop, &nrs);\n \tfilter_free_x(nop, nop->ors_filter, 1);\n-\top->o_tmpfree( key->bv_val, op->o_tmpmemctx );\n \n \tif(rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT) {\n \t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n \t\tsend_ldap_error(op, rs, rc, \"unique_search failed\");\n-\t\treturn(rs->sr_err);\n-\t}\n-\n-\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found %d records\\n\", uq.count, 0, 0);\n+\t\trc = rs->sr_err;\n+\t} else if(uq.count) {\n+\t\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found %d records\\n\", uq.count, 0, 0);\n \n-\tif(uq.count) {\n+\t\terrmsgsize = sizeof(\"non-unique attributes found with \") + key->bv_len;\n+\t\terrmsg = op->o_tmpalloc(errmsgsize, op->o_tmpmemctx);\n+\t\tsnprintf( errmsg, errmsgsize, \"non-unique attributes found with %s\", key->bv_val );\n \t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n-\t\tsend_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION,\n-\t\t\t\"some attributes not unique\");\n-\t\treturn(rs->sr_err);\n+\t\tsend_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION, errmsg);\n+\t\top->o_tmpfree(errmsg, op->o_tmpmemctx);\n+\t\trc = rs->sr_err;\n+\t} else {\n+\t\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found no records\\n\", 0, 0, 0);\n+\t\trc = SLAP_CB_CONTINUE;\n \t}\n \n-\treturn(SLAP_CB_CONTINUE);\n+\top->o_tmpfree( key->bv_val, op->o_tmpmemctx );\n+\n+\treturn(rc);\n }\n \n static int\n-- \n2.19.1\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 348588561c694784a8106871b0d5fe578007ea4e Mon Sep 17 00:00:00 2001\nFrom: =?UTF-8?q?Michael=20Str=C3=B6der?= <michael@stroeder.com>\nDate: Fri, 26 Oct 2018 16:40:23 +0200\nSubject: [PATCH] ITS#8866 slapo-unique to return filter used in diagnostic\n message\n\n---\n servers/slapd/overlays/unique.c \| 27 +++++++++++++++++----------\n 1 file changed, 17 insertions(+), 10 deletions(-)\n\ndiff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c\nindex ed62d03b8..a7723cf5d 100644\n--- a/servers/slapd/overlays/unique.c\n+++ b/servers/slapd/overlays/unique.c\n@@ -965,6 +965,8 @@ unique_search(\n \tslap_callback cb = { NULL, NULL, NULL, NULL }; /* XXX /\n \tunique_counter uq = { NULL, 0 };\n \tint rc;\n+\tchar errmsg;\n+\tint errmsgsize;\n \n \tDebug(LDAP_DEBUG_TRACE, \"==> unique_search %s\\n\", key->bv_val, 0, 0);\n \n@@ -998,24 +1000,29 @@ unique_search(\n \tnop->o_bd = on->on_info->oi_origdb;\n \trc = nop->o_bd->be_search(nop, &nrs);\n \tfilter_free_x(nop, nop->ors_filter, 1);\n-\top->o_tmpfree( key->bv_val, op->o_tmpmemctx );\n \n \tif(rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT) {\n \t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n \t\tsend_ldap_error(op, rs, rc, \"unique_search failed\");\n-\t\treturn(rs->sr_err);\n-\t}\n-\n-\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found %d records\\n\", uq.count, 0, 0);\n+\t\trc = rs->sr_err;\n+\t} else if(uq.count) {\n+\t\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found %d records\\n\", uq.count, 0, 0);\n \n-\tif(uq.count) {\n+\t\terrmsgsize = sizeof(\"non-unique attributes found with \") + key->bv_len;\n+\t\terrmsg = op->o_tmpalloc(errmsgsize, op->o_tmpmemctx);\n+\t\tsnprintf( errmsg, errmsgsize, \"non-unique attributes found with %s\", key->bv_val );\n \t\top->o_bd->bd_info = (BackendInfo ) on->on_info;\n-\t\tsend_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION,\n-\t\t\t\"some attributes not unique\");\n-\t\treturn(rs->sr_err);\n+\t\tsend_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION, errmsg);\n+\t\top->o_tmpfree(errmsg, op->o_tmpmemctx);\n+\t\trc = rs->sr_err;\n+\t} else {\n+\t\tDebug(LDAP_DEBUG_TRACE, \"=> unique_search found no records\\n\", 0, 0, 0);\n+\t\trc = SLAP_CB_CONTINUE;\n \t}\n \n-\treturn(SLAP_CB_CONTINUE);\n+\top->o_tmpfree( key->bv_val, op->o_tmpmemctx );\n+\n+\treturn(rc);\n }\n \n static int\n-- \n2.19.1\n\n" } ]	{ "id": "openldap2-15919-0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch", "tier": "identical", "language": "c", "patch_lines_changed": 28, "patch_files_count": 1, "total_tokens_est": 1271, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nUse OpenSSL API to verify host\n\n## Package\nopenldap2\n\n## Files to modify\n- libraries/libldap/tls_o.c\n\n## Target Source Code\n\n### libraries/libldap/tls_o.c\n\n#### tlso_session_peer_dn() [lines 463-482]\n```c\n}\n\nstatic int\ntlso_session_peer_dn( tls_session sess, struct berval der_dn )\n{\n\ttlso_session s = (tlso_session )sess;\n\tX509 x = tlso_get_cert( s );\n\tX509_NAME xn;\n\n\tif ( !x )\n\t\treturn LDAP_INVALID_CREDENTIALS;\n\n\txn = X509_get_subject_name(x);\n\tder_dn->bv_len = i2d_X509_NAME( xn, NULL );\n\tder_dn->bv_val = xn->bytes->data;\n\tX509_free(x);\n\treturn 0;\n}\n\n/* what kind of hostname were we given? /\n```\n\n#### tlso_session_chkhost() [lines 485-671]\n```c\n#define\tIS_IP6\t2\n\nstatic int\ntlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n{\n\ttlso_session s = (tlso_session )sess;\n\tint i, ret = LDAP_LOCAL_ERROR;\n\tX509 x;\n\tconst char name;\n\tchar ptr;\n\tint ntype = IS_DNS, nlen;\n#ifdef LDAP_PF_INET6\n\tstruct in6_addr addr;\n#else\n\tstruct in_addr addr;\n#endif\n\n\tif( ldap_int_hostname &&\n\t\t( !name_in \|\| !strcasecmp( name_in, \"localhost\" ) ) )\n\t{\n\t\tname = ldap_int_hostname;\n\t} else {\n\t\tname = name_in;\n\t}\n\tnlen = strlen(name);\n\n\tx = tlso_get_cert(s);\n\tif (!x) {\n\t\tDebug( LDAP_DEBUG_ANY,\n\t\t\t\"TLS: unable to get peer certificate.\\n\",\n\t\t\t0, 0, 0 );\n\t\t/ If this was a fatal condition, things would have\n\t\t * aborted long before now.\n\t\t /\n\t\treturn LDAP_SUCCESS;\n\t}\n\n#ifdef LDAP_PF_INET6\n\tif (inet_pton(AF_INET6, name, &addr)) {\n\t\tntype = IS_IP6;\n/ ... 153 lines omitted ... /\n```\n\n\n## Upstream Fix\n```diff\nFrom f2978fefa13eb92b73922e49d2f6c12b4f92ea85 Mon Sep 17 00:00:00 2001\nFrom: Christian Heimes <christian@python.org>\nDate: Fri, 10 Jan 2020 18:35:02 +0100\nSubject: [PATCH] Use OpenSSL API to verify host\n\nReplace custom hostname and IP address verification with OpenSSL 1.0.2\nAPIs.\n---\n libraries/libldap/tls_o.c \| 184 ++++++--------------------------------\n 1 file changed, 28 insertions(+), 156 deletions(-)\n\ndiff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c\nindex e52c5507c..5adf7b74f 100644\n--- a/libraries/libldap/tls_o.c\n+++ b/libraries/libldap/tls_o.c\n@@ -660,25 +660,15 @@ tlso_session_peer_dn( tls_session sess, struct berval der_dn )\n \treturn 0;\n }\n \n-/ what kind of hostname were we given? /\n-#define\tIS_DNS\t0\n-#define\tIS_IP4\t1\n-#define\tIS_IP6\t2\n-\n static int\n tlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n {\n \ttlso_session s = (tlso_session )sess;\n-\tint i, ret = LDAP_LOCAL_ERROR;\n+\tint ret = LDAP_LOCAL_ERROR;\n \tX509 x;\n \tconst char name;\n-\tchar ptr;\n-\tint ntype = IS_DNS, nlen;\n-#ifdef LDAP_PF_INET6\n-\tstruct in6_addr addr;\n-#else\n-\tstruct in_addr addr;\n-#endif\n+\tint flags = X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;\n+\tASN1_OCTET_STRING ip;\n \n \tif( ldap_int_hostname &&\n \t\t( !name_in \|\| !strcasecmp( name_in, \"localhost\" ) ) )\n@@ -687,7 +677,6 @@ tlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n \t} else {\n \t\tname = name_in;\n \t}\n-\tnlen = strlen(name);\n \n \tx = tlso_get_cert(s);\n \tif (!x) {\n@@ -619,150 +619,32 @@ tlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n \t\treturn LDAP_SUCCESS;\n \t}\n \n-#ifdef LDAP_PF_INET6\n-\tif (inet_pton(AF_INET6, name, &addr)) {\n-\t\tntype = IS_IP6;\n-\t} else \n-#endif\n-\tif ((ptr = strrchr(name, '.')) && isdigit((unsigned char)ptr[1])) {\n-\t\tif (inet_aton(name, (struct in_addr )&addr)) ntype = IS_IP4;\n-\t}\n-\t\n-\ti = X509_get_ext_by_NID(x, NID_subject_alt_name, -1);\n-\tif (i >= 0) {\n-\t\tX509_EXTENSION ex;\n-\t\tSTACK_OF(GENERAL_NAME) alt;\n-\n-\t\tex = X509_get_ext(x, i);\n-\t\talt = X509V3_EXT_d2i(ex);\n-\t\tif (alt) {\n-\t\t\tint n, len2 = 0;\n-\t\t\tchar domain = NULL;\n-\t\t\tGENERAL_NAME gn;\n-\n-\t\t\tif (ntype == IS_DNS) {\n-\t\t\t\tdomain = strchr(name, '.');\n-\t\t\t\tif (domain) {\n-\t\t\t\t\tlen2 = nlen - (domain-name);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tn = sk_GENERAL_NAME_num(alt);\n-\t\t\tfor (i=0; i<n; i++) {\n-\t\t\t\tchar sn;\n-\t\t\t\tint sl;\n-\t\t\t\tgn = sk_GENERAL_NAME_value(alt, i);\n-\t\t\t\tif (gn->type == GEN_DNS) {\n-\t\t\t\t\tif (ntype != IS_DNS) continue;\n-\n-\t\t\t\t\tsn = (char ) ASN1_STRING_data(gn->d.ia5);\n-\t\t\t\t\tsl = ASN1_STRING_length(gn->d.ia5);\n-\n-\t\t\t\t\t/ ignore empty /\n-\t\t\t\t\tif (sl == 0) continue;\n-\n-\t\t\t\t\t/ Is this an exact match? /\n-\t\t\t\t\tif ((nlen == sl) && !strncasecmp(name, sn, nlen)) {\n-\t\t\t\t\t\tbreak;\n-\t\t\t\t\t}\n-\n-\t\t\t\t\t/ Is this a wildcard match? /\n-\t\t\t\t\tif (domain && (sn[0] == '') && (sn[1] == '.') &&\n-\t\t\t\t\t\t(len2 == sl-1) && !strncasecmp(domain, &sn[1], len2))\n-\t\t\t\t\t{\n-\t\t\t\t\t\tbreak;\n-\t\t\t\t\t}\n-\n-\t\t\t\t} else if (gn->type == GEN_IPADD) {\n-\t\t\t\t\tif (ntype == IS_DNS) continue;\n-\n-\t\t\t\t\tsn = (char ) ASN1_STRING_data(gn->d.ia5);\n-\t\t\t\t\tsl = ASN1_STRING_length(gn->d.ia5);\n-\n-#ifdef LDAP_PF_INET6\n-\t\t\t\t\tif (ntype == IS_IP6 && sl != sizeof(struct in6_addr)) {\n-\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t} else\n-#endif\n-\t\t\t\t\tif (ntype == IS_IP4 && sl != sizeof(struct in_addr)) {\n-\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t}\n-\t\t\t\t\tif (!memcmp(sn, &addr, sl)) {\n-\t\t\t\t\t\tbreak;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tGENERAL_NAMES_free(alt);\n-\t\t\tif (i < n) {\t/ Found a match /\n-\t\t\t\tret = LDAP_SUCCESS;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\tif (ret != LDAP_SUCCESS) {\n-\t\tX509_NAME xn;\n-\t\tX509_NAME_ENTRY ne;\n-\t\tASN1_OBJECT obj;\n-\t\tASN1_STRING cn = NULL;\n-\t\tint navas;\n-\n-\t\t/ find the last CN /\n-\t\tobj = OBJ_nid2obj( NID_commonName );\n-\t\tif ( !obj ) goto no_cn;\t/ should never happen /\n-\n-\t\txn = X509_get_subject_name(x);\n-\t\tnavas = X509_NAME_entry_count( xn );\n-\t\tfor ( i=navas-1; i>=0; i-- ) {\n-\t\t\tne = X509_NAME_get_entry( xn, i );\n-\t\t\tif ( !OBJ_cmp( X509_NAME_ENTRY_get_object(ne), obj )) {\n-\t\t\t\tcn = X509_NAME_ENTRY_get_data( ne );\n-\t\t\t\tbreak;\n-\t\t\t}\n+\t/ attempt to encode name as IP address /\n+\tip = a2i_IPADDRESS(name);\n+\tif (ip == NULL) {\n+\t\tERR_clear_error();\n+\t\t/ it's a hostname /\n+\t\tif (X509_check_host(x, name, strlen(name), flags, NULL) == 1) {\n+\t\t\tret = LDAP_SUCCESS;\n \t\t}\n-\n-\t\tif( !cn )\n-\t\t{\n-no_cn:\n-\t\t\tDebug( LDAP_DEBUG_ANY,\n-\t\t\t\t\"TLS: unable to get common name from peer certificate.\\n\",\n-\t\t\t\t0, 0, 0 );\n-\t\t\tret = LDAP_CONNECT_ERROR;\n-\t\t\tif ( ld->ld_error ) {\n-\t\t\t\tLDAP_FREE( ld->ld_error );\n-\t\t\t}\n-\t\t\tld->ld_error = LDAP_STRDUP(\n-\t\t\t\t_(\"TLS: unable to get CN from peer certificate\"));\n-\n-\t\t} else if ( cn->length == nlen &&\n-\t\t\tstrncasecmp( name, (char ) cn->data, nlen ) == 0 ) {\n+\t} else {\n+\t\t/* It's an IPv4 or IPv6 address /\n+\t\tif (X509_check_ip(x, ASN1_STRING_data(ip),\n+\t\t ASN1_STRING_length(ip), 0) == 1) {\n \t\t\tret = LDAP_SUCCESS;\n-\n-\t\t} else if (( cn->data[0] == '' ) && ( cn->data[1] == '.' )) {\n-\t\t\tchar domain = strchr(name, '.');\n-\t\t\tif( domain ) {\n-\t\t\t\tint dlen;\n-\n-\t\t\t\tdlen = nlen - (domain-name);\n-\n-\t\t\t\t/ Is this a wildcard match? /\n-\t\t\t\tif ((dlen == cn->length-1) &&\n-\t\t\t\t\t!strncasecmp(domain, (char ) &cn->data[1], dlen)) {\n-\t\t\t\t\tret = LDAP_SUCCESS;\n-\t\t\t\t}\n-\t\t\t}\n \t\t}\n+\t\tASN1_OCTET_STRING_free(ip);\n+\t}\n \n-\t\tif( ret == LDAP_LOCAL_ERROR ) {\n-\t\t\tDebug( LDAP_DEBUG_ANY, \"TLS: hostname (%s) does not match \"\n-\t\t\t\t\"common name in certificate (%.s).\\n\", \n-\t\t\t\tname, cn->length, cn->data );\n-\t\t\tret = LDAP_CONNECT_ERROR;\n-\t\t\tif ( ld->ld_error ) {\n-\t\t\t\tLDAP_FREE( ld->ld_error );\n-\t\t\t}\n-\t\t\tld->ld_error = LDAP_STRDUP(\n-\t\t\t\t_(\"TLS: hostname does not match CN in peer certificate\"));\n+\tif( ret == LDAP_LOCAL_ERROR ) {\n+\t\tDebug( LDAP_DEBUG_ANY, \"TLS: hostname (%s) does not match \"\n+\t\t\t\"peer certificate.\\n\", name, 0, 0);\n+\t\tret = LDAP_CONNECT_ERROR;\n+\t\tif ( ld->ld_error ) {\n+\t\t\tLDAP_FREE( ld->ld_error );\n \t\t}\n+\t\tld->ld_error = LDAP_STRDUP(\n+\t\t\t_(\"TLS: hostname does not match peer certificate\"));\n \t}\n \tX509_free(x);\n \treturn ret;\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From f2978fefa13eb92b73922e49d2f6c12b4f92ea85 Mon Sep 17 00:00:00 2001\nFrom: Christian Heimes <christian@python.org>\nDate: Fri, 10 Jan 2020 18:35:02 +0100\nSubject: [PATCH] Use OpenSSL API to verify host\n\nReplace custom hostname and IP address verification with OpenSSL 1.0.2\nAPIs.\n---\n libraries/libldap/tls_o.c \| 184 ++++++--------------------------------\n 1 file changed, 28 insertions(+), 156 deletions(-)\n\ndiff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c\nindex e52c5507c..5adf7b74f 100644\n--- a/libraries/libldap/tls_o.c\n+++ b/libraries/libldap/tls_o.c\n@@ -660,25 +660,15 @@ tlso_session_peer_dn( tls_session sess, struct berval der_dn )\n \treturn 0;\n }\n \n-/ what kind of hostname were we given? /\n-#define\tIS_DNS\t0\n-#define\tIS_IP4\t1\n-#define\tIS_IP6\t2\n-\n static int\n tlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n {\n \ttlso_session s = (tlso_session )sess;\n-\tint i, ret = LDAP_LOCAL_ERROR;\n+\tint ret = LDAP_LOCAL_ERROR;\n \tX509 x;\n \tconst char name;\n-\tchar ptr;\n-\tint ntype = IS_DNS, nlen;\n-#ifdef LDAP_PF_INET6\n-\tstruct in6_addr addr;\n-#else\n-\tstruct in_addr addr;\n-#endif\n+\tint flags = X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;\n+\tASN1_OCTET_STRING ip;\n \n \tif( ldap_int_hostname &&\n \t\t( !name_in \|\| !strcasecmp( name_in, \"localhost\" ) ) )\n@@ -687,7 +677,6 @@ tlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n \t} else {\n \t\tname = name_in;\n \t}\n-\tnlen = strlen(name);\n \n \tx = tlso_get_cert(s);\n \tif (!x) {\n@@ -619,150 +619,32 @@ tlso_session_chkhost( LDAP ld, tls_session sess, const char name_in )\n \t\treturn LDAP_SUCCESS;\n \t}\n \n-#ifdef LDAP_PF_INET6\n-\tif (inet_pton(AF_INET6, name, &addr)) {\n-\t\tntype = IS_IP6;\n-\t} else \n-#endif\n-\tif ((ptr = strrchr(name, '.')) && isdigit((unsigned char)ptr[1])) {\n-\t\tif (inet_aton(name, (struct in_addr )&addr)) ntype = IS_IP4;\n-\t}\n-\t\n-\ti = X509_get_ext_by_NID(x, NID_subject_alt_name, -1);\n-\tif (i >= 0) {\n-\t\tX509_EXTENSION ex;\n-\t\tSTACK_OF(GENERAL_NAME) alt;\n-\n-\t\tex = X509_get_ext(x, i);\n-\t\talt = X509V3_EXT_d2i(ex);\n-\t\tif (alt) {\n-\t\t\tint n, len2 = 0;\n-\t\t\tchar domain = NULL;\n-\t\t\tGENERAL_NAME gn;\n-\n-\t\t\tif (ntype == IS_DNS) {\n-\t\t\t\tdomain = strchr(name, '.');\n-\t\t\t\tif (domain) {\n-\t\t\t\t\tlen2 = nlen - (domain-name);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tn = sk_GENERAL_NAME_num(alt);\n-\t\t\tfor (i=0; i<n; i++) {\n-\t\t\t\tchar sn;\n-\t\t\t\tint sl;\n-\t\t\t\tgn = sk_GENERAL_NAME_value(alt, i);\n-\t\t\t\tif (gn->type == GEN_DNS) {\n-\t\t\t\t\tif (ntype != IS_DNS) continue;\n-\n-\t\t\t\t\tsn = (char ) ASN1_STRING_data(gn->d.ia5);\n-\t\t\t\t\tsl = ASN1_STRING_length(gn->d.ia5);\n-\n-\t\t\t\t\t/ ignore empty /\n-\t\t\t\t\tif (sl == 0) continue;\n-\n-\t\t\t\t\t/ Is this an exact match? /\n-\t\t\t\t\tif ((nlen == sl) && !strncasecmp(name, sn, nlen)) {\n-\t\t\t\t\t\tbreak;\n-\t\t\t\t\t}\n-\n-\t\t\t\t\t/ Is this a wildcard match? /\n-\t\t\t\t\tif (domain && (sn[0] == '') && (sn[1] == '.') &&\n-\t\t\t\t\t\t(len2 == sl-1) && !strncasecmp(domain, &sn[1], len2))\n-\t\t\t\t\t{\n-\t\t\t\t\t\tbreak;\n-\t\t\t\t\t}\n-\n-\t\t\t\t} else if (gn->type == GEN_IPADD) {\n-\t\t\t\t\tif (ntype == IS_DNS) continue;\n-\n-\t\t\t\t\tsn = (char ) ASN1_STRING_data(gn->d.ia5);\n-\t\t\t\t\tsl = ASN1_STRING_length(gn->d.ia5);\n-\n-#ifdef LDAP_PF_INET6\n-\t\t\t\t\tif (ntype == IS_IP6 && sl != sizeof(struct in6_addr)) {\n-\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t} else\n-#endif\n-\t\t\t\t\tif (ntype == IS_IP4 && sl != sizeof(struct in_addr)) {\n-\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t}\n-\t\t\t\t\tif (!memcmp(sn, &addr, sl)) {\n-\t\t\t\t\t\tbreak;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tGENERAL_NAMES_free(alt);\n-\t\t\tif (i < n) {\t/ Found a match /\n-\t\t\t\tret = LDAP_SUCCESS;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\tif (ret != LDAP_SUCCESS) {\n-\t\tX509_NAME xn;\n-\t\tX509_NAME_ENTRY ne;\n-\t\tASN1_OBJECT obj;\n-\t\tASN1_STRING cn = NULL;\n-\t\tint navas;\n-\n-\t\t/ find the last CN /\n-\t\tobj = OBJ_nid2obj( NID_commonName );\n-\t\tif ( !obj ) goto no_cn;\t/ should never happen /\n-\n-\t\txn = X509_get_subject_name(x);\n-\t\tnavas = X509_NAME_entry_count( xn );\n-\t\tfor ( i=navas-1; i>=0; i-- ) {\n-\t\t\tne = X509_NAME_get_entry( xn, i );\n-\t\t\tif ( !OBJ_cmp( X509_NAME_ENTRY_get_object(ne), obj )) {\n-\t\t\t\tcn = X509_NAME_ENTRY_get_data( ne );\n-\t\t\t\tbreak;\n-\t\t\t}\n+\t/ attempt to encode name as IP address /\n+\tip = a2i_IPADDRESS(name);\n+\tif (ip == NULL) {\n+\t\tERR_clear_error();\n+\t\t/ it's a hostname /\n+\t\tif (X509_check_host(x, name, strlen(name), flags, NULL) == 1) {\n+\t\t\tret = LDAP_SUCCESS;\n \t\t}\n-\n-\t\tif( !cn )\n-\t\t{\n-no_cn:\n-\t\t\tDebug( LDAP_DEBUG_ANY,\n-\t\t\t\t\"TLS: unable to get common name from peer certificate.\\n\",\n-\t\t\t\t0, 0, 0 );\n-\t\t\tret = LDAP_CONNECT_ERROR;\n-\t\t\tif ( ld->ld_error ) {\n-\t\t\t\tLDAP_FREE( ld->ld_error );\n-\t\t\t}\n-\t\t\tld->ld_error = LDAP_STRDUP(\n-\t\t\t\t_(\"TLS: unable to get CN from peer certificate\"));\n-\n-\t\t} else if ( cn->length == nlen &&\n-\t\t\tstrncasecmp( name, (char ) cn->data, nlen ) == 0 ) {\n+\t} else {\n+\t\t/* It's an IPv4 or IPv6 address /\n+\t\tif (X509_check_ip(x, ASN1_STRING_data(ip),\n+\t\t ASN1_STRING_length(ip), 0) == 1) {\n \t\t\tret = LDAP_SUCCESS;\n-\n-\t\t} else if (( cn->data[0] == '' ) && ( cn->data[1] == '.' )) {\n-\t\t\tchar domain = strchr(name, '.');\n-\t\t\tif( domain ) {\n-\t\t\t\tint dlen;\n-\n-\t\t\t\tdlen = nlen - (domain-name);\n-\n-\t\t\t\t/ Is this a wildcard match? /\n-\t\t\t\tif ((dlen == cn->length-1) &&\n-\t\t\t\t\t!strncasecmp(domain, (char ) &cn->data[1], dlen)) {\n-\t\t\t\t\tret = LDAP_SUCCESS;\n-\t\t\t\t}\n-\t\t\t}\n \t\t}\n+\t\tASN1_OCTET_STRING_free(ip);\n+\t}\n \n-\t\tif( ret == LDAP_LOCAL_ERROR ) {\n-\t\t\tDebug( LDAP_DEBUG_ANY, \"TLS: hostname (%s) does not match \"\n-\t\t\t\t\"common name in certificate (%.*s).\\n\", \n-\t\t\t\tname, cn->length, cn->data );\n-\t\t\tret = LDAP_CONNECT_ERROR;\n-\t\t\tif ( ld->ld_error ) {\n-\t\t\t\tLDAP_FREE( ld->ld_error );\n-\t\t\t}\n-\t\t\tld->ld_error = LDAP_STRDUP(\n-\t\t\t\t_(\"TLS: hostname does not match CN in peer certificate\"));\n+\tif( ret == LDAP_LOCAL_ERROR ) {\n+\t\tDebug( LDAP_DEBUG_ANY, \"TLS: hostname (%s) does not match \"\n+\t\t\t\"peer certificate.\\n\", name, 0, 0);\n+\t\tret = LDAP_CONNECT_ERROR;\n+\t\tif ( ld->ld_error ) {\n+\t\t\tLDAP_FREE( ld->ld_error );\n \t\t}\n+\t\tld->ld_error = LDAP_STRDUP(\n+\t\t\t_(\"TLS: hostname does not match peer certificate\"));\n \t}\n \tX509_free(x);\n \treturn ret;\n" } ]	{ "id": "openldap2-15919-0206-openldap-tlso-use-openssl-api-to-verify-host.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0206-openldap-tlso-use-openssl-api-to-verify-host.patch", "tier": "identical", "language": "c", "patch_lines_changed": 177, "patch_files_count": 1, "total_tokens_est": 3123, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#9406, #9407 remove saslauthz asserts\n\n## Package\nopenldap2\n\n## Files to modify\n- servers/slapd/saslauthz.c\n\n## Target Source Code\n\n### servers/slapd/saslauthz.c\n\n#### slap_parse_user() [lines 126-205]\n```c\n\t\treturn policy_txt[authz_policy];\n}\n\nint slap_parse_user( struct berval id, struct berval user,\n\t\tstruct berval realm, struct berval mech )\n{\n\tchar\tu;\n\t\n\tassert( id != NULL );\n\tassert( !BER_BVISNULL( id ) );\n\tassert( user != NULL );\n\tassert( realm != NULL );\n\tassert( mech != NULL );\n\n\tu = id->bv_val[ 0 ];\n\t\n\tif ( u != 'u' && u != 'U' ) {\n\t\t/* called with something other than u: /\n\t\treturn LDAP_PROTOCOL_ERROR;\n\t}\n\n\t/ uauthzid form:\n\t \t\tu[.mech[/realm]]:user\n\t /\n\t\n\tuser->bv_val = ber_bvchr( id, ':' );\n\tif ( BER_BVISNULL( user ) ) {\n\t\treturn LDAP_PROTOCOL_ERROR;\n\t}\n\tuser->bv_val[ 0 ] = '\\0';\n\tuser->bv_val++;\n\tuser->bv_len = id->bv_len - ( user->bv_val - id->bv_val );\n\n\tmech->bv_val = ber_bvchr( id, '.' );\n\tif ( !BER_BVISNULL( mech ) ) {\n\t\tmech->bv_val[ 0 ] = '\\0';\n\t\tmech->bv_val++;\n\t\tmech->bv_len = user->bv_val - mech->bv_val - 1;\n\n\t\trealm->bv_val = ber_bvchr( mech, '/' );\n\n\t\tif ( !BER_BVISNULL( realm ) ) {\n\t\t\trealm->bv_val[ 0 ] = '\\0';\n\t\t\trealm->bv_val++;\n\t\t\tmech->bv_len = realm->bv_val - mech->bv_val - 1;\n\t\t\trealm->bv_len = user->bv_val - realm->bv_val - 1;\n\t\t}\n\n\t} else {\n\t\tBER_BVZERO( realm );\n\t}\n\n\tif ( id->bv_val[ 1 ] != '\\0' ) {\n\t\treturn LDAP_PROTOCOL_ERROR;\n\t}\n\n\tif ( !BER_BVISNULL( mech ) ) {\n\t\tassert( mech->bv_val == id->bv_val + 2 );\n\n\t\tAC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 );\n\t\tmech->bv_val -= 2;\n\t}\n\n\tif ( !BER_BVISNULL( realm ) ) {\n\t\tassert( realm->bv_val >= id->bv_val + 2 );\n\n\t\tAC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 );\n\t\trealm->bv_val -= 2;\n\t}\n\n\t/* leave \"u:\" before user /\n\tuser->bv_val -= 2;\n\tuser->bv_len += 2;\n\tuser->bv_val[ 0 ] = u;\n\tuser->bv_val[ 1 ] = ':';\n\n\treturn LDAP_SUCCESS;\n}\n\nint\n```\n\n#### region() [lines 400-509]\n```c\n\t\t/ FIXME: the check is pedantic, but I think it's necessary,\n\t\t * because people tend to use things like ldaps:// which\n\t\t * gives the idea SSL is being used. Maybe we could\n\t\t * accept ldapi:// as well, but the point is that we use\n\t\t * an URL as an easy means to define bits of a search with\n\t\t * little parsing.\n\t\t /\n\t\tif ( strcasecmp( ludp->lud_scheme, \"ldap\" ) != 0 ) {\n\t\t\t/\n\t\t\t * must be ldap:///\n\t\t\t /\n\t\t\trc = LDAP_INVALID_SYNTAX;\n\t\t\tgoto done;\n\t\t}\n\t\tbreak;\n\n\tcase LDAP_URL_ERR_BADSCHEME:\n\t\t/\n\t\t * last chance: assume it's a(n exact) DN ...\n\t\t \n\t\t NOTE: must pass DN normalization\n\t\t /\n\t\tldap_free_urldesc( ludp );\n\t\tbv.bv_val = in->bv_val;\n\t\tscope = LDAP_X_SCOPE_EXACT;\n\t\tgoto is_dn;\n\n\tdefault:\n\t\trc = LDAP_INVALID_SYNTAX;\n\t\tgoto done;\n\t}\n\n\tif ( ( ludp->lud_host && ludp->lud_host )\n\t\t\|\| ludp->lud_attrs \|\| ludp->lud_exts )\n\t{\n\t\t/* host part must be empty /\n\t\t/ attrs and extensions parts must be empty /\n\t\trc = LDAP_INVALID_SYNTAX;\n\t\tgoto done;\n\t}\n\n\t/ Grab the filter /\n\tif ( ludp->lud_filter ) {\n\t\tFilter\tf = str2filter( ludp->lud_filter );\n\t\tif ( f == NULL ) {\n\t\t\trc = LDAP_INVALID_SYNTAX;\n\t\t\tgoto done;\n\t\t}\n\t\tfilter_free( f );\n\t}\n\n\t/* Grab the searchbase /\n\tassert( ludp->lud_dn != NULL );\n\tber_str2bv( ludp->lud_dn, 0, 0, &bv );\n\trc = dnValidate( NULL, &bv );\n\ndone:\n\tldap_free_urldesc( ludp );\n\treturn( rc );\n}\n\nstatic int\nauthzPrettyNormal(\n\tstruct berval\tval,\n\tstruct berval\tnormalized,\n\tvoid\t\tctx,\n\tint\t\tnormalize )\n{\n\tstruct berval\tbv;\n\tint\t\trc = LDAP_INVALID_SYNTAX;\n\tLDAPURLDesc\tludp = NULL;\n\tchar\t\tlud_dn = NULL,\n\t\t\tlud_filter = NULL;\n\tint\t\tscope = -1;\n\n\t/\n\t * 1) <DN>\n\t * 2) dn[.{exact\|children\|subtree\|onelevel}]:{\|<DN>}\n\t 3) dn.regex:<pattern>\n\t * 4) u[.mech[/realm]]:<ID>\n\t * 5) group[/<groupClass>[/<memberAttr>]]:<DN>\n\t * 6) <URL>\n\t /\n\n\tassert( val != NULL );\n\tassert( !BER_BVISNULL( val ) );\n\n\t/\n\t * 2) dn[.{exact\|children\|subtree\|onelevel}]:{\|<DN>}\n\t 3) dn.regex:<pattern>\n\t \n\t <DN> must pass DN normalization\n\t /\n\tif ( !strncasecmp( val->bv_val, \"dn\", STRLENOF( \"dn\" ) ) ) {\n\t\tstruct berval\tout = BER_BVNULL,\n\t\t\t\tprefix = BER_BVNULL;\n\t\tchar\t\tptr;\n\n\t\tbv.bv_val = val->bv_val + STRLENOF( \"dn\" );\n\n\t\tif ( bv.bv_val[ 0 ] == '.' ) {\n\t\t\tbv.bv_val++;\n\n\t\t\tif ( !strncasecmp( bv.bv_val, \"exact:\", STRLENOF( \"exact:\" ) ) ) {\n\t\t\t\tbv.bv_val += STRLENOF( \"exact:\" );\n\t\t\t\tscope = LDAP_X_SCOPE_EXACT;\n\n\t\t\t} else if ( !strncasecmp( bv.bv_val, \"regex:\", STRLENOF( \"regex:\" ) ) ) {\n\t\t\t\tbv.bv_val += STRLENOF( \"regex:\" );\n\t\t\t\tscope = LDAP_X_SCOPE_REGEX;\n```\n\n#### region() [lines 764-871]\n```c\n\n\t\tAC_MEMCPY( ludp->lud_scheme, \"ldap\", STRLENOF( \"ldap\" ) );\n\t\tbreak;\n\n\tcase LDAP_URL_ERR_BADSCHEME:\n\t\t/\n\t\t last chance: assume it's a(n exact) DN ...\n\t\t \n\t\t NOTE: must pass DN normalization\n\t\t /\n\t\tldap_free_urldesc( ludp );\n\t\tbv.bv_val = val->bv_val;\n\t\tscope = LDAP_X_SCOPE_EXACT;\n\t\tgoto is_dn;\n\n\tdefault:\n\t\trc = LDAP_INVALID_SYNTAX;\n\t\tgoto done;\n\t}\n\n\tif ( ( ludp->lud_host && ludp->lud_host )\n\t\t\|\| ludp->lud_attrs \|\| ludp->lud_exts )\n\t{\n\t\t/* host part must be empty /\n\t\t/ attrs and extensions parts must be empty /\n\t\trc = LDAP_INVALID_SYNTAX;\n\t\tgoto done;\n\t}\n\n\t/ Grab the filter /\n\tif ( ludp->lud_filter ) {\n\t\tstruct berval\tfilterstr;\n\t\tFilter\t\tf;\n\n\t\tlud_filter = ludp->lud_filter;\n\n\t\tf = str2filter( lud_filter );\n\t\tif ( f == NULL ) {\n\t\t\trc = LDAP_INVALID_SYNTAX;\n\t\t\tgoto done;\n\t\t}\n\t\tfilter2bv( f, &filterstr );\n\t\tfilter_free( f );\n\t\tif ( BER_BVISNULL( &filterstr ) ) {\n\t\t\trc = LDAP_INVALID_SYNTAX;\n\t\t\tgoto done;\n\t\t}\n\n\t\tludp->lud_filter = filterstr.bv_val;\n\t}\n\n\t/* Grab the searchbase /\n\tassert( ludp->lud_dn != NULL );\n\tif ( ludp->lud_dn ) {\n\t\tstruct berval\tout = BER_BVNULL;\n\n\t\tlud_dn = ludp->lud_dn;\n\n\t\tber_str2bv( lud_dn, 0, 0, &bv );\n\t\tif ( normalize ) {\n\t\t\trc = dnNormalize( 0, NULL, NULL, &bv, &out, ctx );\n\t\t} else {\n\t\t\trc = dnPretty( NULL, &bv, &out, ctx );\n\t\t}\n\n\t\tif ( rc != LDAP_SUCCESS ) {\n\t\t\tgoto done;\n\t\t}\n\n\t\tludp->lud_dn = out.bv_val;\n\t}\n\n\tludp->lud_port = 0;\n\tnormalized->bv_val = ldap_url_desc2str( ludp );\n\tif ( normalized->bv_val ) {\n\t\tnormalized->bv_len = strlen( normalized->bv_val );\n\n\t} else {\n\t\trc = LDAP_INVALID_SYNTAX;\n\t}\n\ndone:\n\tif ( lud_filter ) {\n\t\tif ( ludp->lud_filter != lud_filter ) {\n\t\t\tber_memfree( ludp->lud_filter );\n\t\t}\n\t\tludp->lud_filter = lud_filter;\n\t}\n\n\tif ( lud_dn ) {\n\t\tif ( ludp->lud_dn != lud_dn ) {\n\t\t\tber_memfree( ludp->lud_dn );\n\t\t}\n\t\tludp->lud_dn = lud_dn;\n\t}\n\n\tldap_free_urldesc( ludp );\n\n\treturn( rc );\n}\n\nint\nauthzNormalize(\n\tslap_mask_t\tusage,\n\tSyntax\t\tsyntax,\n\tMatchingRule\tmr,\n\tstruct berval\tval,\n\tstruct berval\tnormalized,\n```\n\n#### region() [lines 826-833]\n```c\n\t\t\trc = dnPretty( NULL, &bv, &out, ctx );\n\t\t}\n\n\t\tif ( rc != LDAP_SUCCESS ) {\n\t\t\tgoto done;\n\t\t}\n\n\t\tludp->lud_dn = out.bv_val;\n```\n\n\n## Upstream Fix\n```diff\nFrom f691c1bc5e7a3166a8c371974f8d920a99bae298 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Fri, 27 Nov 2020 14:37:10 +0000\nSubject: [PATCH 213/224] ITS#9406, #9407 remove saslauthz asserts\n\n---\n servers/slapd/saslauthz.c \| 19 +++++++++++++------\n 1 file changed, 13 insertions(+), 6 deletions(-)\n\ndiff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c\nindex 1245efc6c..bb99f5283 100644\n--- a/servers/slapd/saslauthz.c\n+++ b/servers/slapd/saslauthz.c\n@@ -180,14 +180,16 @@ int slap_parse_user( struct berval id, struct berval user,\n \t}\n \n \tif ( !BER_BVISNULL( mech ) ) {\n-\t\tassert( mech->bv_val == id->bv_val + 2 );\n+\t\tif ( mech->bv_val != id->bv_val + 2 )\n+\t\t\treturn LDAP_PROTOCOL_ERROR;\n \n \t\tAC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 );\n \t\tmech->bv_val -= 2;\n \t}\n \n \tif ( !BER_BVISNULL( realm ) ) {\n-\t\tassert( realm->bv_val >= id->bv_val + 2 );\n+\t\tif ( realm->bv_val < id->bv_val + 2 )\n+\t\t\treturn LDAP_PROTOCOL_ERROR;\n \n \t\tAC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 );\n \t\trealm->bv_val -= 2;\n@@ -449,9 +451,12 @@ is_dn:\t\tbv.bv_len = in->bv_len - ( bv.bv_val - in->bv_val );\n \t}\n \n \t/ Grab the searchbase /\n-\tassert( ludp->lud_dn != NULL );\n-\tber_str2bv( ludp->lud_dn, 0, 0, &bv );\n-\trc = dnValidate( NULL, &bv );\n+\tif ( ludp->lud_dn != NULL ) {\n+\t\tber_str2bv( ludp->lud_dn, 0, 0, &bv );\n+\t\trc = dnValidate( NULL, &bv );\n+\t} else {\n+\t\trc = LDAP_INVALID_SYNTAX;\n+\t}\n \n done:\n \tldap_free_urldesc( ludp );\n@@ -813,7 +818,6 @@ is_dn:\t\tbv.bv_len = val->bv_len - ( bv.bv_val - val->bv_val );\n \t}\n \n \t/ Grab the searchbase /\n-\tassert( ludp->lud_dn != NULL );\n \tif ( ludp->lud_dn ) {\n \t\tstruct berval\tout = BER_BVNULL;\n \n@@ -831,6 +835,9 @@ is_dn:\t\tbv.bv_len = val->bv_len - ( bv.bv_val - val->bv_val );\n \t\t}\n \n \t\tludp->lud_dn = out.bv_val;\n+\t} else {\n+\t\trc = LDAP_INVALID_SYNTAX;\n+\t\tgoto done;\n \t}\n \n \tludp->lud_port = 0;\n-- \n2.30.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From f691c1bc5e7a3166a8c371974f8d920a99bae298 Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Fri, 27 Nov 2020 14:37:10 +0000\nSubject: [PATCH 213/224] ITS#9406, #9407 remove saslauthz asserts\n\n---\n servers/slapd/saslauthz.c \| 19 +++++++++++++------\n 1 file changed, 13 insertions(+), 6 deletions(-)\n\ndiff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c\nindex 1245efc6c..bb99f5283 100644\n--- a/servers/slapd/saslauthz.c\n+++ b/servers/slapd/saslauthz.c\n@@ -180,14 +180,16 @@ int slap_parse_user( struct berval id, struct berval user,\n \t}\n \n \tif ( !BER_BVISNULL( mech ) ) {\n-\t\tassert( mech->bv_val == id->bv_val + 2 );\n+\t\tif ( mech->bv_val != id->bv_val + 2 )\n+\t\t\treturn LDAP_PROTOCOL_ERROR;\n \n \t\tAC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 );\n \t\tmech->bv_val -= 2;\n \t}\n \n \tif ( !BER_BVISNULL( realm ) ) {\n-\t\tassert( realm->bv_val >= id->bv_val + 2 );\n+\t\tif ( realm->bv_val < id->bv_val + 2 )\n+\t\t\treturn LDAP_PROTOCOL_ERROR;\n \n \t\tAC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 );\n \t\trealm->bv_val -= 2;\n@@ -449,9 +451,12 @@ is_dn:\t\tbv.bv_len = in->bv_len - ( bv.bv_val - in->bv_val );\n \t}\n \n \t/ Grab the searchbase /\n-\tassert( ludp->lud_dn != NULL );\n-\tber_str2bv( ludp->lud_dn, 0, 0, &bv );\n-\trc = dnValidate( NULL, &bv );\n+\tif ( ludp->lud_dn != NULL ) {\n+\t\tber_str2bv( ludp->lud_dn, 0, 0, &bv );\n+\t\trc = dnValidate( NULL, &bv );\n+\t} else {\n+\t\trc = LDAP_INVALID_SYNTAX;\n+\t}\n \n done:\n \tldap_free_urldesc( ludp );\n@@ -813,7 +818,6 @@ is_dn:\t\tbv.bv_len = val->bv_len - ( bv.bv_val - val->bv_val );\n \t}\n \n \t/ Grab the searchbase */\n-\tassert( ludp->lud_dn != NULL );\n \tif ( ludp->lud_dn ) {\n \t\tstruct berval\tout = BER_BVNULL;\n \n@@ -831,6 +835,9 @@ is_dn:\t\tbv.bv_len = val->bv_len - ( bv.bv_val - val->bv_val );\n \t\t}\n \n \t\tludp->lud_dn = out.bv_val;\n+\t} else {\n+\t\trc = LDAP_INVALID_SYNTAX;\n+\t\tgoto done;\n \t}\n \n \tludp->lud_port = 0;\n-- \n2.30.0\n\n" } ]	{ "id": "openldap2-15919-0213-ITS-9406-9407-remove-saslauthz-asserts.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0213-ITS-9406-9407-remove-saslauthz-asserts.patch", "tier": "identical", "language": "c", "patch_lines_changed": 20, "patch_files_count": 1, "total_tokens_est": 1119, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nFix incorrect calculation of consecutive number of characters\n\n## Package\nopenldap2\n\n## Files to modify\n- check_password.c\n- check_password_test.c\n\n## Upstream Fix\n```diff\nFrom b026c9236e6b11c158e69572a28eb0efb174234b Mon Sep 17 00:00:00 2001\nFrom: HouzuoGuo <guohouzuo@gmail.com>\nDate: Wed, 17 Feb 2016 16:10:05 +0100\nSubject: [PATCH] Fix incorrect calculation of consecutive number of characters\n in a class, when the input is shorter than 6 chars or consecutive chars\n appear at the beginning of input\n\n\ndiff --git a/check_password.c b/check_password.c\nindex 0d9f901..acf8eda 100644\n--- a/check_password.c\n+++ b/check_password.c\n@@ -355,18 +355,7 @@ check_password (char pPasswd, char ppErrStr, Entry pEntry)\n \tint min_quality = DEFAULT_QUALITY;\n \tint use_cracklib = DEFAULT_CRACKLIB;\n \n-\t/** bail out early as cracklib will reject passwords shorter\n-\t * than 6 characters\n-\t /\n-\n \tnLen = strlen (pPasswd);\n-\tif ( nLen < 6) {\n-\t\tmem_len = realloc_error_message(&szErrStr, mem_len,\n-\t\t\t\tstrlen(PASSWORD_TOO_SHORT_SZ) +\n-\t\t\t\tstrlen(pEntry->e_name.bv_val) + 1);\n-\t\tsprintf (szErrStr, PASSWORD_TOO_SHORT_SZ, pEntry->e_name.bv_val, nLen);\n-\t\tgoto fail;\n-\t}\n \n if (read_config_file() == -1) {\n syslog(LOG_ERR, \"Warning: Could not read values from config file %s. Using defaults.\", CONFIG_FILE);\n@@ -392,46 +381,38 @@ check_password (char pPasswd, char *ppErrStr, Entry pEntry)\n /\n \n if ( max_consecutive_per_class != 0 ) {\n- int consec_chars = 1;\n- char type[10] = \"unkown\";\n- char prev_type[10] = \"unknown\";\n+ char prev_type = '\\0';\n+ char this_type = ' ';\n+ i = 0;\n+ int consec_chars = 0;\n for ( i = 0; i < nLen; i++ ) {\n-\n if ( islower(pPasswd[i]) ) {\n- strncpy(type,\"lower\",10);\n+ this_type = 'l';\n }\n else if ( isupper(pPasswd[i]) ) {\n- strncpy(type,\"upper\",10);\n+ this_type = 'u';\n }\n else if ( isdigit(pPasswd[i]) ) {\n- strncpy(type,\"digit\",10);\n+ this_type = 'd';\n }\n else if ( ispunct(pPasswd[i]) ) {\n- strncpy(type,\"punct\",10);\n+ this_type = 'p';\n }\n else {\n- strncpy(type,\"unknown\",10);\n- }\n-\n- if ( consec_chars > max_consecutive_per_class ) {\n-\t\t\t\tmem_len = realloc_error_message(&szErrStr, mem_len,\n-\t\t\t\t\t\tstrlen(CONSEC_FAIL_SZ) +\n-\t\t\t\t\t\tstrlen(pEntry->e_name.bv_val));\n-\t\t\t\tsprintf (szErrStr, CONSEC_FAIL_SZ, pEntry->e_name.bv_val);\n-\t\t\t\tgoto fail;\n+ this_type = ' ';\n }\n-\n- if ( strncmp(type,prev_type,10) == 0 ) {\n- consec_chars++;\n+ if (this_type == prev_type) {\n+ ++consec_chars;\n+ } else if (i > 0) {\n+ consec_chars = 0;\n }\n- else {\n- if (strncmp(\"unknown\",prev_type,8) != 0) {\n- consec_chars = 1;\n- }\n- else {\n- consec_chars++;\n- }\n- strncpy(prev_type,type,10);\n+ prev_type = this_type;\n+ if ( consec_chars >= max_consecutive_per_class ) {\n+ mem_len = realloc_error_message(&szErrStr, mem_len,\n+ strlen(CONSEC_FAIL_SZ) +\n+ strlen(pEntry->e_name.bv_val));\n+ sprintf (szErrStr, CONSEC_FAIL_SZ, pEntry->e_name.bv_val);\n+ goto fail;\n }\n }\n }\ndiff --git a/check_password_test.c b/check_password_test.c\nindex 626d719..d33bd80 100644\n--- a/check_password_test.c\n+++ b/check_password_test.c\n@@ -90,7 +90,6 @@ void setconf(\n }\n \n int main(void) {\n-\n // Empty Config, equiv to:\n // 5,3,1,0,0,0,0\n setconf(-1,-1,-1,-1,-1,-1,-1);\n@@ -109,5 +108,16 @@ int main(void) {\n testpass(\"Test 2.1\", \"Simp1e\", 1);\n testpass(\"Test 2.2\", \"SimPle\", 1);\n testpass(\"Test 2.1\", \"Simp1e!\", 0);\n+\n+ setconf(1,0,0,0,0,0,0);\n+ testpass(\"a\", \"Ab1,\", 0);\n+ testpass(\"a\", \"AAb1,\", 1);\n+ testpass(\"a\", \"Abb1,\", 1);\n+\n+ setconf(3,0,0,0,0,0,0);\n+ testpass(\"a\", \"AAAbbb111,,,\", 0);\n+ testpass(\"a\", \"AAAAbbb111,,,,\", 1);\n+ testpass(\"a\", \"AAAbbbb111,,,\", 1);\n+\n return 0;\n }\n-- \n2.7.1\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From b026c9236e6b11c158e69572a28eb0efb174234b Mon Sep 17 00:00:00 2001\nFrom: HouzuoGuo <guohouzuo@gmail.com>\nDate: Wed, 17 Feb 2016 16:10:05 +0100\nSubject: [PATCH] Fix incorrect calculation of consecutive number of characters\n in a class, when the input is shorter than 6 chars or consecutive chars\n appear at the beginning of input\n\n\ndiff --git a/check_password.c b/check_password.c\nindex 0d9f901..acf8eda 100644\n--- a/check_password.c\n+++ b/check_password.c\n@@ -355,18 +355,7 @@ check_password (char pPasswd, char *ppErrStr, Entry pEntry)\n \tint min_quality = DEFAULT_QUALITY;\n \tint use_cracklib = DEFAULT_CRACKLIB;\n \n-\t/** bail out early as cracklib will reject passwords shorter\n-\t * than 6 characters\n-\t /\n-\n \tnLen = strlen (pPasswd);\n-\tif ( nLen < 6) {\n-\t\tmem_len = realloc_error_message(&szErrStr, mem_len,\n-\t\t\t\tstrlen(PASSWORD_TOO_SHORT_SZ) +\n-\t\t\t\tstrlen(pEntry->e_name.bv_val) + 1);\n-\t\tsprintf (szErrStr, PASSWORD_TOO_SHORT_SZ, pEntry->e_name.bv_val, nLen);\n-\t\tgoto fail;\n-\t}\n \n if (read_config_file() == -1) {\n syslog(LOG_ERR, \"Warning: Could not read values from config file %s. Using defaults.\", CONFIG_FILE);\n@@ -392,46 +381,38 @@ check_password (char pPasswd, char *ppErrStr, Entry pEntry)\n */\n \n if ( max_consecutive_per_class != 0 ) {\n- int consec_chars = 1;\n- char type[10] = \"unkown\";\n- char prev_type[10] = \"unknown\";\n+ char prev_type = '\\0';\n+ char this_type = ' ';\n+ i = 0;\n+ int consec_chars = 0;\n for ( i = 0; i < nLen; i++ ) {\n-\n if ( islower(pPasswd[i]) ) {\n- strncpy(type,\"lower\",10);\n+ this_type = 'l';\n }\n else if ( isupper(pPasswd[i]) ) {\n- strncpy(type,\"upper\",10);\n+ this_type = 'u';\n }\n else if ( isdigit(pPasswd[i]) ) {\n- strncpy(type,\"digit\",10);\n+ this_type = 'd';\n }\n else if ( ispunct(pPasswd[i]) ) {\n- strncpy(type,\"punct\",10);\n+ this_type = 'p';\n }\n else {\n- strncpy(type,\"unknown\",10);\n- }\n-\n- if ( consec_chars > max_consecutive_per_class ) {\n-\t\t\t\tmem_len = realloc_error_message(&szErrStr, mem_len,\n-\t\t\t\t\t\tstrlen(CONSEC_FAIL_SZ) +\n-\t\t\t\t\t\tstrlen(pEntry->e_name.bv_val));\n-\t\t\t\tsprintf (szErrStr, CONSEC_FAIL_SZ, pEntry->e_name.bv_val);\n-\t\t\t\tgoto fail;\n+ this_type = ' ';\n }\n-\n- if ( strncmp(type,prev_type,10) == 0 ) {\n- consec_chars++;\n+ if (this_type == prev_type) {\n+ ++consec_chars;\n+ } else if (i > 0) {\n+ consec_chars = 0;\n }\n- else {\n- if (strncmp(\"unknown\",prev_type,8) != 0) {\n- consec_chars = 1;\n- }\n- else {\n- consec_chars++;\n- }\n- strncpy(prev_type,type,10);\n+ prev_type = this_type;\n+ if ( consec_chars >= max_consecutive_per_class ) {\n+ mem_len = realloc_error_message(&szErrStr, mem_len,\n+ strlen(CONSEC_FAIL_SZ) +\n+ strlen(pEntry->e_name.bv_val));\n+ sprintf (szErrStr, CONSEC_FAIL_SZ, pEntry->e_name.bv_val);\n+ goto fail;\n }\n }\n }\ndiff --git a/check_password_test.c b/check_password_test.c\nindex 626d719..d33bd80 100644\n--- a/check_password_test.c\n+++ b/check_password_test.c\n@@ -90,7 +90,6 @@ void setconf(\n }\n \n int main(void) {\n-\n // Empty Config, equiv to:\n // 5,3,1,0,0,0,0\n setconf(-1,-1,-1,-1,-1,-1,-1);\n@@ -109,5 +108,16 @@ int main(void) {\n testpass(\"Test 2.1\", \"Simp1e\", 1);\n testpass(\"Test 2.2\", \"SimPle\", 1);\n testpass(\"Test 2.1\", \"Simp1e!\", 0);\n+\n+ setconf(1,0,0,0,0,0,0);\n+ testpass(\"a\", \"Ab1,\", 0);\n+ testpass(\"a\", \"AAb1,\", 1);\n+ testpass(\"a\", \"Abb1,\", 1);\n+\n+ setconf(3,0,0,0,0,0,0);\n+ testpass(\"a\", \"AAAbbb111,,,\", 0);\n+ testpass(\"a\", \"AAAAbbb111,,,,\", 1);\n+ testpass(\"a\", \"AAAbbbb111,,,\", 1);\n+\n return 0;\n }\n-- \n2.7.1\n\n" } ]	{ "id": "openldap2-15919-0200-Fix-incorrect-calculation-of-consecutive-number-of-c.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0200-Fix-incorrect-calculation-of-consecutive-number-of-c.patch", "tier": "identical", "language": "c", "patch_lines_changed": 72, "patch_files_count": 2, "total_tokens_est": 2055, "has_source_context": false, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nThe patch was written by Christian Kornacker on 2014-01-08 to fix an issue with unresponsive\n\n## Package\nopenldap2\n\n## Files to modify\n- libraries/libldap/util-int.c\n\n## Target Source Code\n\n### libraries/libldap/util-int.c\n\n#### region() [lines 682-792]\n```c\n\t\t}\n\t}\n\n\tif( src->h_addr_list != NULL ) {\n\t\tfor( p = src->h_addr_list; (p) != NULL; p++ ) {\n\t\t\tn_addr++;\n\t\t}\n\t\ttotal_addr_len = n_addr src->h_length;\n\t}\n\t\n\ttotal_len = (n_alias + n_addr + 2) * sizeof( char * ) +\n\t\ttotal_addr_len + total_alias_len + name_len;\n\t\n\tif (safe_realloc( buf, total_len )) {\t\t\t \n\t\ttp = (char *) buf;\n\t\ttbuf = buf + (n_alias + n_addr + 2) sizeof( char * );\n\t\tAC_MEMCPY( res, src, sizeof( struct hostent ) );\n\t\t/* first the name... /\n\t\tAC_MEMCPY( tbuf, src->h_name, name_len );\n\t\tres->h_name = tbuf; tbuf+=name_len;\n\t\t/ now the aliases /\n\t\tres->h_aliases = tp;\n\t\tif ( src->h_aliases != NULL ) {\n\t\t\ttbuf = cpy_aliases( &tp, tbuf, src->h_aliases );\n\t\t}\n\t\ttp++=NULL;\n\t\t/* finally the addresses /\n\t\tres->h_addr_list = tp;\n\t\tif ( src->h_addr_list != NULL ) {\n\t\t\ttbuf = cpy_addresses( &tp, tbuf, src->h_addr_list, src->h_length );\n\t\t}\n\t\ttp++=NULL;\n\t\treturn 0;\n\t}\n\treturn -1;\n}\n#endif\n\n#if defined( NEED_SAFE_REALLOC )\nstatic char safe_realloc( char buf, int len )\n{\n\tchar tmpbuf;\n\ttmpbuf = LDAP_REALLOC( buf, len );\n\tif (tmpbuf) {\n\t\tbuf=tmpbuf;\n\t} \n\treturn tmpbuf;\n}\n#endif\n\nchar * ldap_pvt_get_fqdn( char name )\n{\n\tchar fqdn, ha_buf;\n\tchar hostbuf[MAXHOSTNAMELEN+1];\n\tstruct hostent hp, he_buf;\n\tint rc, local_h_errno;\n\n\tif( name == NULL ) {\n\t\tif( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {\n\t\t\thostbuf[MAXHOSTNAMELEN] = '\\0';\n\t\t\tname = hostbuf;\n\t\t} else {\n\t\t\tname = \"localhost\";\n\t\t}\n\t}\n\n\trc = ldap_pvt_gethostbyname_a( name,\n\t\t&he_buf, &ha_buf, &hp, &local_h_errno );\n\n\tif( rc < 0 \|\| hp == NULL \|\| hp->h_name == NULL ) {\n\t\tfqdn = LDAP_STRDUP( name );\n\t} else {\n\t\tfqdn = LDAP_STRDUP( hp->h_name );\n\t}\n\n\tLDAP_FREE( ha_buf );\n\treturn fqdn;\n}\n\n#if ( defined( HAVE_GETADDRINFO ) \|\| defined( HAVE_GETNAMEINFO ) ) \\\n\t&& !defined( HAVE_GAI_STRERROR )\nchar ldap_pvt_gai_strerror (int code) {\n\tstatic struct {\n\t\tint code;\n\t\tconst char msg;\n\t} values[] = {\n#ifdef EAI_ADDRFAMILY\n\t\t{ EAI_ADDRFAMILY, N_(\"Address family for hostname not supported\") },\n#endif\n\t\t{ EAI_AGAIN, N_(\"Temporary failure in name resolution\") },\n\t\t{ EAI_BADFLAGS, N_(\"Bad value for ai_flags\") },\n\t\t{ EAI_FAIL, N_(\"Non-recoverable failure in name resolution\") },\n\t\t{ EAI_FAMILY, N_(\"ai_family not supported\") },\n\t\t{ EAI_MEMORY, N_(\"Memory allocation failure\") },\n#ifdef EAI_NODATA\n\t\t{ EAI_NODATA, N_(\"No address associated with hostname\") },\n#endif \n\t\t{ EAI_NONAME, N_(\"Name or service not known\") },\n\t\t{ EAI_SERVICE, N_(\"Servname not supported for ai_socktype\") },\n\t\t{ EAI_SOCKTYPE, N_(\"ai_socktype not supported\") },\n#ifdef EAI_SYSTEM\n\t\t{ EAI_SYSTEM, N_(\"System error\") },\n#endif\n\t\t{ 0, NULL }\n\t};\n\n\tint i;\n\n\tfor ( i = 0; values[i].msg != NULL; i++ ) {\n\t\tif ( values[i].code == code ) {\n\t\t\treturn (char ) _(values[i].msg);\n```\n\n#### ldap_pvt_get_fqdn() [lines 729-761]\n```c\n}\n#endif\n\nchar ldap_pvt_get_fqdn( char name )\n{\n\tchar fqdn, ha_buf;\n\tchar hostbuf[MAXHOSTNAMELEN+1];\n\tstruct hostent hp, he_buf;\n\tint rc, local_h_errno;\n\n\tif( name == NULL ) {\n\t\tif( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {\n\t\t\thostbuf[MAXHOSTNAMELEN] = '\\0';\n\t\t\tname = hostbuf;\n\t\t} else {\n\t\t\tname = \"localhost\";\n\t\t}\n\t}\n\n\trc = ldap_pvt_gethostbyname_a( name,\n\t\t&he_buf, &ha_buf, &hp, &local_h_errno );\n\n\tif( rc < 0 \|\| hp == NULL \|\| hp->h_name == NULL ) {\n\t\tfqdn = LDAP_STRDUP( name );\n\t} else {\n\t\tfqdn = LDAP_STRDUP( hp->h_name );\n\t}\n\n\tLDAP_FREE( ha_buf );\n\treturn fqdn;\n}\n\n#if ( defined( HAVE_GETADDRINFO ) \|\| defined( HAVE_GETNAMEINFO ) ) \\\n```\n\n\n## Upstream Fix\n```diff\nThe patch was written by Christian Kornacker on 2014-01-08 to fix an issue with unresponsive\nLDAP host lookups in IPv6 environment.\n\n---\n libraries/libldap/util-int.c \| 39 +++++++++++++++++++++++++++++++++++++--\n 1 file changed, 37 insertions(+), 2 deletions(-)\n\nIndex: openldap-2.4.41/libraries/libldap/util-int.c\n===================================================================\n--- openldap-2.4.41.orig/libraries/libldap/util-int.c\n+++ openldap-2.4.41/libraries/libldap/util-int.c\n@@ -731,10 +731,16 @@ static char safe_realloc( char buf, i\n \n char ldap_pvt_get_fqdn( char name )\n {\n-\tchar fqdn, ha_buf;\n+\tint rc;\n+\tchar fqdn;\n \tchar hostbuf[MAXHOSTNAMELEN+1];\n+#ifdef HAVE_GETADDRINFO\n+\tstruct addrinfo hints, res;\n+#else\n+\tchar ha_buf;\n \tstruct hostent hp, he_buf;\n-\tint rc, local_h_errno;\n+\tint local_h_errno;\n+#endif\n \n \tif( name == NULL ) {\n \t\tif( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {\n@@ -745,6 +751,33 @@ char ldap_pvt_get_fqdn( char name )\n \t\t}\n \t}\n \n+#ifdef HAVE_GETADDRINFO\n+\tmemset( &hints, '\\0', sizeof( hints ) );\n+\thints.ai_family = AF_UNSPEC;\n+\thints.ai_socktype = SOCK_STREAM;\n+\thints.ai_flags \|= AI_CANONNAME;\n+\n+\t/ most getaddrinfo(3) use non-threadsafe resolver libraries /\n+\tLDAP_MUTEX_LOCK(&ldap_int_resolv_mutex);\n+\n+\trc = getaddrinfo( name, NULL, &hints, &res );\n+\n+\tLDAP_MUTEX_UNLOCK(&ldap_int_resolv_mutex);\n+\n+\tif ( rc != 0 ) {\n+\t\tfqdn = LDAP_STRDUP( name );\n+\t} else {\n+\t\twhile ( res ) {\n+\t\t\tif ( res->ai_canonname ) {\n+\t\t\t\tfqdn = LDAP_STRDUP ( res->ai_canonname );\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tres = res->ai_next;\n+\t\t}\n+\t\tfreeaddrinfo( res );\n+\t}\n+#else\n+\n \trc = ldap_pvt_gethostbyname_a( name,\n \t\t&he_buf, &ha_buf, &hp, &local_h_errno );\n \n@@ -755,6 +788,8 @@ char ldap_pvt_get_fqdn( char name )\n \t}\n \n \tLDAP_FREE( ha_buf );\n+#endif\n+\n \treturn fqdn;\n }\n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "The patch was written by Christian Kornacker on 2014-01-08 to fix an issue with unresponsive\nLDAP host lookups in IPv6 environment.\n\n---\n libraries/libldap/util-int.c \| 39 +++++++++++++++++++++++++++++++++++++--\n 1 file changed, 37 insertions(+), 2 deletions(-)\n\nIndex: openldap-2.4.41/libraries/libldap/util-int.c\n===================================================================\n--- openldap-2.4.41.orig/libraries/libldap/util-int.c\n+++ openldap-2.4.41/libraries/libldap/util-int.c\n@@ -731,10 +731,16 @@ static char safe_realloc( char *buf, i\n \n char ldap_pvt_get_fqdn( char name )\n {\n-\tchar fqdn, ha_buf;\n+\tint rc;\n+\tchar fqdn;\n \tchar hostbuf[MAXHOSTNAMELEN+1];\n+#ifdef HAVE_GETADDRINFO\n+\tstruct addrinfo hints, res;\n+#else\n+\tchar ha_buf;\n \tstruct hostent hp, he_buf;\n-\tint rc, local_h_errno;\n+\tint local_h_errno;\n+#endif\n \n \tif( name == NULL ) {\n \t\tif( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {\n@@ -745,6 +751,33 @@ char ldap_pvt_get_fqdn( char name )\n \t\t}\n \t}\n \n+#ifdef HAVE_GETADDRINFO\n+\tmemset( &hints, '\\0', sizeof( hints ) );\n+\thints.ai_family = AF_UNSPEC;\n+\thints.ai_socktype = SOCK_STREAM;\n+\thints.ai_flags \|= AI_CANONNAME;\n+\n+\t/ most getaddrinfo(3) use non-threadsafe resolver libraries /\n+\tLDAP_MUTEX_LOCK(&ldap_int_resolv_mutex);\n+\n+\trc = getaddrinfo( name, NULL, &hints, &res );\n+\n+\tLDAP_MUTEX_UNLOCK(&ldap_int_resolv_mutex);\n+\n+\tif ( rc != 0 ) {\n+\t\tfqdn = LDAP_STRDUP( name );\n+\t} else {\n+\t\twhile ( res ) {\n+\t\t\tif ( res->ai_canonname ) {\n+\t\t\t\tfqdn = LDAP_STRDUP ( res->ai_canonname );\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tres = res->ai_next;\n+\t\t}\n+\t\tfreeaddrinfo( res );\n+\t}\n+#else\n+\n \trc = ldap_pvt_gethostbyname_a( name,\n \t\t&he_buf, &ha_buf, &hp, &local_h_errno );\n \n@@ -755,6 +788,8 @@ char ldap_pvt_get_fqdn( char *name )\n \t}\n \n \tLDAP_FREE( ha_buf );\n+#endif\n+\n \treturn fqdn;\n }\n \n" } ]	{ "id": "openldap2-15919-0009-Fix-ldap-host-lookup-ipv6.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0009-Fix-ldap-host-lookup-ipv6.patch", "tier": "identical", "language": "c", "patch_lines_changed": 39, "patch_files_count": 1, "total_tokens_est": 1087, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nITS#9400 back-ldap: fix retry binds\n\n## Package\nopenldap2\n\n## Files to modify\n- servers/slapd/back-ldap/bind.c\n- tests/data/regressions/its9400/its9400\n- tests/data/regressions/its9400/slapd-proxy-idassert.conf\n\n## Target Source Code\n\n### servers/slapd/back-ldap/bind.c\n\n#### ldap_back_is_proxy_authz() [lines 1407-1424]\n```c\n\tif ( LDAP_BACK_CONN_ISIDASSERT( lc ) ) {\n\t\tif ( BER_BVISEMPTY( &binddn ) && BER_BVISEMPTY( &bindcred ) ) {\n\t\t\t/* if we got here, it shouldn't return result /\n\t\t\trc = ldap_back_is_proxy_authz( op, rs,\n\t\t\t\tLDAP_BACK_DONTSEND, &binddn, &bindcred );\n\t\t\tif ( rc != 1 ) {\n\t\t\t\tDebug( LDAP_DEBUG_ANY, \"Error: ldap_back_is_proxy_authz \"\n\t\t\t\t\t\"returned %d, misconfigured URI?\\n\", rc, 0, 0 );\n\t\t\t\trs->sr_err = LDAP_OTHER;\n\t\t\t\trs->sr_text = \"misconfigured URI?\";\n\t\t\t\tLDAP_BACK_CONN_ISBOUND_CLEAR( lc );\n\t\t\t\tif ( sendok & LDAP_BACK_SENDERR ) {\n\t\t\t\t\tsend_ldap_result( op, rs );\n\t\t\t\t}\n\t\t\t\tgoto done;\n\t\t\t}\n\t\t}\n\t\trc = ldap_back_proxy_authz_bind( lc, op, rs, sendok, &binddn, &bindcred );\n```\n\n\n## Upstream Fix\n```diff\nFrom 76fea1fa8f4fe3b546596a6b63831cacb33c73aa Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Mon, 23 Nov 2020 05:14:30 +0000\nSubject: [PATCH] ITS#9400 back-ldap: fix retry binds\n\nRegression from fix for ITS#7403\n\nITS#9400 back-ldap: fix prev commit\n\nITS#9400 Added test case for back-ldap retry failure\n---\n servers/slapd/back-ldap/bind.c \| 2 +-\n tests/data/regressions/its9400/its9400 \| 161 ++++++++++++++++++\n .../its9400/slapd-proxy-idassert.conf \| 45 +++++\n 3 files changed, 207 insertions(+), 1 deletion(-)\n create mode 100755 tests/data/regressions/its9400/its9400\n create mode 100644 tests/data/regressions/its9400/slapd-proxy-idassert.conf\n\ndiff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c\nindex 621cd2c8c..e6a3db144 100644\n--- a/servers/slapd/back-ldap/bind.c\n+++ b/servers/slapd/back-ldap/bind.c\n@@ -2102,7 +2102,7 @@ ldap_back_is_proxy_authz( Operation op, SlapReply rs, ldap_back_send_t sendok,\n \t}\n \n \tif ( !( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE )) {\n-\t\tif ( op->o_tag == LDAP_REQ_BIND ) {\n+\t\tif ( op->o_tag == LDAP_REQ_BIND && ( sendok & LDAP_BACK_SENDERR )) {\n \t\t\tif ( !BER_BVISEMPTY( &ndn )) {\n \t\t\t\tdobind = 0;\n \t\t\t\tgoto done;\ndiff --git a/tests/data/regressions/its9400/its9400 b/tests/data/regressions/its9400/its9400\nnew file mode 100755\nindex 000000000..ae0c5258b\n--- /dev/null\n+++ b/tests/data/regressions/its9400/its9400\n@@ -0,0 +1,161 @@\n+#! /bin/sh\n+# $OpenLDAP$\n+## This work is part of OpenLDAP Software <http://www.openldap.org/>.\n+##\n+## Copyright 1998-2020 The OpenLDAP Foundation.\n+## All rights reserved.\n+##\n+## Redistribution and use in source and binary forms, with or without\n+## modification, are permitted only as authorized by the OpenLDAP\n+## Public License.\n+##\n+## A copy of this license is available in the file LICENSE in the\n+## top-level directory of the distribution or, alternatively, at\n+## <http://www.OpenLDAP.org/license.html>.\n+\n+echo \"running defines.sh\"\n+. $SRCDIR/scripts/defines.sh\n+\n+ITS=9400\n+ITSDIR=$DATADIR/regressions/its$ITS\n+\n+if test $BACKLDAP = \"ldapno\" ; then\n+\techo \"LDAP backend not available, test skipped\"\n+\texit 0\n+fi\n+\n+mkdir -p $TESTDIR $DBDIR1 $DBDIR2\n+cp -r $DATADIR/tls $TESTDIR\n+\n+echo \"This test checks that back-ldap does retry binds after the remote LDAP server\"\n+echo \"has abruptly disconnected the (idle) LDAP connection.\"\n+\n+#\n+# Start slapd that acts as a remote LDAP server that will be proxied\n+#\n+echo \"Running slapadd to build database for the remote slapd server...\"\n+. $CONFFILTER $BACKEND < $CONF > $CONF1\n+$SLAPADD -f $CONF1 -l $LDIFORDERED\n+\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"slapadd failed ($RC)!\"\n+ exit $RC\n+fi\n+\n+\n+echo \"Starting remote slapd server on TCP/IP port $PORT1...\"\n+$SLAPD -f $CONF1 -h \"$URI1\" -d $LVL > $LOG1 2>&1 &\n+SERVERPID=$!\n+if test $WAIT != 0 ; then\n+ echo SERVERPID $SERVERPID\n+ read foo\n+fi\n+\n+\n+#\n+# Start ldapd that will proxy for the remote server\n+#\n+echo \"Starting slapd proxy on TCP/IP port $PORT2...\"\n+. $CONFFILTER $BACKEND < $ITSDIR/slapd-proxy-idassert.conf > $CONF2\n+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &\n+PROXYPID=$!\n+if test $WAIT != 0 ; then\n+ echo PROXYPID $PROXYPID\n+ read foo\n+fi\n+KILLPIDS=\"$KILLPIDS $PROXYPID\"\n+\n+sleep 1\n+\n+\n+#\n+# Successful searches\n+#\n+\n+echo \"Using ldapsearch with bind that will be passed through to remote server...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" \\\n+ -D \"cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com\" \\\n+ -H $URI2 \\\n+ -w \"bjensen\" \\\n+ 'objectclass=' > $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+\n+echo \"Using ldapsearch with idassert-bind...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" -D \"cn=Manager,dc=local,dc=com\" -H $URI2 -w \"secret\" \\\n+ 'objectclass=' >> $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+\n+#\n+# Now kill the remote slapd that is being proxied for.\n+# This will invalidate the current TCP connections that proxy has to remote.\n+#\n+echo \"Killing remote server\"\n+kill $SERVERPID\n+sleep 1\n+\n+echo \"Re-starting remote slapd server on TCP/IP port $PORT1...\"\n+$SLAPD -f $CONF1 -h \"$URI1\" -d $LVL >> $LOG1 2>&1 &\n+SERVERPID=$!\n+if test $WAIT != 0 ; then\n+ echo SERVERPID $SERVERPID\n+ read foo\n+fi\n+KILLPIDS=\"$KILLPIDS $SERVERPID\"\n+\n+sleep 2\n+\n+\n+echo \"-------------------------------------------------\" >> $TESTOUT\n+echo \"Searches after remote slapd server has restarted:\" >> $TESTOUT\n+echo \"-------------------------------------------------\" >> $TESTOUT\n+\n+#\n+# Successful search\n+#\n+echo \"Using ldapsearch with bind that will be passed through to remote server...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" \\\n+ -D \"cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com\" \\\n+ -H $URI2 \\\n+ -w \"bjensen\" \\\n+ 'objectclass=' >> $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+#\n+# UNSUCCESFUL SEARCH\n+#\n+echo \"Using ldapsearch with idassert-bind...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" -D \"cn=Manager,dc=local,dc=com\" -H $URI2 -w \"secret\" \\\n+ 'objectclass=' >> $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+\n+test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+\n+echo \">>>>> Test succeeded\"\n+\n+test $KILLSERVERS != no && wait\n+\n+exit 0\ndiff --git a/tests/data/regressions/its9400/slapd-proxy-idassert.conf b/tests/data/regressions/its9400/slapd-proxy-idassert.conf\nnew file mode 100644\nindex 000000000..b1f3c6626\n--- /dev/null\n+++ b/tests/data/regressions/its9400/slapd-proxy-idassert.conf\n@@ -0,0 +1,45 @@\n+# provider slapd config -- for testing\n+# $OpenLDAP$\n+## This work is part of OpenLDAP Software <http://www.openldap.org/>.\n+##\n+## Copyright 1998-2020 The OpenLDAP Foundation.\n+## All rights reserved.\n+##\n+## Redistribution and use in source and binary forms, with or without\n+## modification, are permitted only as authorized by the OpenLDAP\n+## Public License.\n+##\n+## A copy of this license is available in the file LICENSE in the\n+## top-level directory of the distribution or, alternatively, at\n+## <http://www.OpenLDAP.org/license.html>.\n+\n+include\t\t@SCHEMADIR@/core.schema\n+include\t\t@SCHEMADIR@/cosine.schema\n+include\t\t@SCHEMADIR@/inetorgperson.schema\n+include\t\t@SCHEMADIR@/openldap.schema\n+include\t\t@SCHEMADIR@/nis.schema\n+pidfile\t\t@TESTDIR@/slapd.m.pid\n+argsfile\t@TESTDIR@/slapd.m.args\n+\n+#######################################################################\n+# database definitions\n+#######################################################################\n+\n+# here the proxy is not only acting as a proxy, but it also has a local database dc=local,dc=com\"\n+database\t@BACKEND@\n+suffix\t\t\"dc=local,dc=com\"\n+rootdn\t\t\"cn=Manager,dc=local,dc=com\"\n+rootpw\t\t\"secret\"\n+#~null~#directory\t@TESTDIR@/db.2.a\n+\n+# Configure proxy\n+# - normal user binds to \",dc=example,dc=com\" are proxied through to the remote slapd\n+# - admin bind to local \"cn=Manager,dc=local,dc=com\" is overwritten by using idassert-bind\n+database\tldap\n+uri\t\t\t\"@URI1@\"\n+suffix\t\t\"dc=example,dc=com\"\n+idassert-bind bindmethod=simple binddn=\"cn=Manager,dc=example,dc=com\" credentials=\"secret\"\n+idassert-authzFrom \"dn.exact:cn=Manager,dc=local,dc=com\"\n+rebind-as-user\tyes\n+\n+database\tmonitor\n-- \n2.24.3 (Apple Git-128)\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 76fea1fa8f4fe3b546596a6b63831cacb33c73aa Mon Sep 17 00:00:00 2001\nFrom: Howard Chu <hyc@openldap.org>\nDate: Mon, 23 Nov 2020 05:14:30 +0000\nSubject: [PATCH] ITS#9400 back-ldap: fix retry binds\n\nRegression from fix for ITS#7403\n\nITS#9400 back-ldap: fix prev commit\n\nITS#9400 Added test case for back-ldap retry failure\n---\n servers/slapd/back-ldap/bind.c \| 2 +-\n tests/data/regressions/its9400/its9400 \| 161 ++++++++++++++++++\n .../its9400/slapd-proxy-idassert.conf \| 45 +++++\n 3 files changed, 207 insertions(+), 1 deletion(-)\n create mode 100755 tests/data/regressions/its9400/its9400\n create mode 100644 tests/data/regressions/its9400/slapd-proxy-idassert.conf\n\ndiff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c\nindex 621cd2c8c..e6a3db144 100644\n--- a/servers/slapd/back-ldap/bind.c\n+++ b/servers/slapd/back-ldap/bind.c\n@@ -2102,7 +2102,7 @@ ldap_back_is_proxy_authz( Operation op, SlapReply rs, ldap_back_send_t sendok,\n \t}\n \n \tif ( !( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE )) {\n-\t\tif ( op->o_tag == LDAP_REQ_BIND ) {\n+\t\tif ( op->o_tag == LDAP_REQ_BIND && ( sendok & LDAP_BACK_SENDERR )) {\n \t\t\tif ( !BER_BVISEMPTY( &ndn )) {\n \t\t\t\tdobind = 0;\n \t\t\t\tgoto done;\ndiff --git a/tests/data/regressions/its9400/its9400 b/tests/data/regressions/its9400/its9400\nnew file mode 100755\nindex 000000000..ae0c5258b\n--- /dev/null\n+++ b/tests/data/regressions/its9400/its9400\n@@ -0,0 +1,161 @@\n+#! /bin/sh\n+# $OpenLDAP$\n+## This work is part of OpenLDAP Software <http://www.openldap.org/>.\n+##\n+## Copyright 1998-2020 The OpenLDAP Foundation.\n+## All rights reserved.\n+##\n+## Redistribution and use in source and binary forms, with or without\n+## modification, are permitted only as authorized by the OpenLDAP\n+## Public License.\n+##\n+## A copy of this license is available in the file LICENSE in the\n+## top-level directory of the distribution or, alternatively, at\n+## <http://www.OpenLDAP.org/license.html>.\n+\n+echo \"running defines.sh\"\n+. $SRCDIR/scripts/defines.sh\n+\n+ITS=9400\n+ITSDIR=$DATADIR/regressions/its$ITS\n+\n+if test $BACKLDAP = \"ldapno\" ; then\n+\techo \"LDAP backend not available, test skipped\"\n+\texit 0\n+fi\n+\n+mkdir -p $TESTDIR $DBDIR1 $DBDIR2\n+cp -r $DATADIR/tls $TESTDIR\n+\n+echo \"This test checks that back-ldap does retry binds after the remote LDAP server\"\n+echo \"has abruptly disconnected the (idle) LDAP connection.\"\n+\n+#\n+# Start slapd that acts as a remote LDAP server that will be proxied\n+#\n+echo \"Running slapadd to build database for the remote slapd server...\"\n+. $CONFFILTER $BACKEND < $CONF > $CONF1\n+$SLAPADD -f $CONF1 -l $LDIFORDERED\n+\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"slapadd failed ($RC)!\"\n+ exit $RC\n+fi\n+\n+\n+echo \"Starting remote slapd server on TCP/IP port $PORT1...\"\n+$SLAPD -f $CONF1 -h \"$URI1\" -d $LVL > $LOG1 2>&1 &\n+SERVERPID=$!\n+if test $WAIT != 0 ; then\n+ echo SERVERPID $SERVERPID\n+ read foo\n+fi\n+\n+\n+#\n+# Start ldapd that will proxy for the remote server\n+#\n+echo \"Starting slapd proxy on TCP/IP port $PORT2...\"\n+. $CONFFILTER $BACKEND < $ITSDIR/slapd-proxy-idassert.conf > $CONF2\n+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &\n+PROXYPID=$!\n+if test $WAIT != 0 ; then\n+ echo PROXYPID $PROXYPID\n+ read foo\n+fi\n+KILLPIDS=\"$KILLPIDS $PROXYPID\"\n+\n+sleep 1\n+\n+\n+#\n+# Successful searches\n+#\n+\n+echo \"Using ldapsearch with bind that will be passed through to remote server...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" \\\n+ -D \"cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com\" \\\n+ -H $URI2 \\\n+ -w \"bjensen\" \\\n+ 'objectclass=' > $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+\n+echo \"Using ldapsearch with idassert-bind...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" -D \"cn=Manager,dc=local,dc=com\" -H $URI2 -w \"secret\" \\\n+ 'objectclass=' >> $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+\n+#\n+# Now kill the remote slapd that is being proxied for.\n+# This will invalidate the current TCP connections that proxy has to remote.\n+#\n+echo \"Killing remote server\"\n+kill $SERVERPID\n+sleep 1\n+\n+echo \"Re-starting remote slapd server on TCP/IP port $PORT1...\"\n+$SLAPD -f $CONF1 -h \"$URI1\" -d $LVL >> $LOG1 2>&1 &\n+SERVERPID=$!\n+if test $WAIT != 0 ; then\n+ echo SERVERPID $SERVERPID\n+ read foo\n+fi\n+KILLPIDS=\"$KILLPIDS $SERVERPID\"\n+\n+sleep 2\n+\n+\n+echo \"-------------------------------------------------\" >> $TESTOUT\n+echo \"Searches after remote slapd server has restarted:\" >> $TESTOUT\n+echo \"-------------------------------------------------\" >> $TESTOUT\n+\n+#\n+# Successful search\n+#\n+echo \"Using ldapsearch with bind that will be passed through to remote server...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" \\\n+ -D \"cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com\" \\\n+ -H $URI2 \\\n+ -w \"bjensen\" \\\n+ 'objectclass=' >> $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+#\n+# UNSUCCESFUL SEARCH\n+#\n+echo \"Using ldapsearch with idassert-bind...\"\n+$LDAPSEARCH -S \"\" -b \"$BASEDN\" -D \"cn=Manager,dc=local,dc=com\" -H $URI2 -w \"secret\" \\\n+ 'objectclass=' >> $TESTOUT 2>&1\n+RC=$?\n+if test $RC != 0 ; then\n+ echo \"ldapsearch failed at proxy ($RC)!\"\n+ test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+ exit $RC\n+fi\n+\n+\n+test $KILLSERVERS != no && kill -HUP $KILLPIDS\n+\n+echo \">>>>> Test succeeded\"\n+\n+test $KILLSERVERS != no && wait\n+\n+exit 0\ndiff --git a/tests/data/regressions/its9400/slapd-proxy-idassert.conf b/tests/data/regressions/its9400/slapd-proxy-idassert.conf\nnew file mode 100644\nindex 000000000..b1f3c6626\n--- /dev/null\n+++ b/tests/data/regressions/its9400/slapd-proxy-idassert.conf\n@@ -0,0 +1,45 @@\n+# provider slapd config -- for testing\n+# $OpenLDAP$\n+## This work is part of OpenLDAP Software <http://www.openldap.org/>.\n+##\n+## Copyright 1998-2020 The OpenLDAP Foundation.\n+## All rights reserved.\n+##\n+## Redistribution and use in source and binary forms, with or without\n+## modification, are permitted only as authorized by the OpenLDAP\n+## Public License.\n+##\n+## A copy of this license is available in the file LICENSE in the\n+## top-level directory of the distribution or, alternatively, at\n+## <http://www.OpenLDAP.org/license.html>.\n+\n+include\t\t@SCHEMADIR@/core.schema\n+include\t\t@SCHEMADIR@/cosine.schema\n+include\t\t@SCHEMADIR@/inetorgperson.schema\n+include\t\t@SCHEMADIR@/openldap.schema\n+include\t\t@SCHEMADIR@/nis.schema\n+pidfile\t\t@TESTDIR@/slapd.m.pid\n+argsfile\t@TESTDIR@/slapd.m.args\n+\n+#######################################################################\n+# database definitions\n+#######################################################################\n+\n+# here the proxy is not only acting as a proxy, but it also has a local database dc=local,dc=com\"\n+database\t@BACKEND@\n+suffix\t\t\"dc=local,dc=com\"\n+rootdn\t\t\"cn=Manager,dc=local,dc=com\"\n+rootpw\t\t\"secret\"\n+#~null~#directory\t@TESTDIR@/db.2.a\n+\n+# Configure proxy\n+# - normal user binds to \"*,dc=example,dc=com\" are proxied through to the remote slapd\n+# - admin bind to local \"cn=Manager,dc=local,dc=com\" is overwritten by using idassert-bind\n+database\tldap\n+uri\t\t\t\"@URI1@\"\n+suffix\t\t\"dc=example,dc=com\"\n+idassert-bind bindmethod=simple binddn=\"cn=Manager,dc=example,dc=com\" credentials=\"secret\"\n+idassert-authzFrom \"dn.exact:cn=Manager,dc=local,dc=com\"\n+rebind-as-user\tyes\n+\n+database\tmonitor\n-- \n2.24.3 (Apple Git-128)\n\n" } ]	{ "id": "openldap2-15919-0208-ITS-9400-back-ldap-fix-retry-binds.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0208-ITS-9400-back-ldap-fix-retry-binds.patch", "tier": "identical", "language": "c", "patch_lines_changed": 209, "patch_files_count": 3, "total_tokens_est": 4063, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2021-27212, CVE-2020-36229, CVE-2020-36228, CVE-2020-36226, CVE-2020-36222, CVE-2020-36221, CVE-2020-36224, CVE-2020-36223, CVE-2020-36227, CVE-2020-36225, CVE-2020-36230\n\nindex 1ac4f7fdd..903155fa4 100644\n\n## Package\nopenldap2\n\n## Files to modify\n- doc/man/man5/slapd-sock.5\n- servers/slapd/back-sock/Makefile.in\n- servers/slapd/back-sock/config.c\n- servers/slapd/back-sock/extended.c\n- servers/slapd/back-sock/init.c\n- servers/slapd/back-sock/proto-sock.h\n\n## Target Source Code\n\n### doc/man/man5/slapd-sock.5\n\n#### region() [lines 1-107]\n```\n.TH SLAPD-SOCK 5 \"RELEASEDATE\" \"OpenLDAP LDVERSION\"\n.\\\" Copyright 2007-2015 The OpenLDAP Foundation All Rights Reserved.\n.\\\" Copying restrictions apply. See COPYRIGHT/LICENSE.\n.\\\" $OpenLDAP$\n.SH NAME\nslapd\\-sock \\- Socket backend/overlay to slapd\n.SH SYNOPSIS\nETCDIR/slapd.conf\n.SH DESCRIPTION\nThe Socket backend to\n.BR slapd (8)\nuses an external program to handle queries, similarly to\n.BR slapd\\-shell (5).\nHowever, in this case the external program listens on a Unix domain socket.\nThis makes it possible to have a pool of processes, which persist between\nrequests. This allows multithreaded operation and a higher level of\nefficiency. The external program must have been started independently;\n.BR slapd (8)\nitself will not start it.\n\nThis module may also be used as an overlay on top of some other database.\nUse as an overlay allows external actions to be triggered in response to\noperations on the main database.\n.SH CONFIGURATION\nThese\n.B slapd.conf\noptions apply to the SOCK backend database.\nThat is, they must follow a \"database sock\" line and come before any\nsubsequent \"backend\" or \"database\" lines.\nOther database options are described in the\n.BR slapd.conf (5)\nmanual page.\n\nAlternatively, to use this module as an overlay, these directives must\nfollow an \"overlay sock\" line within an existing database definition.\n.TP\n.B extensions [ binddn \| peername \| ssf \| connid ]\nEnables the sending of additional meta-attributes with each request.\n.nf\nbinddn: <bound DN>\npeername: IP=<address>:<port>\nssf: <SSF value>\nconnid: <connection ID>\n.fi\n.TP\n.B socketpath <pathname>\nGives the path to a Unix domain socket to which the commands will\nbe sent and from which replies are received.\n\nWhen used as an overlay, these additional directives are defined:\n.TP\n.B sockops\t[ bind \| unbind \| search \| compare \| modify \| modrdn \| add \| delete ]\nSpecify which request types to send to the external program. The default is\nempty (no requests are sent).\n.TP\n.B sockresps [ result \| search ]\nSpecify which response types to send to the external program. \"result\"\nsends ju\n/ ... truncated ... /\n```\n\n### servers/slapd/back-sock/Makefile.in\n\n#### region() [lines 1-48]\n```\n# Makefile.in for back-sock\n# $OpenLDAP$\n## This work is part of OpenLDAP Software <http://www.openldap.org/>.\n##\n## Copyright 2007-2015 The OpenLDAP Foundation.\n## All rights reserved.\n##\n## Redistribution and use in source and binary forms, with or without\n## modification, are permitted only as authorized by the OpenLDAP\n## Public License.\n##\n## A copy of this license is available in the file LICENSE in the\n## top-level directory of the distribution or, alternatively, at\n## <http://www.OpenLDAP.org/license.html>.\n##\n## ACKNOWLEDGEMENTS:\n## This work was initially developed by Brian Candler for inclusion\n## in OpenLDAP Software.\n\nSRCS\t= init.c config.c opensock.c search.c bind.c unbind.c add.c \\\n\t\tdelete.c modify.c modrdn.c compare.c result.c\nOBJS\t= init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \\\n\t\tdelete.lo modify.lo modrdn.lo compare.lo result.lo\n\nLDAP_INCDIR= ../../../include \nLDAP_LIBDIR= ../../../libraries\n\nBUILD_OPT = \"--enable-sock\"\nBUILD_MOD = @BUILD_SOCK@\n\nmod_DEFS = -DSLAPD_IMPORT\nMOD_DEFS = $(@BUILD_SOCK@_DEFS)\n\nshared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)\nNT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)\nUNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)\n\nLIBBASE = back_sock\n\nXINCPATH = -I.. -I$(srcdir)/..\nXDEFS = $(MODULES_CPPFLAGS)\n\nall-local-lib:\t../.backend\n\n../.backend: lib$(LIBBASE).a\n\t@touch $@\n\n\n```\n\n### servers/slapd/back-sock/config.c\n\n#### region() [lines 57-163]\n```c\n\t{ \"socketpath\", \"pathname\", 2, 2, 0, ARG_STRING\|ARG_OFFSET,\n\t\t(void )offsetof(struct sockinfo, si_sockpath),\n\t\t\"( OLcfgDbAt:7.1 NAME 'olcDbSocketPath' \"\n\t\t\t\"DESC 'Pathname for Unix domain socket' \"\n\t\t\t\"EQUALITY caseExactMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString SINGLE-VALUE )\", NULL, NULL },\n\t{ \"extensions\", \"ext\", 2, 0, 0, ARG_MAGIC\|BS_EXT,\n\t\tbs_cf_gen, \"( OLcfgDbAt:7.2 NAME 'olcDbSocketExtensions' \"\n\t\t\t\"DESC 'binddn, peername, or ssf' \"\n\t\t\t\"EQUALITY caseIgnoreMatch \"\n\t\t\t\"SYNTAX OMsDirectoryString )\", NULL, NULL },\n\t{ NULL, NULL }\n};\n\nstatic ConfigOCs bsocs[] = {\n\t{ \"( OLcfgDbOc:7.1 \"\n\t\t\"NAME 'olcDbSocketConfig' \"\n\t\t\"DESC 'Socket backend configuration' \"\n\t\t\"SUP olcDatabaseConfig \"\n\t\t\"MUST olcDbSocketPath \"\n\t\t\"MAY olcDbSocketExtensions )\",\n\t\t\tCft_Database, bscfg+NUM_OV_ATTRS },\n\t{ NULL, 0, NULL }\n};\n\nstatic ConfigOCs osocs[] = {\n\t{ \"( OLcfgDbOc:7.2 \"\n\t\t\"NAME 'olcOvSocketConfig' \"\n\t\t\"DESC 'Socket overlay configuration' \"\n\t\t\"SUP olcOverlayConfig \"\n\t\t\"MUST olcDbSocketPath \"\n\t\t\"MAY ( olcDbSocketExtensions $ \"\n\t\t\t\" olcOvSocketOps $ olcOvSocketResps ) )\",\n\t\t\tCft_Overlay, bscfg },\n\t{ NULL, 0, NULL }\n};\n\n#define SOCK_OP_BIND\t0x001\n#define SOCK_OP_UNBIND\t0x002\n#define SOCK_OP_SEARCH\t0x004\n#define SOCK_OP_COMPARE\t0x008\n#define SOCK_OP_MODIFY\t0x010\n#define SOCK_OP_MODRDN\t0x020\n#define SOCK_OP_ADD\t\t0x040\n#define SOCK_OP_DELETE\t0x080\n\n#define SOCK_REP_RESULT\t0x001\n#define SOCK_REP_SEARCH\t0x002\n\nstatic slap_verbmasks bs_exts[] = {\n\t{ BER_BVC(\"binddn\"), SOCK_EXT_BINDDN },\n\t{ BER_BVC(\"peername\"), SOCK_EXT_PEERNAME },\n\t{ BER_BVC(\"ssf\"), SOCK_EXT_SSF },\n\t{ BER_BVC(\"connid\"), SOCK_EXT_CONNID },\n\t{ BER_BVNULL, 0 }\n};\n\nstatic slap_verbmasks ov_ops[] = {\n\t{ BER_BVC(\"bind\"), SOCK_OP_BIND },\n\t{ BER_BVC(\"unbind\"), SOCK_OP_UNBIND },\n\t{ BER_BVC(\"search\"), SOCK_OP_SEARCH },\n\t{ BER_BVC(\"compare\"), SOCK_OP_COMPARE },\n\t{ BER_BVC(\"modify\"), SOCK_OP_MODIFY },\n\t{ BER_BVC(\"modrdn\"), SOCK_OP_MODRDN },\n\t{ BER_BVC(\"add\"), SOCK_OP_ADD },\n\t{ BER_BVC(\"delete\"), SOCK_OP_DELETE },\n\t{ BER_BVNULL, 0 }\n};\n\nstatic slap_verbmasks ov_resps[] = {\n\t{ BER_BVC(\"result\"), SOCK_REP_RESULT },\n\t{ BER_BVC(\"s\n/* ... truncated ... /\n```\n\n### servers/slapd/back-sock/extended.c\n\n#### region() [lines 1-51]\n```c\n/ $OpenLDAP$ /\n/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n \n Copyright 1999-2015 The OpenLDAP Foundation.\n * All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n * modification, are permitted only as authorized by the OpenLDAP\n * Public License.\n \n A copy of this license is available in the file LICENSE in the\n * top-level directory of the distribution or, alternatively, at\n * <http://www.OpenLDAP.org/license.html>.\n /\n\n/\n * LDAPv3 Extended Operation Request\n \tExtendedRequest ::= [APPLICATION 23] SEQUENCE {\n \t\trequestName\t [0] LDAPOID,\n \t\trequestValue\t [1] OCTET STRING OPTIONAL\n \t}\n \n LDAPv3 Extended Operation Response\n \tExtendedResponse ::= [APPLICATION 24] SEQUENCE {\n \t\tCOMPONENTS OF LDAPResult,\n \t\tresponseName\t [10] LDAPOID OPTIONAL,\n \t\tresponse\t [11] OCTET STRING OPTIONAL\n \t}\n \n /\n\n#include \"portable.h\"\n\n#include <stdio.h>\n\n#include <ac/socket.h>\n#include <ac/string.h>\n\n#include \"slap.h\"\n#include \"lber_pvt.h\"\n\nstatic struct extop_list {\n\tstruct extop_list next;\n\tstruct berval oid;\n\tslap_mask_t flags;\n\tSLAP_EXTOP_MAIN_FN ext_main;\n} supp_ext_list = NULL;\n\nstatic SLAP_EXTOP_MAIN_FN whoami_extop;\n\n/* This list of built-in extops is for extops that are not part\n```\n\n### servers/slapd/back-sock/init.c\n\n#### sock_back_initialize() [lines 28-66]\n```c\n#include \"back-sock.h\"\n\nint\nsock_back_initialize(\n BackendInfo\tbi\n)\n{\n\tbi->bi_open = 0;\n\tbi->bi_config = 0;\n\tbi->bi_close = 0;\n\tbi->bi_destroy = 0;\n\n\tbi->bi_db_init = sock_back_db_init;\n\tbi->bi_db_config = 0;\n\tbi->bi_db_open = 0;\n\tbi->bi_db_close = 0;\n\tbi->bi_db_destroy = sock_back_db_destroy;\n\n\tbi->bi_op_bind = sock_back_bind;\n\tbi->bi_op_unbind = sock_back_unbind;\n\tbi->bi_op_search = sock_back_search;\n\tbi->bi_op_compare = sock_back_compare;\n\tbi->bi_op_modify = sock_back_modify;\n\tbi->bi_op_modrdn = sock_back_modrdn;\n\tbi->bi_op_add = sock_back_add;\n\tbi->bi_op_delete = sock_back_delete;\n\tbi->bi_op_abandon = 0;\n\n\tbi->bi_extended = 0;\n\n\tbi->bi_chk_referrals = 0;\n\n\tbi->bi_connection_init = 0;\n\tbi->bi_connection_destroy = 0;\n\n\treturn sock_back_init_cf( bi );\n}\n\nint\n```\n\n### servers/slapd/back-sock/proto-sock.h\n\n#### region() [lines 1-48]\n```c\n/ $OpenLDAP$ /\n/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n \n Copyright 2007-2015 The OpenLDAP Foundation.\n * All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n * modification, are permitted only as authorized by the OpenLDAP\n * Public License.\n \n A copy of this license is available in the file LICENSE in the\n * top-level directory of the distribution or, alternatively, at\n * <http://www.OpenLDAP.org/license.html>.\n /\n/ ACKNOWLEDGEMENTS:\n * This work was initially developed by Brian Candler for inclusion\n * in OpenLDAP Software.\n /\n\n#ifndef _PROTO_SOCK_H\n#define _PROTO_SOCK_H\n\nLDAP_BEGIN_DECL\n\nextern BI_init\t\tsock_back_initialize;\n\nextern BI_open\t\tsock_back_open;\nextern BI_close\t\tsock_back_close;\nextern BI_destroy\tsock_back_destroy;\n\nextern BI_db_init\tsock_back_db_init;\nextern BI_db_destroy\tsock_back_db_destroy;\n\nextern BI_op_bind\tsock_back_bind;\nextern BI_op_unbind\tsock_back_unbind;\nextern BI_op_search\tsock_back_search;\nextern BI_op_compare\tsock_back_compare;\nextern BI_op_modify\tsock_back_modify;\nextern BI_op_modrdn\tsock_back_modrdn;\nextern BI_op_add\tsock_back_add;\nextern BI_op_delete\tsock_back_delete;\n\nextern int sock_back_init_cf( BackendInfo bi );\n\nLDAP_END_DECL\n\n#endif /* _PROTO_SOCK_H /\n\n```\n\n\n### Type definitions\n\n```c\n/ from back-sock.h /\nstruct sockinfo {\n\tconst char\tsi_sockpath;\n\tslap_mask_t\tsi_extensions;\n\tslap_mask_t\tsi_ops;\t\t/* overlay: operations to act on /\n\tslap_mask_t\tsi_resps;\t/ overlay: responses to forward /\n};\n\n/ from back-sock.h /\nstruct sockinfo {\n\tconst char\tsi_sockpath;\n\tslap_mask_t\tsi_extensions;\n\tslap_mask_t\tsi_ops;\t\t/* overlay: operations to act on /\n\tslap_mask_t\tsi_resps;\t/ overlay: responses to forward /\n};\n```\n\n\n## Upstream Fix\n```diff\ndiff --git a/doc/man/man5/slapd-sock.5 b/doc/man/man5/slapd-sock.5\nindex 1ac4f7fdd..903155fa4 100644\n--- a/doc/man/man5/slapd-sock.5\n+++ b/doc/man/man5/slapd-sock.5\n@@ -49,7 +49,7 @@ be sent and from which replies are received.\n \n When used as an overlay, these additional directives are defined:\n .TP\n-.B sockops\t[ bind \| unbind \| search \| compare \| modify \| modrdn \| add \| delete ]\n+.B sockops\t[ bind \| unbind \| search \| compare \| modify \| modrdn \| add \| delete \| extended ]\n Specify which request types to send to the external program. The default is\n empty (no requests are sent).\n .TP\n@@ -115,6 +115,17 @@ dn: <DN>\n .PP\n .RS\n .nf\n+EXTENDED\n+msgid: <message id>\n+<repeat { \"suffix:\" <database suffix DN> }>\n+oid: <OID>\n+value: <base64-value>\n+<blank line>\n+.fi\n+.RE\n+.PP\n+.RS\n+.nf\n MODIFY\n msgid: <message id>\n <repeat { \"suffix:\" <database suffix DN> }>\n@@ -213,6 +224,11 @@ msgid: <message id>\n .fi\n .RE\n \n+.SH KNOWN LIMITATIONS\n+The \n+.B sock \n+backend does not process extended operation results from an external program.\n+\n .SH ACCESS CONTROL\n The\n .B sock\n@@ -292,6 +308,11 @@ access to the\n pseudo_attribute of the searchBase;\n .B search (=s)\n access to the attributes and values used in the filter is not checked.\n+.LP\n+The\n+.B extended\n+operation does not require any access special rights.\n+The external program has to implement any sort of access control.\n \n .SH EXAMPLE\n There is an example script in the slapd/back\\-sock/ directory\ndiff --git a/servers/slapd/back-sock/Makefile.in b/servers/slapd/back-sock/Makefile.in\nindex 3e527e545..efb916246 100644\n--- a/servers/slapd/back-sock/Makefile.in\n+++ b/servers/slapd/back-sock/Makefile.in\n@@ -18,9 +18,9 @@\n ## in OpenLDAP Software.\n \n SRCS\t= init.c config.c opensock.c search.c bind.c unbind.c add.c \\\n-\t\tdelete.c modify.c modrdn.c compare.c result.c\n+\t\tdelete.c modify.c modrdn.c compare.c result.c extended.c\n OBJS\t= init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \\\n-\t\tdelete.lo modify.lo modrdn.lo compare.lo result.lo\n+\t\tdelete.lo modify.lo modrdn.lo compare.lo result.lo extended.lo\n \n LDAP_INCDIR= ../../../include \n LDAP_LIBDIR= ../../../libraries\ndiff --git a/servers/slapd/back-sock/config.c b/servers/slapd/back-sock/config.c\nindex dc3f1365c..2dcf68bf6 100644\n--- a/servers/slapd/back-sock/config.c\n+++ b/servers/slapd/back-sock/config.c\n@@ -106,6 +106,7 @@ static ConfigOCs osocs[] = {\n #define SOCK_OP_MODRDN\t0x020\n #define SOCK_OP_ADD\t\t0x040\n #define SOCK_OP_DELETE\t0x080\n+#define SOCK_OP_EXTENDED\t0x100\n \n #define SOCK_REP_RESULT\t0x001\n #define SOCK_REP_SEARCH\t0x002\n@@ -127,6 +128,7 @@ static slap_verbmasks ov_ops[] = {\n \t{ BER_BVC(\"modrdn\"), SOCK_OP_MODRDN },\n \t{ BER_BVC(\"add\"), SOCK_OP_ADD },\n \t{ BER_BVC(\"delete\"), SOCK_OP_DELETE },\n+\t{ BER_BVC(\"extended\"), SOCK_OP_EXTENDED },\n \t{ BER_BVNULL, 0 }\n };\n \n@@ -249,7 +251,9 @@ static BI_op_bind sockfuncs[] = {\n \tsock_back_modify,\n \tsock_back_modrdn,\n \tsock_back_add,\n-\tsock_back_delete\n+\tsock_back_delete,\n+\t0, /* abandon not supported /\n+\tsock_back_extended\n };\n \n static const int sockopflags[] = {\n@@ -260,7 +264,9 @@ static const int sockopflags[] = {\n \tSOCK_OP_MODIFY,\n \tSOCK_OP_MODRDN,\n \tSOCK_OP_ADD,\n-\tSOCK_OP_DELETE\n+\tSOCK_OP_DELETE,\n+\t0, / abandon not supported /\n+\tSOCK_OP_EXTENDED\n };\n \n static int sock_over_op(\n@@ -283,6 +289,7 @@ static int sock_over_op(\n \tcase LDAP_REQ_MODRDN:\twhich = op_modrdn; break;\n \tcase LDAP_REQ_ADD:\twhich = op_add; break;\n \tcase LDAP_REQ_DELETE:\twhich = op_delete; break;\n+\tcase LDAP_REQ_EXTENDED:\twhich = op_extended; break;\n \tdefault:\n \t\treturn SLAP_CB_CONTINUE;\n \t}\n@@ -365,6 +372,7 @@ sock_over_setup()\n \tsockover.on_bi.bi_op_modrdn = sock_over_op;\n \tsockover.on_bi.bi_op_add = sock_over_op;\n \tsockover.on_bi.bi_op_delete = sock_over_op;\n+\tsockover.on_bi.bi_extended = sock_over_op;\n \tsockover.on_response = sock_over_response;\n \n \tsockover.on_bi.bi_cf_ocs = osocs;\ndiff --git a/servers/slapd/back-sock/extended.c b/servers/slapd/back-sock/extended.c\nnew file mode 100644\nindex 000000000..dfe56b32b\n--- /dev/null\n+++ b/servers/slapd/back-sock/extended.c\n@@ -0,0 +1,80 @@\n+/ extended.c - sock backend extended routines /\n+/ $OpenLDAP$ /\n+/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n+ \n+ Copyright 2000-2017 The OpenLDAP Foundation.\n+ * All rights reserved.\n+ \n+ Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted only as authorized by the OpenLDAP\n+ * Public License.\n+ \n+ A copy of this license is available in the file LICENSE in the\n+ * top-level directory of the distribution or, alternatively, at\n+ * <http://www.OpenLDAP.org/license.html>.\n+ /\n+\n+#include \"portable.h\"\n+\n+#include <stdio.h>\n+#include <ac/string.h>\n+\n+#include \"slap.h\"\n+#include \"back-sock.h\"\n+\n+#include \"lutil.h\"\n+\n+int\n+sock_back_extended( Operation op, SlapReply rs )\n+{\n+\tint\t\t\trc;\n+\tstruct\tsockinfo\tsi = (struct sockinfo ) op->o_bd->be_private;\n+\tFILE\t\tfp;\n+\tstruct berval b64;\n+\n+\tDebug( LDAP_DEBUG_ARGS, \"==> sock_back_extended(%s)\\n\",\n+\t\top->ore_reqoid.bv_val, op->o_req_dn.bv_val, 0 );\n+\n+\tif ( (fp = opensock( si->si_sockpath )) == NULL ) {\n+\t\tsend_ldap_error( op, rs, LDAP_OTHER,\n+\t\t\t\"could not open socket\" );\n+\t\treturn( -1 );\n+\t}\n+\n+\t/* write out the request to the extended process /\n+\tfprintf( fp, \"EXTENDED\\n\" );\n+\tfprintf( fp, \"msgid: %ld\\n\", (long) op->o_msgid );\n+\tsock_print_conn( fp, op->o_conn, si );\n+\tsock_print_suffixes( fp, op->o_bd );\n+\tfprintf( fp, \"oid: %s\\n\", op->ore_reqoid.bv_val );\n+\n+ if (op->ore_reqdata) {\n+\n+\t\tb64.bv_len = LUTIL_BASE64_ENCODE_LEN( op->ore_reqdata->bv_len ) + 1;\n+\t\tb64.bv_val = ber_memalloc( b64.bv_len + 1 );\n+\n+\t\tif( b64.bv_val == NULL ) {\n+\t\t\treturn LUTIL_PASSWD_ERR;\n+\t\t}\n+\n+\t\trc = lutil_b64_ntop(\n+\t\t\t(unsigned char ) op->ore_reqdata->bv_val, op->ore_reqdata->bv_len,\n+\t\t\tb64.bv_val, b64.bv_len );\n+\n+\t\tb64.bv_len = rc;\n+\t\tassert( strlen(b64.bv_val) == b64.bv_len );\n+\n+\t\tfprintf( fp, \"value: %s\\n\", b64.bv_val );\n+\n+\t\tber_memfree( b64.bv_val );\n+\n+\t}\n+\n+\tfprintf( fp, \"\\n\" );\n+\n+\t/* read in the results and send them along /\n+\trc = sock_read_and_send_results( op, rs, fp );\n+\tfclose( fp );\n+\n+\treturn( rc );\n+}\ndiff --git a/servers/slapd/back-sock/init.c b/servers/slapd/back-sock/init.c\nindex dcfe61a44..92e68782f 100644\n--- a/servers/slapd/back-sock/init.c\n+++ b/servers/slapd/back-sock/init.c\n@@ -53,7 +53,7 @@ sock_back_initialize(\n \tbi->bi_op_delete = sock_back_delete;\n \tbi->bi_op_abandon = 0;\n \n-\tbi->bi_extended = 0;\n+\tbi->bi_extended = sock_back_extended;\n \n \tbi->bi_chk_referrals = 0;\n \ndiff --git a/servers/slapd/back-sock/proto-sock.h b/servers/slapd/back-sock/proto-sock.h\nindex fa02ab896..8b3b5f3ef 100644\n--- a/servers/slapd/back-sock/proto-sock.h\n+++ b/servers/slapd/back-sock/proto-sock.h\n@@ -40,6 +40,8 @@ extern BI_op_modrdn\tsock_back_modrdn;\n extern BI_op_add\tsock_back_add;\n extern BI_op_delete\tsock_back_delete;\n \n+extern BI_op_extended\tsock_back_extended;\n+\n extern int sock_back_init_cf( BackendInfo bi );\n \n LDAP_END_DECL\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff --git a/doc/man/man5/slapd-sock.5 b/doc/man/man5/slapd-sock.5\nindex 1ac4f7fdd..903155fa4 100644\n--- a/doc/man/man5/slapd-sock.5\n+++ b/doc/man/man5/slapd-sock.5\n@@ -49,7 +49,7 @@ be sent and from which replies are received.\n \n When used as an overlay, these additional directives are defined:\n .TP\n-.B sockops\t[ bind \| unbind \| search \| compare \| modify \| modrdn \| add \| delete ]\n+.B sockops\t[ bind \| unbind \| search \| compare \| modify \| modrdn \| add \| delete \| extended ]\n Specify which request types to send to the external program. The default is\n empty (no requests are sent).\n .TP\n@@ -115,6 +115,17 @@ dn: <DN>\n .PP\n .RS\n .nf\n+EXTENDED\n+msgid: <message id>\n+<repeat { \"suffix:\" <database suffix DN> }>\n+oid: <OID>\n+value: <base64-value>\n+<blank line>\n+.fi\n+.RE\n+.PP\n+.RS\n+.nf\n MODIFY\n msgid: <message id>\n <repeat { \"suffix:\" <database suffix DN> }>\n@@ -213,6 +224,11 @@ msgid: <message id>\n .fi\n .RE\n \n+.SH KNOWN LIMITATIONS\n+The \n+.B sock \n+backend does not process extended operation results from an external program.\n+\n .SH ACCESS CONTROL\n The\n .B sock\n@@ -292,6 +308,11 @@ access to the\n pseudo_attribute of the searchBase;\n .B search (=s)\n access to the attributes and values used in the filter is not checked.\n+.LP\n+The\n+.B extended\n+operation does not require any access special rights.\n+The external program has to implement any sort of access control.\n \n .SH EXAMPLE\n There is an example script in the slapd/back\\-sock/ directory\ndiff --git a/servers/slapd/back-sock/Makefile.in b/servers/slapd/back-sock/Makefile.in\nindex 3e527e545..efb916246 100644\n--- a/servers/slapd/back-sock/Makefile.in\n+++ b/servers/slapd/back-sock/Makefile.in\n@@ -18,9 +18,9 @@\n ## in OpenLDAP Software.\n \n SRCS\t= init.c config.c opensock.c search.c bind.c unbind.c add.c \\\n-\t\tdelete.c modify.c modrdn.c compare.c result.c\n+\t\tdelete.c modify.c modrdn.c compare.c result.c extended.c\n OBJS\t= init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \\\n-\t\tdelete.lo modify.lo modrdn.lo compare.lo result.lo\n+\t\tdelete.lo modify.lo modrdn.lo compare.lo result.lo extended.lo\n \n LDAP_INCDIR= ../../../include \n LDAP_LIBDIR= ../../../libraries\ndiff --git a/servers/slapd/back-sock/config.c b/servers/slapd/back-sock/config.c\nindex dc3f1365c..2dcf68bf6 100644\n--- a/servers/slapd/back-sock/config.c\n+++ b/servers/slapd/back-sock/config.c\n@@ -106,6 +106,7 @@ static ConfigOCs osocs[] = {\n #define SOCK_OP_MODRDN\t0x020\n #define SOCK_OP_ADD\t\t0x040\n #define SOCK_OP_DELETE\t0x080\n+#define SOCK_OP_EXTENDED\t0x100\n \n #define SOCK_REP_RESULT\t0x001\n #define SOCK_REP_SEARCH\t0x002\n@@ -127,6 +128,7 @@ static slap_verbmasks ov_ops[] = {\n \t{ BER_BVC(\"modrdn\"), SOCK_OP_MODRDN },\n \t{ BER_BVC(\"add\"), SOCK_OP_ADD },\n \t{ BER_BVC(\"delete\"), SOCK_OP_DELETE },\n+\t{ BER_BVC(\"extended\"), SOCK_OP_EXTENDED },\n \t{ BER_BVNULL, 0 }\n };\n \n@@ -249,7 +251,9 @@ static BI_op_bind sockfuncs[] = {\n \tsock_back_modify,\n \tsock_back_modrdn,\n \tsock_back_add,\n-\tsock_back_delete\n+\tsock_back_delete,\n+\t0, / abandon not supported /\n+\tsock_back_extended\n };\n \n static const int sockopflags[] = {\n@@ -260,7 +264,9 @@ static const int sockopflags[] = {\n \tSOCK_OP_MODIFY,\n \tSOCK_OP_MODRDN,\n \tSOCK_OP_ADD,\n-\tSOCK_OP_DELETE\n+\tSOCK_OP_DELETE,\n+\t0, / abandon not supported /\n+\tSOCK_OP_EXTENDED\n };\n \n static int sock_over_op(\n@@ -283,6 +289,7 @@ static int sock_over_op(\n \tcase LDAP_REQ_MODRDN:\twhich = op_modrdn; break;\n \tcase LDAP_REQ_ADD:\twhich = op_add; break;\n \tcase LDAP_REQ_DELETE:\twhich = op_delete; break;\n+\tcase LDAP_REQ_EXTENDED:\twhich = op_extended; break;\n \tdefault:\n \t\treturn SLAP_CB_CONTINUE;\n \t}\n@@ -365,6 +372,7 @@ sock_over_setup()\n \tsockover.on_bi.bi_op_modrdn = sock_over_op;\n \tsockover.on_bi.bi_op_add = sock_over_op;\n \tsockover.on_bi.bi_op_delete = sock_over_op;\n+\tsockover.on_bi.bi_extended = sock_over_op;\n \tsockover.on_response = sock_over_response;\n \n \tsockover.on_bi.bi_cf_ocs = osocs;\ndiff --git a/servers/slapd/back-sock/extended.c b/servers/slapd/back-sock/extended.c\nnew file mode 100644\nindex 000000000..dfe56b32b\n--- /dev/null\n+++ b/servers/slapd/back-sock/extended.c\n@@ -0,0 +1,80 @@\n+/ extended.c - sock backend extended routines /\n+/ $OpenLDAP$ /\n+/ This work is part of OpenLDAP Software <http://www.openldap.org/>.\n+ \n+ Copyright 2000-2017 The OpenLDAP Foundation.\n+ * All rights reserved.\n+ \n+ Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted only as authorized by the OpenLDAP\n+ * Public License.\n+ \n+ A copy of this license is available in the file LICENSE in the\n+ * top-level directory of the distribution or, alternatively, at\n+ * <http://www.OpenLDAP.org/license.html>.\n+ /\n+\n+#include \"portable.h\"\n+\n+#include <stdio.h>\n+#include <ac/string.h>\n+\n+#include \"slap.h\"\n+#include \"back-sock.h\"\n+\n+#include \"lutil.h\"\n+\n+int\n+sock_back_extended( Operation op, SlapReply rs )\n+{\n+\tint\t\t\trc;\n+\tstruct\tsockinfo\tsi = (struct sockinfo ) op->o_bd->be_private;\n+\tFILE\t\tfp;\n+\tstruct berval b64;\n+\n+\tDebug( LDAP_DEBUG_ARGS, \"==> sock_back_extended(%s)\\n\",\n+\t\top->ore_reqoid.bv_val, op->o_req_dn.bv_val, 0 );\n+\n+\tif ( (fp = opensock( si->si_sockpath )) == NULL ) {\n+\t\tsend_ldap_error( op, rs, LDAP_OTHER,\n+\t\t\t\"could not open socket\" );\n+\t\treturn( -1 );\n+\t}\n+\n+\t/* write out the request to the extended process /\n+\tfprintf( fp, \"EXTENDED\\n\" );\n+\tfprintf( fp, \"msgid: %ld\\n\", (long) op->o_msgid );\n+\tsock_print_conn( fp, op->o_conn, si );\n+\tsock_print_suffixes( fp, op->o_bd );\n+\tfprintf( fp, \"oid: %s\\n\", op->ore_reqoid.bv_val );\n+\n+ if (op->ore_reqdata) {\n+\n+\t\tb64.bv_len = LUTIL_BASE64_ENCODE_LEN( op->ore_reqdata->bv_len ) + 1;\n+\t\tb64.bv_val = ber_memalloc( b64.bv_len + 1 );\n+\n+\t\tif( b64.bv_val == NULL ) {\n+\t\t\treturn LUTIL_PASSWD_ERR;\n+\t\t}\n+\n+\t\trc = lutil_b64_ntop(\n+\t\t\t(unsigned char ) op->ore_reqdata->bv_val, op->ore_reqdata->bv_len,\n+\t\t\tb64.bv_val, b64.bv_len );\n+\n+\t\tb64.bv_len = rc;\n+\t\tassert( strlen(b64.bv_val) == b64.bv_len );\n+\n+\t\tfprintf( fp, \"value: %s\\n\", b64.bv_val );\n+\n+\t\tber_memfree( b64.bv_val );\n+\n+\t}\n+\n+\tfprintf( fp, \"\\n\" );\n+\n+\t/* read in the results and send them along /\n+\trc = sock_read_and_send_results( op, rs, fp );\n+\tfclose( fp );\n+\n+\treturn( rc );\n+}\ndiff --git a/servers/slapd/back-sock/init.c b/servers/slapd/back-sock/init.c\nindex dcfe61a44..92e68782f 100644\n--- a/servers/slapd/back-sock/init.c\n+++ b/servers/slapd/back-sock/init.c\n@@ -53,7 +53,7 @@ sock_back_initialize(\n \tbi->bi_op_delete = sock_back_delete;\n \tbi->bi_op_abandon = 0;\n \n-\tbi->bi_extended = 0;\n+\tbi->bi_extended = sock_back_extended;\n \n \tbi->bi_chk_referrals = 0;\n \ndiff --git a/servers/slapd/back-sock/proto-sock.h b/servers/slapd/back-sock/proto-sock.h\nindex fa02ab896..8b3b5f3ef 100644\n--- a/servers/slapd/back-sock/proto-sock.h\n+++ b/servers/slapd/back-sock/proto-sock.h\n@@ -40,6 +40,8 @@ extern BI_op_modrdn\tsock_back_modrdn;\n extern BI_op_add\tsock_back_add;\n extern BI_op_delete\tsock_back_delete;\n \n+extern BI_op_extended\tsock_back_extended;\n+\n extern int sock_back_init_cf( BackendInfo bi );\n \n LDAP_END_DECL\n" } ]	{ "id": "openldap2-15919-0014-ITS-8714-Send-out-EXTENDED-operation-message-from-back-sock.patch", "cves": [ "CVE-2020-36221", "CVE-2020-36222", "CVE-2020-36223", "CVE-2020-36224", "CVE-2020-36225", "CVE-2020-36226", "CVE-2020-36227", "CVE-2020-36228", "CVE-2020-36229", "CVE-2020-36230", "CVE-2021-27212" ], "package": "openldap2", "incident_id": 15919, "patch_name": "0014-ITS-8714-Send-out-EXTENDED-operation-message-from-back-sock.patch", "tier": "identical", "language": "c", "patch_lines_changed": 123, "patch_files_count": 6, "total_tokens_est": 3722, "has_source_context": true, "upstream_enriched": false, "suse_license": "OpenLDAP", "upstream_license": null, "cve_id": "CVE-2021-27212", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2011-4362\n\nInteger signedness error in the base64_decode function in the HTTP authentication functionality (http_auth.c) in lighttpd 1.4 before 1.4.30 and 1.5 before SVN revision 2806 allows remote attackers to cause a denial of service (segmentation fault) via crafted base64 input that triggers an out-of-bounds read with a negative index.\n\n## Package\nlighttpd\n\n## Files to modify\n- src/server.c\n- src/fdevent_libev.c\n- src/network.c\n- src/fdevent.h\n- src/fdevent_solaris_devpoll.c\n\n## Target Source Code\n\n### src/network.c\n\n#### region() [lines 1-82]\n```c\n#include \"network.h\"\n#include \"fdevent.h\"\n#include \"log.h\"\n#include \"connections.h\"\n#include \"plugin.h\"\n#include \"joblist.h\"\n#include \"configfile.h\"\n\n#include \"network_backends.h\"\n#include \"sys-mmap.h\"\n#include \"sys-socket.h\"\n\n#include <sys/types.h>\n#include <sys/stat.h>\n#include <sys/time.h>\n\n#include <errno.h>\n#include <fcntl.h>\n#include <unistd.h>\n#include <string.h>\n#include <stdlib.h>\n#include <assert.h>\n\n#ifdef USE_OPENSSL\n# include <openssl/ssl.h>\n# include <openssl/err.h>\n# include <openssl/rand.h>\n# include <openssl/dh.h>\n# include <openssl/bn.h>\n\n# if OPENSSL_VERSION_NUMBER >= 0x0090800fL\n# ifndef OPENSSL_NO_ECDH\n# include <openssl/ecdh.h>\n# endif\n# endif\n#endif\n\n#ifdef USE_OPENSSL\nstatic void ssl_info_callback(const SSL ssl, int where, int ret) {\n\tUNUSED(ret);\n\n\tif (0 != (where & SSL_CB_HANDSHAKE_START)) {\n\t\tconnection con = SSL_get_app_data(ssl);\n\t\t++con->renegotiations;\n\t} else if (0 != (where & SSL_CB_HANDSHAKE_DONE)) {\n\t\tssl->s3->flags \|= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;\n\t}\n}\n#endif\n\nstatic handler_t network_server_handle_fdevent(server srv, void context, int revents) {\n\tserver_socket srv_socket = (server_socket )context;\n\tconnection con;\n\tint loops = 0;\n\n\tUNUSED(context);\n\n\tif (0 == (revents & FDEVENT_IN)) {\n\t\tlog_error_write(srv, __FILE__, __LINE__, \"sdd\",\n\t\t\t\t\"strange event for server socket\",\n\t\t\t\tsrv_socket->fd,\n\t\t\t\trevents)\n/ ... truncated ... /\n```\n\n### src/server.c\n\n#### show_features() [lines 366-514]\n```c\n\twrite(STDOUT_FILENO, b, strlen(b));\n}\n\nstatic void show_features (void) {\n const char features[] = \"\"\n#ifdef USE_SELECT\n \"\\t+ select (generic)\\n\"\n#else\n \"\\t- select (generic)\\n\"\n#endif\n#ifdef USE_POLL\n \"\\t+ poll (Unix)\\n\"\n#else\n \"\\t- poll (Unix)\\n\"\n#endif\n#ifdef USE_LINUX_SIGIO\n \"\\t+ rt-signals (Linux 2.4+)\\n\"\n#else\n \"\\t- rt-signals (Linux 2.4+)\\n\"\n#endif\n#ifdef USE_LINUX_EPOLL\n \"\\t+ epoll (Linux 2.6)\\n\"\n#else\n \"\\t- epoll (Linux 2.6)\\n\"\n#endif\n#ifdef USE_SOLARIS_DEVPOLL\n \"\\t+ /dev/poll (Solaris)\\n\"\n#else\n \"\\t- /dev/poll (Solaris)\\n\"\n#endif\n#ifdef USE_SOLARIS_PORT\n \"\\t+ eventports (Solaris)\\n\"\n#else\n \"\\t- eventports (Solaris)\\n\"\n#endif\n#ifdef USE_FREEBSD_KQUEUE\n \"\\t+ kqueue (FreeBSD)\\n\"\n#else\n \"\\t- kqueue (FreeBSD)\\n\"\n#endif\n#ifdef USE_LIBEV\n \"\\t+ libev (generic)\\n\"\n#else\n \"\\t- libev (generic)\\n\"\n#endif\n \"\\nNetwork handler:\\n\\n\"\n#if defined USE_LINUX_SENDFILE\n \"\\t+ linux-sendfile\\n\"\n#else\n \"\\t- linux-sendfile\\n\"\n#endif\n#if defined USE_FREEBSD_SENDFILE\n \"\\t+ freebsd-sendfile\\n\"\n#else\n \"\\t- freebsd-sendfile\\n\"\n#endif\n#if defined USE_SOLARIS_SENDFILEV\n \"\\t+ solaris-sendfilev\\n\"\n#else\n \"\\t- solaris-sendfilev\\n\"\n#endif\n#if defined USE_WRITEV\n \"\\t+ writev\\n\"\n#else\n \"\\t- writev\\n\"\n#endif\n \"\\t+ write\\n\"\n#ifdef USE_MMAP\n \n/ ... truncated ... /\n```\n\n\n## Target Source Code\n\n### src/fdevent.h\n\n#### region() [lines 1-89]\n```c\n#ifndef _FDEVENT_H_\n#define _FDEVENT_H_\n#include \"first.h\"\n\n#include \"base_decls.h\" / handler_t /\n\nstruct log_error_st; / declaration /\nstruct fdevents; / declaration /\ntypedef struct fdevents fdevents;\n\ntypedef handler_t (fdevent_handler)(void ctx, int revents);\n\nstruct fdnode_st {\n fdevent_handler handler;\n void ctx;\n int fd;\n int events;\n int fde_ndx;\n #ifdef HAVE_LIBEV\n void handler_ctx;\n #endif\n};\n\n/ These must match POLL* values from operating system headers /\n\n#define FDEVENT_IN 0x0001\n#define FDEVENT_PRI 0x0002\n#define FDEVENT_OUT 0x0004\n#define FDEVENT_ERR 0x0008\n#define FDEVENT_HUP 0x0010\n#define FDEVENT_NVAL 0x0020\n#if defined(__sun) && defined(__SVR4) / Solaris /\n#define FDEVENT_RDHUP 0x4000\n#else\n#define FDEVENT_RDHUP 0x2000\n#endif\n\n#define FDEVENT_STREAM_REQUEST BV(0)\n#define FDEVENT_STREAM_REQUEST_BUFMIN BV(1)\n#define FDEVENT_STREAM_REQUEST_POLLRDHUP BV(12)\n#define FDEVENT_STREAM_REQUEST_TCP_FIN BV(13)\n#define FDEVENT_STREAM_REQUEST_BACKEND_SHUT_WR BV(14)\n#define FDEVENT_STREAM_REQUEST_POLLIN BV(15)\n\n#define FDEVENT_STREAM_RESPONSE BV(0)\n#define FDEVENT_STREAM_RESPONSE_BUFMIN BV(1)\n#define FDEVENT_STREAM_RESPONSE_POLLRDHUP BV(15)\n\n__attribute_cold__\nint fdevent_config(const char event_handler_name, struct log\n/ ... truncated ... /\n```\n\n\n### Type definitions\n\n```c\n/ from base_decls.h /\ntypedef struct server server;\n```\n\n\n## Upstream Fix\n```diff\ncommit 35875cd515e06b3ab7e8afd1190a2fec83112ae4\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Tue Dec 27 13:45:36 2011 +0000\n\n [ssl] include more headers explicitly\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2825 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/network.c b/src/network.c\nindex ba36654..bd30e2d 100644\n--- a/src/network.c\n+++ b/src/network.c\n@@ -25,6 +25,14 @@\n # include <openssl/ssl.h>\n # include <openssl/err.h>\n # include <openssl/rand.h>\n+# include <openssl/dh.h>\n+# include <openssl/bn.h>\n+\n+# if OPENSSL_VERSION_NUMBER >= 0x0090800fL\n+# ifndef OPENSSL_NO_ECDH\n+# include <openssl/ecdh.h>\n+# endif\n+# endif\n #endif\n \n #ifdef USE_OPENSSL\n\ncommit 6f0752da380c8ae7c7dab12a902b4635d3676d0a\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Tue Dec 27 12:14:23 2011 +0000\n\n list all network handlers in lighttpd -V (fixes #2376)\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2824 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/server.c b/src/server.c\nindex bad6c07..beeb368 100644\n--- a/src/server.c\n+++ b/src/server.c\n@@ -409,19 +409,31 @@ static void show_features (void) {\n \"\\t- libev (generic)\\n\"\n #endif\n \"\\nNetwork handler:\\n\\n\"\n-#if defined(USE_LINUX_SENDFILE) \|\| defined(USE_FREEBSD_SENDFILE) \|\| defined(USE_SOLARIS_SENDFILEV) \|\| defined(USE_AIX_SENDFILE)\n- \"\\t+ sendfile\\n\"\n+#if defined USE_LINUX_SENDFILE\n+ \"\\t+ linux-sendfile\\n\"\n #else\n- #ifdef USE_WRITEV\n+ \"\\t- linux-sendfile\\n\"\n+#endif\n+#if defined USE_FREEBSD_SENDFILE\n+ \"\\t+ freebsd-sendfile\\n\"\n+#else\n+ \"\\t- freebsd-sendfile\\n\"\n+#endif\n+#if defined USE_SOLARIS_SENDFILEV\n+ \"\\t+ solaris-sendfilev\\n\"\n+#else\n+ \"\\t- solaris-sendfilev\\n\"\n+#endif\n+#if defined USE_WRITEV\n \"\\t+ writev\\n\"\n- #else\n+#else\n+ \"\\t- writev\\n\"\n+#endif\n \"\\t+ write\\n\"\n- #endif\n- #ifdef USE_MMAP\n+#ifdef USE_MMAP\n \"\\t+ mmap support\\n\"\n- #else\n+#else\n \"\\t- mmap support\\n\"\n- #endif\n #endif\n \"\\nFeatures:\\n\\n\"\n #ifdef HAVE_IPV6\n\ncommit 79bcfab083d8437aff5d03df10fd1e1d5b79ffc7\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Sun Dec 25 15:35:01 2011 +0000\n\n Move fdevent subsystem includes to implementation files to reduce conflicts (fixes #2373)\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2823 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/fdevent.h b/src/fdevent.h\nindex bdc82b5..9dd9a6c 100644\n--- a/src/fdevent.h\n+++ b/src/fdevent.h\n@@ -20,18 +20,12 @@\n \n #if defined(HAVE_EPOLL_CTL) && defined(HAVE_SYS_EPOLL_H)\n # define USE_LINUX_EPOLL\n-# include <sys/epoll.h>\n #endif\n \n / MacOS 10.3.x has poll.h under /usr/include/, all other unixes\n * under /usr/include/sys/ /\n #if defined HAVE_POLL && (defined(HAVE_SYS_POLL_H) \|\| defined(HAVE_POLL_H))\n # define USE_POLL\n-# ifdef HAVE_POLL_H\n-# include <poll.h>\n-# else\n-# include <sys/poll.h>\n-# endif\n #endif\n \n #if defined HAVE_SELECT\n@@ -46,7 +40,6 @@\n \n #if defined HAVE_SYS_DEVPOLL_H && defined(__sun)\n # define USE_SOLARIS_DEVPOLL\n-# include <sys/devpoll.h>\n #endif\n \n #if defined HAVE_PORT_H && defined HAVE_PORT_CREATE && defined(__sun)\n@@ -56,12 +49,10 @@\n \n #if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE\n # define USE_FREEBSD_KQUEUE\n-# include <sys/event.h>\n #endif\n \n #if defined HAVE_LIBEV\n # define USE_LIBEV\n-# include <ev.h>\n #endif\n \n struct server;\ndiff --git a/src/fdevent_freebsd_kqueue.c b/src/fdevent_freebsd_kqueue.c\nindex 0f53a2a..220e265 100644\n--- a/src/fdevent_freebsd_kqueue.c\n+++ b/src/fdevent_freebsd_kqueue.c\n@@ -13,8 +13,8 @@\n #include <fcntl.h>\n \n #ifdef USE_FREEBSD_KQUEUE\n-#include <sys/event.h>\n-#include <sys/time.h>\n+# include <sys/event.h>\n+# include <sys/time.h>\n \n static void fdevent_freebsd_kqueue_free(fdevents ev) {\n \tclose(ev->kq_fd);\ndiff --git a/src/fdevent_libev.c b/src/fdevent_libev.c\nindex 543127a..de62676 100644\n--- a/src/fdevent_libev.c\n+++ b/src/fdevent_libev.c\n@@ -5,6 +5,9 @@\n #include <assert.h>\n \n #ifdef USE_LIBEV\n+\n+# include <ev.h>\n+\n static void io_watcher_cb(struct ev_loop loop, ev_io w, int revents) {\n \tfdevents ev = w->data;\n \tfdnode fdn = ev->fdarray[w->fd];\ndiff --git a/src/fdevent_linux_sysepoll.c b/src/fdevent_linux_sysepoll.c\nindex b311f45..f761ed6 100644\n--- a/src/fdevent_linux_sysepoll.c\n+++ b/src/fdevent_linux_sysepoll.c\n@@ -13,6 +13,9 @@\n #include <fcntl.h>\n \n #ifdef USE_LINUX_EPOLL\n+\n+# include <sys/epoll.h>\n+\n static void fdevent_linux_sysepoll_free(fdevents ev) {\n \tclose(ev->epoll_fd);\n \tfree(ev->epoll_events);\ndiff --git a/src/fdevent_poll.c b/src/fdevent_poll.c\nindex 6d102e6..e8dc385 100644\n--- a/src/fdevent_poll.c\n+++ b/src/fdevent_poll.c\n@@ -13,6 +13,13 @@\n #include <fcntl.h>\n \n #ifdef USE_POLL\n+\n+# ifdef HAVE_POLL_H\n+# include <poll.h>\n+# else\n+# include <sys/poll.h>\n+# endif\n+\n static void fdevent_poll_free(fdevents ev) {\n \tfree(ev->pollfds);\n \tif (ev->unused.ptr) free(ev->unused.ptr);\ndiff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c\nindex cfbc510..dd273e6 100644\n--- a/src/fdevent_solaris_devpoll.c\n+++ b/src/fdevent_solaris_devpoll.c\n@@ -14,6 +14,8 @@\n \n #ifdef USE_SOLARIS_DEVPOLL\n \n+# include <sys/devpoll.h>\n+\n static void fdevent_solaris_devpoll_free(fdevents ev) {\n \tfree(ev->devpollfds);\n \tclose(ev->devpoll_fd);\n\ncommit d194c09da94e310a3ca6659367ffe468303135d5\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Fri Dec 23 10:31:57 2011 +0000\n\n [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2822 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/connections.c b/src/connections.c\nindex cde78e1..faec09f 100644\n--- a/src/connections.c\n+++ b/src/connections.c\n@@ -1360,9 +1360,7 @@ connection connection_accept(server srv, server_socket srv_socket) {\n \t\t\t}\n \n \t\t\tcon->renegotiations = 0;\n-#ifndef OPENSSL_NO_TLSEXT\n \t\t\tSSL_set_app_data(con->ssl, con);\n-#endif\n \t\t\tSSL_set_accept_state(con->ssl);\n \t\t\tcon->conf.is_ssl=1;\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "commit 35875cd515e06b3ab7e8afd1190a2fec83112ae4\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Tue Dec 27 13:45:36 2011 +0000\n\n [ssl] include more headers explicitly\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2825 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/network.c b/src/network.c\nindex ba36654..bd30e2d 100644\n--- a/src/network.c\n+++ b/src/network.c\n@@ -25,6 +25,14 @@\n # include <openssl/ssl.h>\n # include <openssl/err.h>\n # include <openssl/rand.h>\n+# include <openssl/dh.h>\n+# include <openssl/bn.h>\n+\n+# if OPENSSL_VERSION_NUMBER >= 0x0090800fL\n+# ifndef OPENSSL_NO_ECDH\n+# include <openssl/ecdh.h>\n+# endif\n+# endif\n #endif\n \n #ifdef USE_OPENSSL\n\ncommit 6f0752da380c8ae7c7dab12a902b4635d3676d0a\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Tue Dec 27 12:14:23 2011 +0000\n\n list all network handlers in lighttpd -V (fixes #2376)\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2824 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/server.c b/src/server.c\nindex bad6c07..beeb368 100644\n--- a/src/server.c\n+++ b/src/server.c\n@@ -409,19 +409,31 @@ static void show_features (void) {\n \"\\t- libev (generic)\\n\"\n #endif\n \"\\nNetwork handler:\\n\\n\"\n-#if defined(USE_LINUX_SENDFILE) \|\| defined(USE_FREEBSD_SENDFILE) \|\| defined(USE_SOLARIS_SENDFILEV) \|\| defined(USE_AIX_SENDFILE)\n- \"\\t+ sendfile\\n\"\n+#if defined USE_LINUX_SENDFILE\n+ \"\\t+ linux-sendfile\\n\"\n #else\n- #ifdef USE_WRITEV\n+ \"\\t- linux-sendfile\\n\"\n+#endif\n+#if defined USE_FREEBSD_SENDFILE\n+ \"\\t+ freebsd-sendfile\\n\"\n+#else\n+ \"\\t- freebsd-sendfile\\n\"\n+#endif\n+#if defined USE_SOLARIS_SENDFILEV\n+ \"\\t+ solaris-sendfilev\\n\"\n+#else\n+ \"\\t- solaris-sendfilev\\n\"\n+#endif\n+#if defined USE_WRITEV\n \"\\t+ writev\\n\"\n- #else\n+#else\n+ \"\\t- writev\\n\"\n+#endif\n \"\\t+ write\\n\"\n- #endif\n- #ifdef USE_MMAP\n+#ifdef USE_MMAP\n \"\\t+ mmap support\\n\"\n- #else\n+#else\n \"\\t- mmap support\\n\"\n- #endif\n #endif\n \"\\nFeatures:\\n\\n\"\n #ifdef HAVE_IPV6\n\ncommit 79bcfab083d8437aff5d03df10fd1e1d5b79ffc7\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Sun Dec 25 15:35:01 2011 +0000\n\n Move fdevent subsystem includes to implementation files to reduce conflicts (fixes #2373)\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2823 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/fdevent.h b/src/fdevent.h\nindex bdc82b5..9dd9a6c 100644\n--- a/src/fdevent.h\n+++ b/src/fdevent.h\n@@ -20,18 +20,12 @@\n \n #if defined(HAVE_EPOLL_CTL) && defined(HAVE_SYS_EPOLL_H)\n # define USE_LINUX_EPOLL\n-# include <sys/epoll.h>\n #endif\n \n /* MacOS 10.3.x has poll.h under /usr/include/, all other unixes\n * under /usr/include/sys/ /\n #if defined HAVE_POLL && (defined(HAVE_SYS_POLL_H) \|\| defined(HAVE_POLL_H))\n # define USE_POLL\n-# ifdef HAVE_POLL_H\n-# include <poll.h>\n-# else\n-# include <sys/poll.h>\n-# endif\n #endif\n \n #if defined HAVE_SELECT\n@@ -46,7 +40,6 @@\n \n #if defined HAVE_SYS_DEVPOLL_H && defined(__sun)\n # define USE_SOLARIS_DEVPOLL\n-# include <sys/devpoll.h>\n #endif\n \n #if defined HAVE_PORT_H && defined HAVE_PORT_CREATE && defined(__sun)\n@@ -56,12 +49,10 @@\n \n #if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE\n # define USE_FREEBSD_KQUEUE\n-# include <sys/event.h>\n #endif\n \n #if defined HAVE_LIBEV\n # define USE_LIBEV\n-# include <ev.h>\n #endif\n \n struct server;\ndiff --git a/src/fdevent_freebsd_kqueue.c b/src/fdevent_freebsd_kqueue.c\nindex 0f53a2a..220e265 100644\n--- a/src/fdevent_freebsd_kqueue.c\n+++ b/src/fdevent_freebsd_kqueue.c\n@@ -13,8 +13,8 @@\n #include <fcntl.h>\n \n #ifdef USE_FREEBSD_KQUEUE\n-#include <sys/event.h>\n-#include <sys/time.h>\n+# include <sys/event.h>\n+# include <sys/time.h>\n \n static void fdevent_freebsd_kqueue_free(fdevents ev) {\n \tclose(ev->kq_fd);\ndiff --git a/src/fdevent_libev.c b/src/fdevent_libev.c\nindex 543127a..de62676 100644\n--- a/src/fdevent_libev.c\n+++ b/src/fdevent_libev.c\n@@ -5,6 +5,9 @@\n #include <assert.h>\n \n #ifdef USE_LIBEV\n+\n+# include <ev.h>\n+\n static void io_watcher_cb(struct ev_loop loop, ev_io w, int revents) {\n \tfdevents ev = w->data;\n \tfdnode fdn = ev->fdarray[w->fd];\ndiff --git a/src/fdevent_linux_sysepoll.c b/src/fdevent_linux_sysepoll.c\nindex b311f45..f761ed6 100644\n--- a/src/fdevent_linux_sysepoll.c\n+++ b/src/fdevent_linux_sysepoll.c\n@@ -13,6 +13,9 @@\n #include <fcntl.h>\n \n #ifdef USE_LINUX_EPOLL\n+\n+# include <sys/epoll.h>\n+\n static void fdevent_linux_sysepoll_free(fdevents ev) {\n \tclose(ev->epoll_fd);\n \tfree(ev->epoll_events);\ndiff --git a/src/fdevent_poll.c b/src/fdevent_poll.c\nindex 6d102e6..e8dc385 100644\n--- a/src/fdevent_poll.c\n+++ b/src/fdevent_poll.c\n@@ -13,6 +13,13 @@\n #include <fcntl.h>\n \n #ifdef USE_POLL\n+\n+# ifdef HAVE_POLL_H\n+# include <poll.h>\n+# else\n+# include <sys/poll.h>\n+# endif\n+\n static void fdevent_poll_free(fdevents ev) {\n \tfree(ev->pollfds);\n \tif (ev->unused.ptr) free(ev->unused.ptr);\ndiff --git a/src/fdevent_solaris_devpoll.c b/src/fdevent_solaris_devpoll.c\nindex cfbc510..dd273e6 100644\n--- a/src/fdevent_solaris_devpoll.c\n+++ b/src/fdevent_solaris_devpoll.c\n@@ -14,6 +14,8 @@\n \n #ifdef USE_SOLARIS_DEVPOLL\n \n+# include <sys/devpoll.h>\n+\n static void fdevent_solaris_devpoll_free(fdevents ev) {\n \tfree(ev->devpollfds);\n \tclose(ev->devpoll_fd);\n\ncommit d194c09da94e310a3ca6659367ffe468303135d5\nAuthor: Stefan Bühler <stbuehler@web.de>\nDate: Fri Dec 23 10:31:57 2011 +0000\n\n [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI\n \n git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2822 152afb58-edef-0310-8abb-c4023f1b3aa9\n\ndiff --git a/src/connections.c b/src/connections.c\nindex cde78e1..faec09f 100644\n--- a/src/connections.c\n+++ b/src/connections.c\n@@ -1360,9 +1360,7 @@ connection connection_accept(server srv, server_socket srv_socket) {\n \t\t\t}\n \n \t\t\tcon->renegotiations = 0;\n-#ifndef OPENSSL_NO_TLSEXT\n \t\t\tSSL_set_app_data(con->ssl, con);\n-#endif\n \t\t\tSSL_set_accept_state(con->ssl);\n \t\t\tcon->conf.is_ssl=1;" } ]	{ "id": "lighttpd-255-lighttpd-1.4.30_head_fixes.pat", "cves": [], "package": "lighttpd", "incident_id": 0, "patch_name": "", "tier": "identical", "language": "c", "patch_lines_changed": 66, "patch_files_count": 9, "total_tokens_est": 3963, "has_source_context": true, "upstream_enriched": false, "suse_license": "BSD-3-Clause", "upstream_license": "BSD-3-Clause", "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2011-4362\n\nInteger signedness error in the base64_decode function in the HTTP authentication functionality (http_auth.c) in lighttpd 1.4 before 1.4.30 and 1.5 before SVN revision 2806 allows remote attackers to cause a denial of service (segmentation fault) via crafted base64 input that triggers an out-of-bounds read with a negative index.\n\n## Package\nlighttpd\n\n## Files to modify\n- src/mod_geoip.c\n\n## Upstream Fix\n```diff\nIndex: src/Makefile.am\n===================================================================\n--- src/Makefile.am.orig\n+++ src/Makefile.am\n@@ -234,6 +234,10 @@ mod_accesslog_la_SOURCES = mod_accesslog\n mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined\n mod_accesslog_la_LIBADD = $(common_libadd)\n \n+lib_LTLIBRARIES += mod_geoip.la\n+mod_geoip_la_SOURCES = mod_geoip.c\n+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined\n+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP\n \n hdr = server.h buffer.h network.h log.h keyvalue.h \\\n response.h request.h fastcgi.h chunk.h \\\nIndex: src/mod_geoip.c\n===================================================================\n--- /dev/null\n+++ src/mod_geoip.c\n@@ -0,0 +1,417 @@\n+#include <GeoIP.h>\n+#include <GeoIPCity.h>\n+\n+#include <ctype.h>\n+#include <stdlib.h>\n+#include <string.h>\n+\n+#include \"base.h\"\n+#include \"log.h\"\n+#include \"buffer.h\"\n+\n+#include \"plugin.h\"\n+#include \"inet_ntop_cache.h\"\n+\n+#ifdef HAVE_CONFIG_H\n+#include \"config.h\"\n+#endif\n+\n+/*\n+ \n+ * $mod_geoip.c (v2.0) (13.09.2006 00:29:11)\n+ \n+ Name:\n+ * \tmod_geoip.c\n+ \n+ Description:\n+ * \tGeoIP module (plugin) for lighttpd.\n+ \tthe module loads a geoip database of type \"country\" or \"city\" and\n+ \tsets new ENV vars based on ip record lookups.\n+ \n+ \tcountry db env's:\n+ \t\tGEOIP_COUNTRY_CODE\n+ \t\tGEOIP_COUNTRY_CODE3\n+ \t\tGEOIP_COUNTRY_NAME\n+ \n+ \tcity db env's:\n+ \t\tGEOIP_COUNTRY_CODE\n+ \t\tGEOIP_COUNTRY_CODE3\n+ \t\tGEOIP_COUNTRY_NAME\n+ \t\tGEOIP_CITY_NAME\n+ \t\tGEOIP_CITY_POSTAL_CODE\n+ \t\tGEOIP_CITY_LATITUDE\n+ \t\tGEOIP_CITY_LONG_LATITUDE\n+ \t\tGEOIP_CITY_DMA_CODE\n+ \t\tGEOIP_CITY_AREA_CODE\n+ \n+ Usage (configuration options):\n+ \tgeoip.db-filename = <path to the geoip or geocity database>\n+ \tgeoip.memory-cache = <enable\|disable> : default disabled\n+ \t\tif enabled, mod_geoip will load the database binary file to\n+ \t\tmemory for very fast lookups. the only penalty is memory usage.\n+ \n+ Author:\n+ * \tAmi E. Bizamcher (amix)\n+ \tduke.amix@gmail.com\n+ \n+ * Note:\n+ * \tGeoIP Library and API must be installed!\n+ /\n+\n+\n+/ plugin config for all request/connections /\n+\n+typedef struct {\n+\tunsigned short mem_cache;\n+\tbuffer\tdb_name;\n+\tGeoIP gi;\n+} plugin_config;\n+\n+typedef struct {\n+\tPLUGIN_DATA;\n+\n+\tplugin_config config_storage;\n+\n+\tplugin_config conf;\n+} plugin_data;\n+\n+/ init the plugin data /\n+INIT_FUNC(mod_geoip_init) {\n+\tplugin_data p;\n+\n+\tp = calloc(1, sizeof(p));\n+\n+\treturn p;\n+}\n+\n+/ detroy the plugin data /\n+FREE_FUNC(mod_geoip_free) {\n+\tplugin_data p = p_d;\n+\n+\tUNUSED(srv);\n+\n+\tif (!p) return HANDLER_GO_ON;\n+\n+\tif (p->config_storage) {\n+\t\tsize_t i;\n+\n+\t\tfor (i = 0; i < srv->config_context->used; i++) {\n+\t\t\tplugin_config s = p->config_storage[i];\n+\n+\t\t\tif (!s) continue;\n+\n+\t\t\tbuffer_free(s->db_name);\n+\n+\t\t\t/ clean up /\n+\t\t\tGeoIP_delete(s->gi);\n+\n+\t\t\tfree(s);\n+\t\t}\n+\t\tfree(p->config_storage);\n+\t}\n+\n+\tfree(p);\n+\n+\treturn HANDLER_GO_ON;\n+}\n+\n+/ handle plugin config and check values /\n+\n+SETDEFAULTS_FUNC(mod_geoip_set_defaults) {\n+\tplugin_data p = p_d;\n+\tsize_t i = 0;\n+\n+\tconfig_values_t cv[] = {\n+\t\t{ \"geoip.db-filename\",\tNULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },\t/* 0 /\n+\t\t{ \"geoip.memory-cache\",\tNULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, / 1 /\n+\t\t{ NULL,\t\t\tNULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }\n+\t};\n+\n+\tif (!p) return HANDLER_ERROR;\n+\n+\tp->config_storage = calloc(1, srv->config_context->used sizeof(specific_config ));\n+\n+\tfor (i = 0; i < srv->config_context->used; i++) {\n+\t\tplugin_config s;\n+\t\tint mode;\n+\n+\t\ts = calloc(1, sizeof(plugin_config));\n+\n+\t\ts->db_name = buffer_init();\n+\t\ts->mem_cache = 0; /* default: do not load db to cache /\n+\t\ts->gi = NULL;\n+\n+\t\tcv[0].destination = s->db_name;\n+\t\tcv[1].destination = &(s->mem_cache);\n+\n+\t\tp->config_storage[i] = s;\n+\n+\t\tif (0 != config_insert_values_global(srv, ((data_config )srv->config_context->data[i])->value, cv)) {\n+\t\t\treturn HANDLER_ERROR;\n+\t\t}\n+\n+\t\tmode = GEOIP_STANDARD \| GEOIP_CHECK_CACHE;\n+\n+\t\t/* country db filename is requeried! /\n+\t\tif (!buffer_is_empty(s->db_name)) {\n+\n+\t\t\t/ let's start cooking /\n+\t\t\tif (s->mem_cache != 0)\n+\t\t\t\tmode = GEOIP_MEMORY_CACHE \| GEOIP_CHECK_CACHE;\n+\n+\t\t\tif (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) {\n+\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\",\n+\t\t\t\t\t\"failed to open GeoIP database!!!\");\n+\n+\t\t\t\treturn HANDLER_ERROR;\n+\t\t\t}\n+\n+\t\t\t/ is the db supported ? /\n+\t\t\tif (s->gi->databaseType != GEOIP_COUNTRY_EDITION &&\n+\t\t\t\ts->gi->databaseType != GEOIP_CITY_EDITION_REV0 &&\n+\t\t\t\ts->gi->databaseType != GEOIP_CITY_EDITION_REV1) {\n+\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\",\n+\t\t\t\t\t\"GeoIP database is of unsupported type!!!\");\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn HANDLER_GO_ON;\n+}\n+\n+#define PATCH(x) \\\n+\tp->conf.x = s->x;\n+static int mod_geoip_patch_connection(server srv, connection con, plugin_data p) {\n+\tsize_t i, j;\n+\tplugin_config s = p->config_storage[0];\n+\n+\tPATCH(db_name);\n+\tPATCH(mem_cache);\n+ PATCH(gi);\n+\n+\t/ skip the first, the global context /\n+\tfor (i = 1; i < srv->config_context->used; i++) {\n+\t\tdata_config dc = (data_config )srv->config_context->data[i];\n+\t\ts = p->config_storage[i];\n+\n+\t\t/ condition didn't match /\n+\t\tif (!config_check_cond(srv, con, dc)) continue;\n+\n+\t\t/ merge config /\n+\t\tfor (j = 0; j < dc->value->used; j++) {\n+\t\t\tdata_unset du = dc->value->data[j];\n+\n+\t\t\tif (buffer_is_equal_string(du->key, CONST_STR_LEN(\"geoip.db-filename\"))) {\n+\t\t\t\tPATCH(db_name);\n+\t\t\t}\n+\n+\t\t\tif (buffer_is_equal_string(du->key, CONST_STR_LEN(\"geoip.memory-cache\"))) {\n+ PATCH(mem_cache);\n+ }\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+#undef PATCH\n+\n+URIHANDLER_FUNC(mod_geoip_subrequest) {\n+ plugin_data p = p_d;\n+\n+ mod_geoip_patch_connection(srv, con, p);\n+\n+ if (!buffer_is_empty(p->conf.db_name)) {\n+\t\tconst char remote_ip;\n+\t\tGeoIP gi;\n+\t\tdata_string ds;\n+\t\tconst char returnedCountry;\n+\n+\t\tremote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr));\n+\n+\t\tif (p->conf.gi->databaseType == GEOIP_COUNTRY_EDITION) {\n+\t\t\t/ get the country code 2 chars /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_CODE\"))) {\n+\t\t\t\tif (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) {\n+\t \t \tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ \t \t \tds = data_string_init();\n+\t \t \t}\n+\n+\t\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_CODE\");\n+\t\t\t\t\tbuffer_copy_string(ds->value, returnedCountry);\n+\t\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* get the country code 3 chars /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_CODE3\"))) {\n+\t\t\t\tif (NULL != (returnedCountry = GeoIP_country_code3_by_addr(p->conf.gi, remote_ip))) {\n+\t\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\t\tds = data_string_init();\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_CODE3\");\n+\t\t\t\t\tbuffer_copy_string(ds->value, returnedCountry);\n+\t\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* get the country name /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_NAME\"))) {\n+\t\t\t\tif (NULL != (returnedCountry = GeoIP_country_name_by_addr(p->conf.gi, remote_ip))) {\n+\t\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\t\tds = data_string_init();\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_NAME\");\n+\t\t\t\t\tbuffer_copy_string(ds->value, returnedCountry);\n+\t\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* go on... /\n+\t\t\treturn HANDLER_GO_ON;\n+\t\t}\n+\n+\t\t/ if we are here, geo city is in use /\n+\t\tGeoIPRecord gir;\n+\n+\t\tif (NULL != (gir = GeoIP_record_by_addr(p->conf.gi, remote_ip))) {\n+\t\t\t/\n... (truncated)\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: src/Makefile.am\n===================================================================\n--- src/Makefile.am.orig\n+++ src/Makefile.am\n@@ -234,6 +234,10 @@ mod_accesslog_la_SOURCES = mod_accesslog\n mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined\n mod_accesslog_la_LIBADD = $(common_libadd)\n \n+lib_LTLIBRARIES += mod_geoip.la\n+mod_geoip_la_SOURCES = mod_geoip.c\n+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined\n+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP\n \n hdr = server.h buffer.h network.h log.h keyvalue.h \\\n response.h request.h fastcgi.h chunk.h \\\nIndex: src/mod_geoip.c\n===================================================================\n--- /dev/null\n+++ src/mod_geoip.c\n@@ -0,0 +1,417 @@\n+#include <GeoIP.h>\n+#include <GeoIPCity.h>\n+\n+#include <ctype.h>\n+#include <stdlib.h>\n+#include <string.h>\n+\n+#include \"base.h\"\n+#include \"log.h\"\n+#include \"buffer.h\"\n+\n+#include \"plugin.h\"\n+#include \"inet_ntop_cache.h\"\n+\n+#ifdef HAVE_CONFIG_H\n+#include \"config.h\"\n+#endif\n+\n+/*\n+ \n+ * $mod_geoip.c (v2.0) (13.09.2006 00:29:11)\n+ \n+ Name:\n+ * \tmod_geoip.c\n+ \n+ Description:\n+ * \tGeoIP module (plugin) for lighttpd.\n+ \tthe module loads a geoip database of type \"country\" or \"city\" and\n+ \tsets new ENV vars based on ip record lookups.\n+ \n+ \tcountry db env's:\n+ \t\tGEOIP_COUNTRY_CODE\n+ \t\tGEOIP_COUNTRY_CODE3\n+ \t\tGEOIP_COUNTRY_NAME\n+ \n+ \tcity db env's:\n+ \t\tGEOIP_COUNTRY_CODE\n+ \t\tGEOIP_COUNTRY_CODE3\n+ \t\tGEOIP_COUNTRY_NAME\n+ \t\tGEOIP_CITY_NAME\n+ \t\tGEOIP_CITY_POSTAL_CODE\n+ \t\tGEOIP_CITY_LATITUDE\n+ \t\tGEOIP_CITY_LONG_LATITUDE\n+ \t\tGEOIP_CITY_DMA_CODE\n+ \t\tGEOIP_CITY_AREA_CODE\n+ \n+ Usage (configuration options):\n+ \tgeoip.db-filename = <path to the geoip or geocity database>\n+ \tgeoip.memory-cache = <enable\|disable> : default disabled\n+ \t\tif enabled, mod_geoip will load the database binary file to\n+ \t\tmemory for very fast lookups. the only penalty is memory usage.\n+ \n+ Author:\n+ * \tAmi E. Bizamcher (amix)\n+ \tduke.amix@gmail.com\n+ \n+ * Note:\n+ * \tGeoIP Library and API must be installed!\n+ /\n+\n+\n+/ plugin config for all request/connections /\n+\n+typedef struct {\n+\tunsigned short mem_cache;\n+\tbuffer\tdb_name;\n+\tGeoIP gi;\n+} plugin_config;\n+\n+typedef struct {\n+\tPLUGIN_DATA;\n+\n+\tplugin_config config_storage;\n+\n+\tplugin_config conf;\n+} plugin_data;\n+\n+/ init the plugin data /\n+INIT_FUNC(mod_geoip_init) {\n+\tplugin_data p;\n+\n+\tp = calloc(1, sizeof(p));\n+\n+\treturn p;\n+}\n+\n+/ detroy the plugin data /\n+FREE_FUNC(mod_geoip_free) {\n+\tplugin_data p = p_d;\n+\n+\tUNUSED(srv);\n+\n+\tif (!p) return HANDLER_GO_ON;\n+\n+\tif (p->config_storage) {\n+\t\tsize_t i;\n+\n+\t\tfor (i = 0; i < srv->config_context->used; i++) {\n+\t\t\tplugin_config s = p->config_storage[i];\n+\n+\t\t\tif (!s) continue;\n+\n+\t\t\tbuffer_free(s->db_name);\n+\n+\t\t\t/ clean up /\n+\t\t\tGeoIP_delete(s->gi);\n+\n+\t\t\tfree(s);\n+\t\t}\n+\t\tfree(p->config_storage);\n+\t}\n+\n+\tfree(p);\n+\n+\treturn HANDLER_GO_ON;\n+}\n+\n+/ handle plugin config and check values /\n+\n+SETDEFAULTS_FUNC(mod_geoip_set_defaults) {\n+\tplugin_data p = p_d;\n+\tsize_t i = 0;\n+\n+\tconfig_values_t cv[] = {\n+\t\t{ \"geoip.db-filename\",\tNULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },\t/* 0 /\n+\t\t{ \"geoip.memory-cache\",\tNULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, / 1 /\n+\t\t{ NULL,\t\t\tNULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }\n+\t};\n+\n+\tif (!p) return HANDLER_ERROR;\n+\n+\tp->config_storage = calloc(1, srv->config_context->used sizeof(specific_config ));\n+\n+\tfor (i = 0; i < srv->config_context->used; i++) {\n+\t\tplugin_config s;\n+\t\tint mode;\n+\n+\t\ts = calloc(1, sizeof(plugin_config));\n+\n+\t\ts->db_name = buffer_init();\n+\t\ts->mem_cache = 0; /* default: do not load db to cache /\n+\t\ts->gi = NULL;\n+\n+\t\tcv[0].destination = s->db_name;\n+\t\tcv[1].destination = &(s->mem_cache);\n+\n+\t\tp->config_storage[i] = s;\n+\n+\t\tif (0 != config_insert_values_global(srv, ((data_config )srv->config_context->data[i])->value, cv)) {\n+\t\t\treturn HANDLER_ERROR;\n+\t\t}\n+\n+\t\tmode = GEOIP_STANDARD \| GEOIP_CHECK_CACHE;\n+\n+\t\t/* country db filename is requeried! /\n+\t\tif (!buffer_is_empty(s->db_name)) {\n+\n+\t\t\t/ let's start cooking /\n+\t\t\tif (s->mem_cache != 0)\n+\t\t\t\tmode = GEOIP_MEMORY_CACHE \| GEOIP_CHECK_CACHE;\n+\n+\t\t\tif (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) {\n+\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\",\n+\t\t\t\t\t\"failed to open GeoIP database!!!\");\n+\n+\t\t\t\treturn HANDLER_ERROR;\n+\t\t\t}\n+\n+\t\t\t/ is the db supported ? /\n+\t\t\tif (s->gi->databaseType != GEOIP_COUNTRY_EDITION &&\n+\t\t\t\ts->gi->databaseType != GEOIP_CITY_EDITION_REV0 &&\n+\t\t\t\ts->gi->databaseType != GEOIP_CITY_EDITION_REV1) {\n+\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\",\n+\t\t\t\t\t\"GeoIP database is of unsupported type!!!\");\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn HANDLER_GO_ON;\n+}\n+\n+#define PATCH(x) \\\n+\tp->conf.x = s->x;\n+static int mod_geoip_patch_connection(server srv, connection con, plugin_data p) {\n+\tsize_t i, j;\n+\tplugin_config s = p->config_storage[0];\n+\n+\tPATCH(db_name);\n+\tPATCH(mem_cache);\n+ PATCH(gi);\n+\n+\t/ skip the first, the global context /\n+\tfor (i = 1; i < srv->config_context->used; i++) {\n+\t\tdata_config dc = (data_config )srv->config_context->data[i];\n+\t\ts = p->config_storage[i];\n+\n+\t\t/ condition didn't match /\n+\t\tif (!config_check_cond(srv, con, dc)) continue;\n+\n+\t\t/ merge config /\n+\t\tfor (j = 0; j < dc->value->used; j++) {\n+\t\t\tdata_unset du = dc->value->data[j];\n+\n+\t\t\tif (buffer_is_equal_string(du->key, CONST_STR_LEN(\"geoip.db-filename\"))) {\n+\t\t\t\tPATCH(db_name);\n+\t\t\t}\n+\n+\t\t\tif (buffer_is_equal_string(du->key, CONST_STR_LEN(\"geoip.memory-cache\"))) {\n+ PATCH(mem_cache);\n+ }\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+#undef PATCH\n+\n+URIHANDLER_FUNC(mod_geoip_subrequest) {\n+ plugin_data p = p_d;\n+\n+ mod_geoip_patch_connection(srv, con, p);\n+\n+ if (!buffer_is_empty(p->conf.db_name)) {\n+\t\tconst char remote_ip;\n+\t\tGeoIP gi;\n+\t\tdata_string ds;\n+\t\tconst char returnedCountry;\n+\n+\t\tremote_ip = inet_ntop_cache_get_ip(srv, &(con->dst_addr));\n+\n+\t\tif (p->conf.gi->databaseType == GEOIP_COUNTRY_EDITION) {\n+\t\t\t/ get the country code 2 chars /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_CODE\"))) {\n+\t\t\t\tif (NULL != (returnedCountry = GeoIP_country_code_by_addr(p->conf.gi, remote_ip))) {\n+\t \t \tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ \t \t \tds = data_string_init();\n+\t \t \t}\n+\n+\t\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_CODE\");\n+\t\t\t\t\tbuffer_copy_string(ds->value, returnedCountry);\n+\t\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* get the country code 3 chars /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_CODE3\"))) {\n+\t\t\t\tif (NULL != (returnedCountry = GeoIP_country_code3_by_addr(p->conf.gi, remote_ip))) {\n+\t\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\t\tds = data_string_init();\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_CODE3\");\n+\t\t\t\t\tbuffer_copy_string(ds->value, returnedCountry);\n+\t\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* get the country name /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_NAME\"))) {\n+\t\t\t\tif (NULL != (returnedCountry = GeoIP_country_name_by_addr(p->conf.gi, remote_ip))) {\n+\t\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\t\tds = data_string_init();\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_NAME\");\n+\t\t\t\t\tbuffer_copy_string(ds->value, returnedCountry);\n+\t\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* go on... /\n+\t\t\treturn HANDLER_GO_ON;\n+\t\t}\n+\n+\t\t/ if we are here, geo city is in use /\n+\t\tGeoIPRecord gir;\n+\n+\t\tif (NULL != (gir = GeoIP_record_by_addr(p->conf.gi, remote_ip))) {\n+\t\t\t/* get the country code 2 chars /\n+ if (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_CODE\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ buffer_copy_string(ds->key, \"GEOIP_COUNTRY_CODE\");\n+ buffer_copy_string(ds->value, gir->country_code);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\n+\t\t\t/* get the country code 3 chars /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_CODE3\"))) {\n+\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\tds = data_string_init();\n+\t\t\t\t}\n+\n+\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_CODE3\");\n+\t\t\t\tbuffer_copy_string(ds->value, gir->country_code3);\n+\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t}\n+\n+\t\t\t/* get the country name /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_COUNTRY_NAME\"))) {\n+\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\tds = data_string_init();\n+\t\t\t\t}\n+\n+\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_COUNTRY_NAME\");\n+\t\t\t\tbuffer_copy_string(ds->value, gir->country_name);\n+\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t}\n+\n+\t\t\t/* get the city region /\n+ if (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_REGION\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ buffer_copy_string(ds->key, \"GEOIP_CITY_REGION\");\n+ buffer_copy_string(ds->value, gir->region);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\n+ /* get the city /\n+ if (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_NAME\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ buffer_copy_string(ds->key, \"GEOIP_CITY_NAME\");\n+ buffer_copy_string(ds->value, gir->city);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\n+ /* get the postal code /\n+ if (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_POSTAL_CODE\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ buffer_copy_string(ds->key, \"GEOIP_CITY_POSTAL_CODE\");\n+ buffer_copy_string(ds->value, gir->postal_code);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\n+\t\t\t/* get the latitude /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_LATITUDE\"))) {\n+\t\t\t\tif (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+\t\t\t\t\tds = data_string_init();\n+\t\t\t\t}\n+\n+\t\t\t\tchar latitude[32];\n+\t\t\t\tsprintf(&latitude, \"%f\", gir->latitude);\n+\t\t\t\tbuffer_copy_string(ds->key, \"GEOIP_CITY_LATITUDE\");\n+\t\t\t\tbuffer_copy_string(ds->value, latitude);\n+\t\t\t\tarray_insert_unique(con->environment, (data_unset )ds);\n+\t\t\t}\n+\n+\t\t\t/* get the long latitude /\n+\t\t\tif (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_LONG_LATITUDE\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ char long_latitude[32];\n+ sprintf(&long_latitude, \"%f\", gir->longitude);\n+ buffer_copy_string(ds->key, \"GEOIP_CITY_LONG_LATITUDE\");\n+ buffer_copy_string(ds->value, long_latitude);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\n+\t\t\t/* get the dma code /\n+ if (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_DMA_CODE\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ char dc[5];\n+ sprintf(&dc, \"%i\", gir->dma_code);\n+ buffer_copy_string(ds->key, \"GEOIP_CITY_DMA_CODE\");\n+ buffer_copy_string(ds->value, dc);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\n+\t\t\t/* get the area code /\n+ if (NULL == (ds = (data_string )array_get_element(con->environment, \"GEOIP_CITY_AREA_CODE\"))) {\n+ if (NULL == (ds = (data_string )array_get_unused_element(con->environment, TYPE_STRING))) {\n+ ds = data_string_init();\n+ }\n+\n+ char ac[5];\n+ sprintf(&ac, \"%i\", gir->area_code);\n+ buffer_copy_string(ds->key, \"GEOIP_CITY_AREA_CODE\");\n+ buffer_copy_string(ds->value, ac);\n+ array_insert_unique(con->environment, (data_unset )ds);\n+ }\n+\t\t}\n+\t}\n+\n+ /* keep walking... (johnnie walker style ;) /\n+ return HANDLER_GO_ON;\n+}\n+\n+/ this function is called at dlopen() time and inits the callbacks /\n+\n+int mod_geoip_plugin_init(plugin p) {\n+\tp->version = LIGHTTPD_VERSION_ID;\n+\tp->name = buffer_init_string(\"geoip\");\n+\n+\tp->init = mod_geoip_init;\n+\tp->handle_subrequest_start = mod_geoip_subrequest;\n+\tp->set_defaults = mod_geoip_set_defaults;\n+\tp->cleanup = mod_geoip_free;\n+\n+\tp->data = NULL;\n+\n+\treturn 0;\n+}\nIndex: doc/geoip.txt\n===================================================================\n--- /dev/null\n+++ doc/geoip.txt\n@@ -0,0 +1,148 @@\n+{{{\n+#!rst\n+==============================\n+ip based geographic lookups...\n+==============================\n+\n+-----------------\n+Module: mod_geoip\n+-----------------\n+\n+\n+\n+.. contents:: Table of Contents\n+\n+Requirements\n+============\n+\n+:Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/)\n+\n+Overview\n+========\n+\n+mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP /\n+GeoCity databases.\n+If the ip was found in the database the module sets the appropriate\n+environments variables to the request, thus making other modules/fcgi be\n+informed.\n+\n+.. note::\n+\n+ Currently only country/city databases are supported because they have a free\n+ version that i can test.\n+\n+Configuration Options\n+========================\n+\n+mod_geoip uses two configuration options.\n+\n+1) geoip.db-filename = <path to the geoip or geocity database>\n+2) geoip.memory-cache = <enable\|disable> : default disabled\n+\n+if enabled, mod_geoip will load the database binary file to\n+memory for very fast lookups. the only penalty is memory usage.\n+\n+.. note::\n+\n+ mod_geoip will determine the database type automatically so if you enter\n+ GeoCity databse path it will load GeoCity Env.\n+\n+Environment\n+===========\n+\n+Every database sets it's own ENV:\n+\n+GeoIP (Country):\n+----------------\n+\n+::\n+\n+ GEOIP_COUNTRY_CODE\n+ GEOIP_COUNTRY_CODE3\n+ GEOIP_COUNTRY_NAME\n+\n+GeoCity:\n+--------\n+\n+::\n+\n+ GEOIP_COUNTRY_CODE\n+ GEOIP_COUNTRY_CODE3\n+ GEOIP_COUNTRY_NAME\n+ GEOIP_CITY_NAME\n+ GEOIP_CITY_POSTAL_CODE\n+ GEOIP_CITY_LATITUDE\n+ GEOIP_CITY_LONG_LATITUDE\n+ GEOIP_CITY_DMA_CODE\n+ GEOIP_CITY_AREA_CODE\n+\n+Examples\n+========\n+\n+mod_geoip + php\n+---------------\n+\n+when using fastcgi (not only php) you can access mod_geoip env and do as you\n+please. this example just prints all mod_geoip envs to the client, html.\n+\n+Config-file ::\n+\n+ geoip.db-filename = \"/your-geoip-db-path/GeoCityLite.dat\"\n+ geoip.memory-cache = \"enable\"\n+\n+index.php ::\n+\n+ <?php\n+ $country_code = $_SERVER['GEOIP_COUNTRY_CODE'];\n+ $country_code3 = $_SERVER['GEOIP_COUNTRY_CODE3'];\n+ $country_name = $_SERVER['GEOIP_COUNTRY_NAME'];\n+\n+ $city_region = $_SERVER['GEOIP_CITY_REGION'];\n+ $city_name = $_SERVER['GEOIP_CITY_NAME'];\n+ $city_postal_code = $_SERVER['GEOIP_CITY_POSTAL_CODE'];\n+ $city_latitude = $_SERVER['GEOIP_CITY_LATITUDE'];\n+ $city_long_latitude = $_SERVER['GEOIP_CITY_LONG_LATITUDE'];\n+ $city_dma_code = $_SERVER['GEOIP_CITY_DMA_CODE'];\n+ $city_area_code = $_SERVER['GEOIP_CITY_AREA_CODE'];\n+\n+ echo \"<html>\\n<body>\\n\\t<br>\\n\";\n+ echo 'Country Code: ' . $country_code . '<br>';\n+ echo 'Country Code 3: ' . $country_code3 . '<br>';\n+ echo 'Country Name: ' . $country_name . '<br>';\n+ echo '<br>';\n+ echo 'City Region: ' . $city_region . '<br>';\n+ echo 'City Name: ' . $city_name . '<br>';\n+ echo 'City Postal Code: ' . $city_postal_code . '<br>';\n+ echo 'City Latitude: ' . $city_latitude . '<br>';\n+ echo 'City Long Latitude: ' . $city_long_latitude . '<br>';\n+ echo 'City DMA Code: ' . $city_dma_code . '<br>';\n+ echo 'City Area Code: ' . $city_area_code . '<br>';\n+ echo \"</html>\\n</body>\";\n+ ?>\n+\n+country based redirect\n+----------------------\n+\n+Config-file ::\n+\n+ $HTTP[\"host\"] =~ \"www.domain.com\" {\n+ url.rewrite = ( \"\" => \"/redirect.php\")\n+ }\n+\n+redirect.php ::\n+\n+ <?php\n+ $country_code = $_SERVER['GEOIP_COUNTRY_CODE'];\n+ header ('Location: http://' . $country_code . '.domain.com/');\n+ ?>\n+\n+.. note::\n+\n+ Currently it is not possible to redirect based on mod_geoip directly in\n+lighttpd config file. But i believe with the relase of lighttpd mod_magnet\n+it would be. (mod_magnet will be available in lighttpd 1.4.12+)\n+\n+Downloads\n+=========\n+mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c)\n+}}}" } ]	{ "id": "lighttpd-255-lighttpd-1.4.13_geoip.patch", "cves": [], "package": "lighttpd", "incident_id": 0, "patch_name": "", "tier": "adapted", "language": "c", "patch_lines_changed": 569, "patch_files_count": 3, "total_tokens_est": 6954, "has_source_context": false, "upstream_enriched": false, "suse_license": "BSD-3-Clause", "upstream_license": "BSD-3-Clause", "cve_id": null, "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-1010190\n\nFix build failure with gcc-7\n\n## Package\nmgetty\n\n## Files to modify\n- g3/g3cat.c\n- g3/pbm2g3.c\n\n## Upstream Fix\n```diff\nFrom 09227cacda77d7785e864c0fec3854c22b3273f7 Mon Sep 17 00:00:00 2001\nFrom: Michal Sekletar <msekleta@redhat.com>\nDate: Thu, 2 Mar 2017 09:25:45 +0100\nSubject: [PATCH] Fix build failure with gcc-7\n\nWhen function is declared inline but it is not static then compiler\nassumes it could be potentially called from other translation\nunits. Hence it will inline the function within the translation unit and\nat the same time it will generate object code for function with external\nlinkage. However both extern and inline variant must be the same and\ntherefore such function can not use any variables with static storage\nduration. In our case functions in g3cat.c and pbm2g3.c are not called\nfrom other translation units hence it is fine to mark then explicitly as\nstatic and compiler won't generate other (problematic) extern variant.\n---\n g3/g3cat.c \| 8 ++++----\n g3/pbm2g3.c \| 8 ++++----\n 2 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/g3/g3cat.c b/g3/g3cat.c\nindex 8a4b708..1951210 100644\n--- a/g3/g3cat.c\n+++ b/g3/g3cat.c\n@@ -44,7 +44,7 @@ static int b_written = 0;\t\t/* bytes of a line already /\n \t\t\t\t\t/ written /\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putcode _P2( (code, len), int code, int len )\n {\n@@ -67,7 +67,7 @@ void putcode _P2( (code, len), int code, int len )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putwhitespan _P1( (l), int l )\n {\n@@ -98,7 +98,7 @@ void putwhitespan _P1( (l), int l )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putblackspan _P1( (l), int l )\n {\n@@ -129,7 +129,7 @@ void putblackspan _P1( (l), int l )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void puteol _P0( void )\t\t\t/ write byte-aligned EOL /\n {\ndiff --git a/g3/pbm2g3.c b/g3/pbm2g3.c\nindex 283a728..57cb69a 100644\n--- a/g3/pbm2g3.c\n+++ b/g3/pbm2g3.c\n@@ -40,7 +40,7 @@ static unsigned int out_hibit = 0;\n static int out_byte_tab[ 256 ];\t\t\t/ for g3 byte reversal /\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putcode _P2( (code, len), int code, int len )\n {\n@@ -60,7 +60,7 @@ void putcode _P2( (code, len), int code, int len )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void puteol _P0( void )\t\t\t/ write byte-aligned EOL /\n {\n@@ -69,7 +69,7 @@ void puteol _P0( void )\t\t\t/ write byte-aligned EOL /\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putwhitespan _P1( (l), int l )\n {\n@@ -100,7 +100,7 @@ void putwhitespan _P1( (l), int l )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putblackspan _P1( (l), int l )\n {\n-- \n2.9.3\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From 09227cacda77d7785e864c0fec3854c22b3273f7 Mon Sep 17 00:00:00 2001\nFrom: Michal Sekletar <msekleta@redhat.com>\nDate: Thu, 2 Mar 2017 09:25:45 +0100\nSubject: [PATCH] Fix build failure with gcc-7\n\nWhen function is declared inline but it is not static then compiler\nassumes it could be potentially called from other translation\nunits. Hence it will inline the function within the translation unit and\nat the same time it will generate object code for function with external\nlinkage. However both extern and inline variant must* be the same and\ntherefore such function can not use any variables with static storage\nduration. In our case functions in g3cat.c and pbm2g3.c are not called\nfrom other translation units hence it is fine to mark then explicitly as\nstatic and compiler won't generate other (problematic) extern variant.\n---\n g3/g3cat.c \| 8 ++++----\n g3/pbm2g3.c \| 8 ++++----\n 2 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/g3/g3cat.c b/g3/g3cat.c\nindex 8a4b708..1951210 100644\n--- a/g3/g3cat.c\n+++ b/g3/g3cat.c\n@@ -44,7 +44,7 @@ static int b_written = 0;\t\t/* bytes of a line already /\n \t\t\t\t\t/ written /\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putcode _P2( (code, len), int code, int len )\n {\n@@ -67,7 +67,7 @@ void putcode _P2( (code, len), int code, int len )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putwhitespan _P1( (l), int l )\n {\n@@ -98,7 +98,7 @@ void putwhitespan _P1( (l), int l )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putblackspan _P1( (l), int l )\n {\n@@ -129,7 +129,7 @@ void putblackspan _P1( (l), int l )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void puteol _P0( void )\t\t\t/ write byte-aligned EOL /\n {\ndiff --git a/g3/pbm2g3.c b/g3/pbm2g3.c\nindex 283a728..57cb69a 100644\n--- a/g3/pbm2g3.c\n+++ b/g3/pbm2g3.c\n@@ -40,7 +40,7 @@ static unsigned int out_hibit = 0;\n static int out_byte_tab[ 256 ];\t\t\t/ for g3 byte reversal /\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putcode _P2( (code, len), int code, int len )\n {\n@@ -60,7 +60,7 @@ void putcode _P2( (code, len), int code, int len )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void puteol _P0( void )\t\t\t/ write byte-aligned EOL /\n {\n@@ -69,7 +69,7 @@ void puteol _P0( void )\t\t\t/ write byte-aligned EOL */\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putwhitespan _P1( (l), int l )\n {\n@@ -100,7 +100,7 @@ void putwhitespan _P1( (l), int l )\n }\n \n #ifdef __GNUC__\n-inline\n+static inline\n #endif\n void putblackspan _P1( (l), int l )\n {\n-- \n2.9.3\n\n" } ]	{ "id": "mgetty-12289-0001-Fix-build-failure-with-gcc-7.patch", "cves": [ "CVE-2019-1010190" ], "package": "mgetty", "incident_id": 12289, "patch_name": "0001-Fix-build-failure-with-gcc-7.patch", "tier": "identical", "language": "c", "patch_lines_changed": 17, "patch_files_count": 2, "total_tokens_est": 1397, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2019-1010190", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-1010190\n\n-#!/usr/local/bin/perl\n\n## Package\nmgetty\n\n## Upstream Fix\n```diff\n--- contrib/faxdvi2.perl\n+++ contrib/faxdvi2.perl\n@@ -1,4 +1,4 @@\n-#!/usr/local/bin/perl\n+#!/usr/bin/perl\n #\n # faxdvi2 -- pass a DVI file to the FAX subsystem.\n #\n@@ -21,7 +21,7 @@\n # rs@purple.PNoF.sub.org\n \n \n-$config_file = '/usr/local/lib/mgetty+sendfax/faxdvi.config';\n+$config_file = '/usr/lib/mgetty+sendfax/faxdvi.config';\n $user_file = \"$ENV{'HOME'}/.faxdvirc\";\n \n $dvips = 'dvips -t letter -P fax';\n--- contrib/faxiobe.sh\n+++ contrib/faxiobe.sh\n@@ -35,8 +35,8 @@\n X\n X# define GHOSTSCRIPT and SENDFAX correct for you site\n X\n-XGHOSTSCRIPT=\\\"/usr/local/bin/gs\\\"\n-XSENDFAX=\\\"/usr/local/sbin/sendfax -v\\\"\n+XGHOSTSCRIPT=\\\"/usr/bin/gs\\\"\n+XSENDFAX=\\\"/usr/sbin/sendfax -v\\\"\n X\n X# define NOFAX for a dummy program instead of sendfax\n X# this is for debugging. A sample \"nofax\" is in the distribution.\n@@ -160,11 +160,11 @@\n X#define SLEEPTIME 300 /* make multiple of 10 please /\n X\n X#ifndef GHOSTSCRIPT\n-X#define GHOSTSCRIPT \"/usr/local/bin/gs\"\n+X#define GHOSTSCRIPT \"/usr/bin/gs\"\n X#endif\n X\n X#ifndef SENDFAX\n-X#define SENDFAX \"/usr/local/sbin/sendfax\"\n+X#define SENDFAX \"/usr/sbin/sendfax\"\n X#endif\n X\n X#ifndef NOFAX\n--- contrib/lp-fax\n+++ contrib/lp-fax\n@@ -81,7 +81,7 @@\n # send the file(s) to the standard out $copies times\n while\t[ \"$copies\" -gt 0 ]\n do\n-\t/usr/local/bin/faxspool -u $name -f \"$name ($user)\" $fax_no $\n+\t/usr/bin/faxspool -u $name -f \"$name ($user)\" $fax_no $\n #\tfor file\n #\tdo\n #\t\t0<${file} eval ${FILTER} 2>&1 \n--- contrib/mgetty-to-flexfax.sh\n+++ contrib/mgetty-to-flexfax.sh\n@@ -28,7 +28,7 @@\n --- new_fax ---\n #! /bin/sh\n \n-PATH=/usr/local/bin:/usr/ucb:/bin:/usr/local/lib/mgetty+sendfax:$PATH\n+PATH=/usr/local/bin:/usr/ucb:/bin:/usr/lib/mgetty+sendfax:$PATH\n export PATH\n \n FILE=/var/spool/fax/recvq/mgetty.$$\n--- contrib/watchit.pl\n+++ contrib/watchit.pl\n@@ -1,4 +1,4 @@\n-#!/usr/local/bin/perl5\n+#!/usr/bin/perl\n #\n # watchit.pl\n #\n--- doc/Makefile\n+++ doc/Makefile\n@@ -12,11 +12,11 @@\n MAN5PAGES=faxqueue.5\n MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.8\n MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES)\n-MAN1DIR=/usr/local/man/man1\n-MAN4DIR=/usr/local/man/man4\n-MAN5DIR=/usr/local/man/man5\n-MAN8DIR=/usr/local/man/man8\n-INFODIR=/usr/local/info\n+MAN1DIR=/usr/share/man/man1\n+MAN4DIR=/usr/share/man/man4\n+MAN5DIR=/usr/share/man/man5\n+MAN8DIR=/usr/share/man/man8\n+INFODIR=/usr/share/info\n \n #\n # formatted man pages\n--- doc/loginv2.txt\n+++ doc/loginv2.txt\n@@ -29,7 +29,7 @@\n #\n # this is the dummy user name, it's allowed to login only if this \n # is not already an ongoing callback\n-callback\tN\t-\t-\t/usr/local/sbin/callback -S 12345\n+callback\tN\t-\t-\t/usr/sbin/callback -S 12345\n #\n # these are the real users: only allowed if it's a callback (\"Y\")\n \t\tY\t-\t- \t/bin/login @\n--- doc/mgetty.texi-in\n+++ doc/mgetty.texi-in\n@@ -2449,7 +2449,7 @@\n do\n sleep 60\n done\n-exec /usr/local/sbin/mgetty ttyS1\n+exec /usr/sbin/mgetty ttyS1\n @end example\n \n @item\n@@ -3691,7 +3691,7 @@\n add an entry to @file{/etc/inittab} like the following:\n \n @example\n-ya:234:respawn:/usr/local/sbin/mgetty -s 38400 -x 3 term/a\n+ya:234:respawn:/usr/sbin/mgetty -s 38400 -x 3 term/a\n @end example\n \n @emph{Don't use the Solaris @code{admintool} to create any port monitoring\n--- doc/scanner.txt\n+++ doc/scanner.txt\n@@ -44,7 +44,7 @@\n Of course you should set up mgetty for the terminal port of Fax modem as\n follows.\n \n-/usr/local/sbin/mgetty -x 9 ttym0\n+/usr/sbin/mgetty -x 9 ttym0\n \n As you know, \"push data/voice button of Fax modem\" can be substituted by\n kill -USR1 <mgetty-pid>.\n@@ -174,7 +174,7 @@\n 07/03 17:58:49 m0 (Normal and proper end of connection) found \n 07/03 17:58:49 m0 fax receiver: hangup & end\n 07/03 17:58:49 m0 fax_notify_mail: sending mail to: faxadmin\n-07/03 17:58:51 m0 notify: '/usr/local/lib/mgetty+sendfax/new_fax 0 ' ' 1 /usr/spool/fax/incoming/ffe167d6am0.01 >/dev/console 2>&1 </dev/null'\n+07/03 17:58:51 m0 notify: '/usr/lib/mgetty+sendfax/new_fax 0 ' ' 1 /usr/spool/fax/incoming/ffe167d6am0.01 >/dev/console 2>&1 </dev/null'\n 07/03 17:58:51 ##### fax dev=ttym0, pid=1342, caller=none, name='', id=' ', +FHNG=000, pages=1, time=00:01:35\n \n \n--- faxrunq.config\n+++ faxrunq.config\n@@ -21,10 +21,10 @@\n \n # here you can specify a program that will be called for each fax that\n # has successfully been sent... (default: no program)\n-#success-call-program /usr/local/lib/mgetty+sendfax/fax-success\n+#success-call-program /usr/lib/mgetty+sendfax/fax-success\n \n # and this program is run for each failed fax... (default: no program)\n-#failure-call-program /usr/local/lib/mgetty+sendfax/fax-fail\n+#failure-call-program /usr/lib/mgetty+sendfax/fax-fail\n \n # how often should faxrunq retry \"costly\" errors (NO CARRIER, aborted\n # transmission, whatever - something that did cost telephone bill)?\n@@ -58,7 +58,7 @@\n \n # configuration file for policy routing, see faxrunqd man page for\n # details (default: none, i.e. don't use policy routing)\n-#policy-config /usr/local/lib/mgetty+sendfax/policy.config\n+#policy-config /etc/mgetty+sendfax/policy.config\n \n # call an external script if the fax queue length goes over threshold\n # (default: off)\n--- samples/answer_fax.sh\n+++ samples/answer_fax.sh\n@@ -17,7 +17,7 @@\n then\n \t:\n else\n-\t/usr/local/sbin/mgetty $port < /dev/null &\n+\t/usr/sbin/mgetty $port < /dev/null &\n \techo \"starting mgetty...\"\n \tsleep 4\n \tpid=`cat /etc/mg-pid.$port`\n--- samples/coverpg-pl.ps\n+++ samples/coverpg-pl.ps\n@@ -21,7 +21,7 @@\n #\n #-------------------------------------------------------------------------\n \n-#!/usr/local/bin/perl \n+#!/usr/bin/perl \n # \n # make.coverpg -- slightly advanced version, use ghostscript \n # (just a sample, naturally you have to adapt all the texts!) \n--- samples/coverpg.pbm\n+++ samples/coverpg.pbm\n@@ -21,9 +21,9 @@\n # select font according to resolution\n if [ X$normal_res = X ]\n then\n- font=/usr/local/lib/mgetty+sendfax/cour25.pbm\n+ font=/usr/lib/mgetty+sendfax/cour25.pbm\n else\n- font=/usr/local/lib/mgetty+sendfax/cour25n.pbm\n+ font=/usr/lib/mgetty+sendfax/cour25n.pbm\n fi\n \n tmp=/tmp/coverpg.$$\n--- samples/fax\n+++ samples/fax\n@@ -1,10 +1,11 @@\n-#!/bin/ksh\n+#!/bin/bash\n+## ! /bin/ksh\n #\n # fax - interactive tool for creating fax memos\n #\n # relies on \"faxmemo\" being in the PATH and set up properly\n #\n-echo=/usr/local/bin/mg.echo\n+#echo=/usr/local/bin/mg.echo\n \n input()\n {\n--- samples/faxmemo\n+++ samples/faxmemo\n@@ -13,7 +13,7 @@\n # this is the cover page to use for memo. Faxspool will call\n # \"$COVER_PAGE -m <memo-text> <standard options as of coverpg(1)>\n #\n-COVER_PAGE=/usr/local/lib/mgetty+sendfax/make.coverpg\n+COVER_PAGE=/usr/lib/mgetty+sendfax/make.coverpg\n \n if [ $# -lt 2 ]\n then\n--- samples/new_fax.all/README\n+++ samples/new_fax.all/README\n@@ -43,7 +43,7 @@\n \n THE CONFIGURATION FILE\n \n-The configuration file usually has the name /usr/etc/mgetty+sendfax/faxlist\n+The configuration file usually has the name /etc/mgetty+sendfax/faxlist\n but can be moved to any destination. The file is referenced inside new_fax\n with the variable \"config\" in the header. The config file consists of\n sections. Each section contains at least one identifier which must be a\n--- samples/new_fax.all/new_fax\n+++ samples/new_fax.all/new_fax\n@@ -1,4 +1,5 @@\n-#!/bin/ksh\n+#!/bin/bash\n+## ! /bin/ksh\n #\n # Written 1996 by Darko Krizic\n #\n--- samples/new_fax.lj\n+++ samples/new_fax.lj\n@@ -16,7 +16,7 @@\n SENDER=\"$2\"\n PAGES=\"$3\"\n \n-G3TOPBM=/usr/local/bin/g32pbm\n+G3TOPBM=/usr/bin/g32pbm\n shift 3\n P=1\n \n--- samples/new_fax.mime1\n+++ samples/new_fax.mime1\n@@ -1,4 +1,4 @@\n-#!/bin/ksh\n+#!/bin/bash\n #\n # new_fax.mime\n #\n@@ -13,7 +13,7 @@\n # The script needs the ``mh'' mailer installed\n #\n #\n-#! /bin/ksh\n+## ! /bin/ksh\n \n FAX_DIR=/var/spool/fax\n \n@@ -52,7 +52,7 @@\n let page=page+1\n done\n ) >$TMP\n-echo 'send' \| comp -use -editor /usr/local/bin/mh/mhn -file $TMP >/dev/null\n+echo 'send' \| comp -use -editor /usr/bin/mh/mhn -file $TMP >/dev/null\n rm -f $TMP\n \n ## Alternative method (using metamail directly)\n--- samples/new_fax.mime3\n+++ samples/new_fax.mime3\n@@ -1,6 +1,6 @@\n #!/bin/sh\n #\n-# /usr/local/lib/mgetty+sendfax/new_fax\n+# /usr/lib/mgetty+sendfax/new_fax\n #\n # new_fax <getty-exit-code> <fax-sender-id> <number-of-pages> <page> [<page>..]\n #\n@@ -75,4 +75,4 @@\n # Send out the created mail:\n sendmail $ADMIN < $TMPMAIL\n \n-exit 0\n\\ No newline at end of file\n+exit 0\n--- samples/new_fax.pbm\n+++ samples/new_fax.pbm\n@@ -28,7 +28,7 @@\n id=\n for i in $@\n do\n- /usr/local/bin/g32pbm $STRETCH $i \| compress > $i.pbm.Z\n+ /usr/bin/g32pbm $STRETCH $i \| compress > $i.pbm.Z\n # our compress is faster than gzip, so use this here.\n # this make preview faster....\n [ $? -eq 0 -a -f $i.pbm.Z ] && /bin/rm -f $i\n--- samples/new_fax.th\n+++ samples/new_fax.th\n@@ -15,13 +15,13 @@\n # The user to receive the fax and the get the fax viewer on its display\n my $user = 'torsten';\n \n-my $faxviewer = '/usr/local/bin/faxview';\n+my $faxviewer = '/usr/bin/faxview';\n \n my $sendmail = '/usr/sbin/sendmail';\n my $tar = '/bin/tar';\n my $gzip = '/bin/gzip';\n my $su = '/bin/su';\n-my $mmencode = '/usr/local/bin/mmencode';\n+my $mmencode = '/usr/bin/mmencode';\n \n # Information received from mgetty\n my $hangup_code = shift;\n--- samples/new_fax.vacation\n+++ samples/new_fax.vacation\n@@ -25,13 +25,13 @@\n ,,,\n (o o)\n ---------------------------oOO-(_)-OOo---------------------------\n-#!/usr/local/bin/perl\n+#!/usr/bin/perl\n #\n # Ralph Schleicher\n # rs@purple.in-ulm.de\n \n \n-$message = '/usr/local/lib/mgetty+sendfax/vacation.tex';\n+$message = '/usr/lib/mgetty+sendfax/vacation.tex';\n \n exit 0\n if ! -r $message;\t# Do nothing.\n--- voice/contrib/Mark_Haun\n+++ voice/contrib/Mark_Haun\n@@ -28,7 +28,7 @@\n current call-out script (a modified version of the \"notify.sh\" distributed\n with vgetty), in the hope that it will prove useful to someone: \n \n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n function receive\n {\n--- voice/doc/Readme.Beginners\n+++ voice/doc/Readme.Beginners\n@@ -36,7 +36,7 @@\n \n 2. Replace the invocation of mgetty in your /etc/inittab with vgetty if\n there is one. If there is no mgetty invocation you just have to insert\n- a line like that: \"S1:345:respawn:/usr/local/sbin/vgetty ttyxx\" in your\n+ a line like that: \"S1:345:respawn:/usr/sbin/vgetty ttyxx\" in your\n /etc/inittab file. (like that vgetty is running at runlevels 3 4 and 5\n see inittab(5) man page for more)\n \n--- voice/scripts/button.sh\n+++ voice/scripts/button.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is the button script. It is called by vgetty when\n--- voice/scripts/demo.pl\n+++ voice/scripts/demo.pl\n@@ -1,6 +1,6 @@\n-#! /usr/local/bin/vm shell\n-exec /usr/local/bin/perl -x $0\n-#! /usr/local/bin/perl\n+#! /usr/bin/vm shell\n+exec /usr/bin/perl -x $0\n+#! /usr/bin/perl\n \n #\n # This is a demo script for the new interface between shell scripts and\n--- voice/scripts/demo.sh\n+++ voice/scripts/demo.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is a demo script for the new interface between shell scripts and\n--- voice/scripts/dtmf.sh\n+++ voice/scripts/dtmf.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is the dtmf script. It is called by vgetty when a dtmf code was\n--- voice/scripts/events.sh\n+++ voice/scripts/events.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is a demo script for the new event handling interface between\n--- voice/scripts/message.sh\n+++ voice/scripts/message.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This script calls the given phone number and plays a message.\n--- voice/scripts/vmtest.sh\n+++ voice/scripts/vmtest.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is the vmtest script. You can call this script to test voice shell\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "--- contrib/faxdvi2.perl\n+++ contrib/faxdvi2.perl\n@@ -1,4 +1,4 @@\n-#!/usr/local/bin/perl\n+#!/usr/bin/perl\n #\n # faxdvi2 -- pass a DVI file to the FAX subsystem.\n #\n@@ -21,7 +21,7 @@\n # rs@purple.PNoF.sub.org\n \n \n-$config_file = '/usr/local/lib/mgetty+sendfax/faxdvi.config';\n+$config_file = '/usr/lib/mgetty+sendfax/faxdvi.config';\n $user_file = \"$ENV{'HOME'}/.faxdvirc\";\n \n $dvips = 'dvips -t letter -P fax';\n--- contrib/faxiobe.sh\n+++ contrib/faxiobe.sh\n@@ -35,8 +35,8 @@\n X\n X# define GHOSTSCRIPT and SENDFAX correct for you site\n X\n-XGHOSTSCRIPT=\\\"/usr/local/bin/gs\\\"\n-XSENDFAX=\\\"/usr/local/sbin/sendfax -v\\\"\n+XGHOSTSCRIPT=\\\"/usr/bin/gs\\\"\n+XSENDFAX=\\\"/usr/sbin/sendfax -v\\\"\n X\n X# define NOFAX for a dummy program instead of sendfax\n X# this is for debugging. A sample \"nofax\" is in the distribution.\n@@ -160,11 +160,11 @@\n X#define SLEEPTIME 300 /* make multiple of 10 please /\n X\n X#ifndef GHOSTSCRIPT\n-X#define GHOSTSCRIPT \"/usr/local/bin/gs\"\n+X#define GHOSTSCRIPT \"/usr/bin/gs\"\n X#endif\n X\n X#ifndef SENDFAX\n-X#define SENDFAX \"/usr/local/sbin/sendfax\"\n+X#define SENDFAX \"/usr/sbin/sendfax\"\n X#endif\n X\n X#ifndef NOFAX\n--- contrib/lp-fax\n+++ contrib/lp-fax\n@@ -81,7 +81,7 @@\n # send the file(s) to the standard out $copies times\n while\t[ \"$copies\" -gt 0 ]\n do\n-\t/usr/local/bin/faxspool -u $name -f \"$name ($user)\" $fax_no $\n+\t/usr/bin/faxspool -u $name -f \"$name ($user)\" $fax_no $\n #\tfor file\n #\tdo\n #\t\t0<${file} eval ${FILTER} 2>&1 \n--- contrib/mgetty-to-flexfax.sh\n+++ contrib/mgetty-to-flexfax.sh\n@@ -28,7 +28,7 @@\n --- new_fax ---\n #! /bin/sh\n \n-PATH=/usr/local/bin:/usr/ucb:/bin:/usr/local/lib/mgetty+sendfax:$PATH\n+PATH=/usr/local/bin:/usr/ucb:/bin:/usr/lib/mgetty+sendfax:$PATH\n export PATH\n \n FILE=/var/spool/fax/recvq/mgetty.$$\n--- contrib/watchit.pl\n+++ contrib/watchit.pl\n@@ -1,4 +1,4 @@\n-#!/usr/local/bin/perl5\n+#!/usr/bin/perl\n #\n # watchit.pl\n #\n--- doc/Makefile\n+++ doc/Makefile\n@@ -12,11 +12,11 @@\n MAN5PAGES=faxqueue.5\n MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.8\n MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES)\n-MAN1DIR=/usr/local/man/man1\n-MAN4DIR=/usr/local/man/man4\n-MAN5DIR=/usr/local/man/man5\n-MAN8DIR=/usr/local/man/man8\n-INFODIR=/usr/local/info\n+MAN1DIR=/usr/share/man/man1\n+MAN4DIR=/usr/share/man/man4\n+MAN5DIR=/usr/share/man/man5\n+MAN8DIR=/usr/share/man/man8\n+INFODIR=/usr/share/info\n \n #\n # formatted man pages\n--- doc/loginv2.txt\n+++ doc/loginv2.txt\n@@ -29,7 +29,7 @@\n #\n # this is the dummy user name, it's allowed to login only if this \n # is not already an ongoing callback\n-callback\tN\t-\t-\t/usr/local/sbin/callback -S 12345\n+callback\tN\t-\t-\t/usr/sbin/callback -S 12345\n #\n # these are the real users: only allowed if it's a callback (\"Y\")\n \t\tY\t-\t- \t/bin/login @\n--- doc/mgetty.texi-in\n+++ doc/mgetty.texi-in\n@@ -2449,7 +2449,7 @@\n do\n sleep 60\n done\n-exec /usr/local/sbin/mgetty ttyS1\n+exec /usr/sbin/mgetty ttyS1\n @end example\n \n @item\n@@ -3691,7 +3691,7 @@\n add an entry to @file{/etc/inittab} like the following:\n \n @example\n-ya:234:respawn:/usr/local/sbin/mgetty -s 38400 -x 3 term/a\n+ya:234:respawn:/usr/sbin/mgetty -s 38400 -x 3 term/a\n @end example\n \n @emph{Don't use the Solaris @code{admintool} to create any port monitoring\n--- doc/scanner.txt\n+++ doc/scanner.txt\n@@ -44,7 +44,7 @@\n Of course you should set up mgetty for the terminal port of Fax modem as\n follows.\n \n-/usr/local/sbin/mgetty -x 9 ttym0\n+/usr/sbin/mgetty -x 9 ttym0\n \n As you know, \"push data/voice button of Fax modem\" can be substituted by\n kill -USR1 <mgetty-pid>.\n@@ -174,7 +174,7 @@\n 07/03 17:58:49 m0 (Normal and proper end of connection) found \n 07/03 17:58:49 m0 fax receiver: hangup & end\n 07/03 17:58:49 m0 fax_notify_mail: sending mail to: faxadmin\n-07/03 17:58:51 m0 notify: '/usr/local/lib/mgetty+sendfax/new_fax 0 ' ' 1 /usr/spool/fax/incoming/ffe167d6am0.01 >/dev/console 2>&1 </dev/null'\n+07/03 17:58:51 m0 notify: '/usr/lib/mgetty+sendfax/new_fax 0 ' ' 1 /usr/spool/fax/incoming/ffe167d6am0.01 >/dev/console 2>&1 </dev/null'\n 07/03 17:58:51 ##### fax dev=ttym0, pid=1342, caller=none, name='', id=' ', +FHNG=000, pages=1, time=00:01:35\n \n \n--- faxrunq.config\n+++ faxrunq.config\n@@ -21,10 +21,10 @@\n \n # here you can specify a program that will be called for each fax that\n # has successfully been sent... (default: no program)\n-#success-call-program /usr/local/lib/mgetty+sendfax/fax-success\n+#success-call-program /usr/lib/mgetty+sendfax/fax-success\n \n # and this program is run for each failed fax... (default: no program)\n-#failure-call-program /usr/local/lib/mgetty+sendfax/fax-fail\n+#failure-call-program /usr/lib/mgetty+sendfax/fax-fail\n \n # how often should faxrunq retry \"costly\" errors (NO CARRIER, aborted\n # transmission, whatever - something that did cost telephone bill)?\n@@ -58,7 +58,7 @@\n \n # configuration file for policy routing, see faxrunqd man page for\n # details (default: none, i.e. don't use policy routing)\n-#policy-config /usr/local/lib/mgetty+sendfax/policy.config\n+#policy-config /etc/mgetty+sendfax/policy.config\n \n # call an external script if the fax queue length goes over threshold\n # (default: off)\n--- samples/answer_fax.sh\n+++ samples/answer_fax.sh\n@@ -17,7 +17,7 @@\n then\n \t:\n else\n-\t/usr/local/sbin/mgetty $port < /dev/null &\n+\t/usr/sbin/mgetty $port < /dev/null &\n \techo \"starting mgetty...\"\n \tsleep 4\n \tpid=`cat /etc/mg-pid.$port`\n--- samples/coverpg-pl.ps\n+++ samples/coverpg-pl.ps\n@@ -21,7 +21,7 @@\n #\n #-------------------------------------------------------------------------\n \n-#!/usr/local/bin/perl \n+#!/usr/bin/perl \n # \n # make.coverpg -- slightly advanced version, use ghostscript \n # (just a sample, naturally you have to adapt all the texts!) \n--- samples/coverpg.pbm\n+++ samples/coverpg.pbm\n@@ -21,9 +21,9 @@\n # select font according to resolution\n if [ X$normal_res = X ]\n then\n- font=/usr/local/lib/mgetty+sendfax/cour25.pbm\n+ font=/usr/lib/mgetty+sendfax/cour25.pbm\n else\n- font=/usr/local/lib/mgetty+sendfax/cour25n.pbm\n+ font=/usr/lib/mgetty+sendfax/cour25n.pbm\n fi\n \n tmp=/tmp/coverpg.$$\n--- samples/fax\n+++ samples/fax\n@@ -1,10 +1,11 @@\n-#!/bin/ksh\n+#!/bin/bash\n+## ! /bin/ksh\n #\n # fax - interactive tool for creating fax memos\n #\n # relies on \"faxmemo\" being in the PATH and set up properly\n #\n-echo=/usr/local/bin/mg.echo\n+#echo=/usr/local/bin/mg.echo\n \n input()\n {\n--- samples/faxmemo\n+++ samples/faxmemo\n@@ -13,7 +13,7 @@\n # this is the cover page to use for memo. Faxspool will call\n # \"$COVER_PAGE -m <memo-text> <standard options as of coverpg(1)>\n #\n-COVER_PAGE=/usr/local/lib/mgetty+sendfax/make.coverpg\n+COVER_PAGE=/usr/lib/mgetty+sendfax/make.coverpg\n \n if [ $# -lt 2 ]\n then\n--- samples/new_fax.all/README\n+++ samples/new_fax.all/README\n@@ -43,7 +43,7 @@\n \n THE CONFIGURATION FILE\n \n-The configuration file usually has the name /usr/etc/mgetty+sendfax/faxlist\n+The configuration file usually has the name /etc/mgetty+sendfax/faxlist\n but can be moved to any destination. The file is referenced inside new_fax\n with the variable \"config\" in the header. The config file consists of\n sections. Each section contains at least one identifier which must be a\n--- samples/new_fax.all/new_fax\n+++ samples/new_fax.all/new_fax\n@@ -1,4 +1,5 @@\n-#!/bin/ksh\n+#!/bin/bash\n+## ! /bin/ksh\n #\n # Written 1996 by Darko Krizic\n #\n--- samples/new_fax.lj\n+++ samples/new_fax.lj\n@@ -16,7 +16,7 @@\n SENDER=\"$2\"\n PAGES=\"$3\"\n \n-G3TOPBM=/usr/local/bin/g32pbm\n+G3TOPBM=/usr/bin/g32pbm\n shift 3\n P=1\n \n--- samples/new_fax.mime1\n+++ samples/new_fax.mime1\n@@ -1,4 +1,4 @@\n-#!/bin/ksh\n+#!/bin/bash\n #\n # new_fax.mime\n #\n@@ -13,7 +13,7 @@\n # The script needs the ``mh'' mailer installed\n #\n #\n-#! /bin/ksh\n+## ! /bin/ksh\n \n FAX_DIR=/var/spool/fax\n \n@@ -52,7 +52,7 @@\n let page=page+1\n done\n ) >$TMP\n-echo 'send' \| comp -use -editor /usr/local/bin/mh/mhn -file $TMP >/dev/null\n+echo 'send' \| comp -use -editor /usr/bin/mh/mhn -file $TMP >/dev/null\n rm -f $TMP\n \n ## Alternative method (using metamail directly)\n--- samples/new_fax.mime3\n+++ samples/new_fax.mime3\n@@ -1,6 +1,6 @@\n #!/bin/sh\n #\n-# /usr/local/lib/mgetty+sendfax/new_fax\n+# /usr/lib/mgetty+sendfax/new_fax\n #\n # new_fax <getty-exit-code> <fax-sender-id> <number-of-pages> <page> [<page>..]\n #\n@@ -75,4 +75,4 @@\n # Send out the created mail:\n sendmail $ADMIN < $TMPMAIL\n \n-exit 0\n\\ No newline at end of file\n+exit 0\n--- samples/new_fax.pbm\n+++ samples/new_fax.pbm\n@@ -28,7 +28,7 @@\n id=\n for i in $@\n do\n- /usr/local/bin/g32pbm $STRETCH $i \| compress > $i.pbm.Z\n+ /usr/bin/g32pbm $STRETCH $i \| compress > $i.pbm.Z\n # our compress is faster than gzip, so use this here.\n # this make preview faster....\n [ $? -eq 0 -a -f $i.pbm.Z ] && /bin/rm -f $i\n--- samples/new_fax.th\n+++ samples/new_fax.th\n@@ -15,13 +15,13 @@\n # The user to receive the fax and the get the fax viewer on its display\n my $user = 'torsten';\n \n-my $faxviewer = '/usr/local/bin/faxview';\n+my $faxviewer = '/usr/bin/faxview';\n \n my $sendmail = '/usr/sbin/sendmail';\n my $tar = '/bin/tar';\n my $gzip = '/bin/gzip';\n my $su = '/bin/su';\n-my $mmencode = '/usr/local/bin/mmencode';\n+my $mmencode = '/usr/bin/mmencode';\n \n # Information received from mgetty\n my $hangup_code = shift;\n--- samples/new_fax.vacation\n+++ samples/new_fax.vacation\n@@ -25,13 +25,13 @@\n ,,,\n (o o)\n ---------------------------oOO-(_)-OOo---------------------------\n-#!/usr/local/bin/perl\n+#!/usr/bin/perl\n #\n # Ralph Schleicher\n # rs@purple.in-ulm.de\n \n \n-$message = '/usr/local/lib/mgetty+sendfax/vacation.tex';\n+$message = '/usr/lib/mgetty+sendfax/vacation.tex';\n \n exit 0\n if ! -r $message;\t# Do nothing.\n--- voice/contrib/Mark_Haun\n+++ voice/contrib/Mark_Haun\n@@ -28,7 +28,7 @@\n current call-out script (a modified version of the \"notify.sh\" distributed\n with vgetty), in the hope that it will prove useful to someone: \n \n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n function receive\n {\n--- voice/doc/Readme.Beginners\n+++ voice/doc/Readme.Beginners\n@@ -36,7 +36,7 @@\n \n 2. Replace the invocation of mgetty in your /etc/inittab with vgetty if\n there is one. If there is no mgetty invocation you just have to insert\n- a line like that: \"S1:345:respawn:/usr/local/sbin/vgetty ttyxx\" in your\n+ a line like that: \"S1:345:respawn:/usr/sbin/vgetty ttyxx\" in your\n /etc/inittab file. (like that vgetty is running at runlevels 3 4 and 5\n see inittab(5) man page for more)\n \n--- voice/scripts/button.sh\n+++ voice/scripts/button.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is the button script. It is called by vgetty when\n--- voice/scripts/demo.pl\n+++ voice/scripts/demo.pl\n@@ -1,6 +1,6 @@\n-#! /usr/local/bin/vm shell\n-exec /usr/local/bin/perl -x $0\n-#! /usr/local/bin/perl\n+#! /usr/bin/vm shell\n+exec /usr/bin/perl -x $0\n+#! /usr/bin/perl\n \n #\n # This is a demo script for the new interface between shell scripts and\n--- voice/scripts/demo.sh\n+++ voice/scripts/demo.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is a demo script for the new interface between shell scripts and\n--- voice/scripts/dtmf.sh\n+++ voice/scripts/dtmf.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is the dtmf script. It is called by vgetty when a dtmf code was\n--- voice/scripts/events.sh\n+++ voice/scripts/events.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is a demo script for the new event handling interface between\n--- voice/scripts/message.sh\n+++ voice/scripts/message.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This script calls the given phone number and plays a message.\n--- voice/scripts/vmtest.sh\n+++ voice/scripts/vmtest.sh\n@@ -1,4 +1,4 @@\n-#! /usr/local/bin/vm shell\n+#! /usr/bin/vm shell\n \n #\n # This is the vmtest script. You can call this script to test voice shell\n" } ]	{ "id": "mgetty-12289-mgetty-1.1.36-local.patch", "cves": [ "CVE-2019-1010190" ], "package": "mgetty", "incident_id": 12289, "patch_name": "mgetty-1.1.36-local.patch", "tier": "identical", "language": "shell", "patch_lines_changed": 108, "patch_files_count": 0, "total_tokens_est": 6088, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2019-1010190", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-1010190\n\n-function receive\n\n## Package\nmgetty\n\n## Upstream Fix\n```diff\ndiff -Ndur mgetty-1.1.36/voice/scripts/faxback.sh mgetty-1.1.36-fix-bashisms/voice/scripts/faxback.sh\n--- mgetty-1.1.36/voice/scripts/faxback.sh\t1997-06-17 07:31:50.000000000 +0300\n+++ mgetty-1.1.36-fix-bashisms/voice/scripts/faxback.sh\t2014-11-27 04:20:56.541910627 +0200\n@@ -1,13 +1,13 @@\n #!/bin/sh\n #\n \n-function receive\n+receive()\n {\n read -r INPUT <&$VOICE_INPUT;\n echo \"$INPUT\";\n }\n \n-function send\n+send()\n {\n echo $1 >&$VOICE_OUTPUT;\n kill -PIPE $VOICE_PID\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "diff -Ndur mgetty-1.1.36/voice/scripts/faxback.sh mgetty-1.1.36-fix-bashisms/voice/scripts/faxback.sh\n--- mgetty-1.1.36/voice/scripts/faxback.sh\t1997-06-17 07:31:50.000000000 +0300\n+++ mgetty-1.1.36-fix-bashisms/voice/scripts/faxback.sh\t2014-11-27 04:20:56.541910627 +0200\n@@ -1,13 +1,13 @@\n #!/bin/sh\n #\n \n-function receive\n+receive()\n {\n read -r INPUT <&$VOICE_INPUT;\n echo \"$INPUT\";\n }\n \n-function send\n+send()\n {\n echo $1 >&$VOICE_OUTPUT;\n kill -PIPE $VOICE_PID\n" } ]	{ "id": "mgetty-12289-mgetty-1.1.36-fix-bashisms.patch", "cves": [ "CVE-2019-1010190" ], "package": "mgetty", "incident_id": 12289, "patch_name": "mgetty-1.1.36-fix-bashisms.patch", "tier": "identical", "language": "shell", "patch_lines_changed": 4, "patch_files_count": 0, "total_tokens_est": 359, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2019-1010190", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-1010190\n\n===================================================================\n\n## Package\nmgetty\n\n## Files to modify\n- faxrec.c\n- contrib/next-login/login.c\n\n## Upstream Fix\n```diff\nIndex: mgetty-1.1.37/faxrec.c\n===================================================================\n--- mgetty-1.1.37.orig/faxrec.c\n+++ mgetty-1.1.37/faxrec.c\n@@ -192,7 +192,7 @@ time_t\tti;\n \n lprintf( L_NOISE, \"fax_notify_mail: sending mail to: %s\", mail_to );\n \n- sprintf( buf, \"%s %s >/dev/null 2>&1\", MAILER, mail_to );\n+ sprintf( buf, \"%.80s \\\"%.150s\\\" >/dev/null 2>&1\", MAILER, mail_to );\n \n pipe_fp = popen( buf, \"w\" );\n if ( pipe_fp == NULL )\nIndex: mgetty-1.1.37/contrib/next-login/login.c\n===================================================================\n--- mgetty-1.1.37.orig/contrib/next-login/login.c\n+++ mgetty-1.1.37/contrib/next-login/login.c\n@@ -218,7 +218,9 @@ main(argc, argv)\n \t\t\t\tbadlogin(tbuf);\n \t\t\tfailures = 0;\n \t\t}\n-\t\t(void)strcpy(tbuf, username);\n+\t\t(void)strncpy(tbuf, username, sizeof(tbuf)-1);\n+\t\ttbuf[sizeof(tbuf)-1] = '\\0';\n+\n \t\tif (pwd = getpwnam(username))\n \t\t\tsalt = pwd->pw_passwd;\n \t\telse\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: mgetty-1.1.37/faxrec.c\n===================================================================\n--- mgetty-1.1.37.orig/faxrec.c\n+++ mgetty-1.1.37/faxrec.c\n@@ -192,7 +192,7 @@ time_t\tti;\n \n lprintf( L_NOISE, \"fax_notify_mail: sending mail to: %s\", mail_to );\n \n- sprintf( buf, \"%s %s >/dev/null 2>&1\", MAILER, mail_to );\n+ sprintf( buf, \"%.80s \\\"%.150s\\\" >/dev/null 2>&1\", MAILER, mail_to );\n \n pipe_fp = popen( buf, \"w\" );\n if ( pipe_fp == NULL )\nIndex: mgetty-1.1.37/contrib/next-login/login.c\n===================================================================\n--- mgetty-1.1.37.orig/contrib/next-login/login.c\n+++ mgetty-1.1.37/contrib/next-login/login.c\n@@ -218,7 +218,9 @@ main(argc, argv)\n \t\t\t\tbadlogin(tbuf);\n \t\t\tfailures = 0;\n \t\t}\n-\t\t(void)strcpy(tbuf, username);\n+\t\t(void)strncpy(tbuf, username, sizeof(tbuf)-1);\n+\t\ttbuf[sizeof(tbuf)-1] = '\\0';\n+\n \t\tif (pwd = getpwnam(username))\n \t\t\tsalt = pwd->pw_passwd;\n \t\telse\n" } ]	{ "id": "mgetty-12289-mgetty-fix-buffer-overflow.patch", "cves": [ "CVE-2019-1010190" ], "package": "mgetty", "incident_id": 12289, "patch_name": "mgetty-fix-buffer-overflow.patch", "tier": "identical", "language": "c", "patch_lines_changed": 6, "patch_files_count": 2, "total_tokens_est": 608, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2019-1010190", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-1010190\n\nHandle invalid PBM files more gracefully.\n\n## Package\nmgetty\n\n## Files to modify\n- g3/pbm2g3.c\n\n## Upstream Fix\n```diff\nFrom daf1913522efdebb239cd799892c9f9e1dc5af12 Mon Sep 17 00:00:00 2001\nFrom: Gert Doering <gert@greenie.muc.de>\nDate: Thu, 30 Aug 2018 23:53:34 +0200\nSubject: [PATCH] Handle invalid PBM files more gracefully.\n\nA PBM file with a negative line width in the header could lead\nto a crash due to array overrun in putwhitespan() (depending on\noptimization and architecture). Add check for negative values\nfor width and height - if yes, abort with error message.\n\nFound and reported by Eric Sesterhenn <eric.sesterhenn@x41-dsec.de>\n\nSigned-off-by: Gert Doering <gert@greenie.muc.de>\n---\n g3/pbm2g3.c \| 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/g3/pbm2g3.c b/g3/pbm2g3.c\nindex b188b81..54a6386 100644\n--- a/g3/pbm2g3.c\n+++ b/g3/pbm2g3.c\n@@ -449,6 +449,12 @@ int main _P2( (argc, argv), int argc, char ** argv )\n \texit(4);\n }\n \n+ if ( pbm_xsize <= 0 \|\| pbm_ysize <= 0 )\n+ {\n+\tfprintf( stderr, \"%s: malformed PBM file (negative width or height)\\n\", argv[0] );\n+\texit(4);\n+ }\n+\n /* unsupported bitmap types /\n \n if ( pbm_type == pgm \|\| pbm_type == pgm_raw )\n-- \n2.22.0\n\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "From daf1913522efdebb239cd799892c9f9e1dc5af12 Mon Sep 17 00:00:00 2001\nFrom: Gert Doering <gert@greenie.muc.de>\nDate: Thu, 30 Aug 2018 23:53:34 +0200\nSubject: [PATCH] Handle invalid PBM files more gracefully.\n\nA PBM file with a negative line width in the header could lead\nto a crash due to array overrun in putwhitespan() (depending on\noptimization and architecture). Add check for negative values\nfor width and height - if yes, abort with error message.\n\nFound and reported by Eric Sesterhenn <eric.sesterhenn@x41-dsec.de>\n\nSigned-off-by: Gert Doering <gert@greenie.muc.de>\n---\n g3/pbm2g3.c \| 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/g3/pbm2g3.c b/g3/pbm2g3.c\nindex b188b81..54a6386 100644\n--- a/g3/pbm2g3.c\n+++ b/g3/pbm2g3.c\n@@ -449,6 +449,12 @@ int main _P2( (argc, argv), int argc, char * argv )\n \texit(4);\n }\n \n+ if ( pbm_xsize <= 0 \|\| pbm_ysize <= 0 )\n+ {\n+\tfprintf( stderr, \"%s: malformed PBM file (negative width or height)\\n\", argv[0] );\n+\texit(4);\n+ }\n+\n /* unsupported bitmap types */\n \n if ( pbm_type == pgm \|\| pbm_type == pgm_raw )\n-- \n2.22.0\n\n" } ]	{ "id": "mgetty-12289-mgetty-CVE-2019-1010190.patch", "cves": [ "CVE-2019-1010190" ], "package": "mgetty", "incident_id": 12289, "patch_name": "mgetty-CVE-2019-1010190.patch", "tier": "identical", "language": "c", "patch_lines_changed": 7, "patch_files_count": 1, "total_tokens_est": 673, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2019-1010190", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2019-1010190\n\n===================================================================\n\n## Package\nmgetty\n\n## Files to modify\n- contrib/README\n- contrib/scrts.c\n- doc/mgetty.texi-in\n\n## Upstream Fix\n```diff\nIndex: mgetty-1.1.37/contrib/README\n===================================================================\n--- mgetty-1.1.37.orig/contrib/README\n+++ mgetty-1.1.37/contrib/README\n@@ -128,17 +128,6 @@ Make: just go to the mgetty directory, c\n \n gert@greenie.muc.de\n -----------------------------------------------------------\n-scrts.c\n-\n-A small tool for linux (only), to set the CRTSCTS hardware handshake\n-flag. Compile it with \"cc -o scrts scrts.c\", use it with \"scrts <device>\"\n-\n-It will (if possible) open the port in non-blocking mode (you need this\n-if \"stty crtscts </dev/ttyS...\" hangs), and set the CRTSCTS flag. If\n-something goes wrong, it will print an error message.\n-\n-gert@greenie.muc.de\n------------------------------------------------------------\n g3toxwd.c\n \n From:\tChel van Gennip <chel@bazis.nl>\nIndex: mgetty-1.1.37/contrib/scrts.c\n===================================================================\n--- mgetty-1.1.37.orig/contrib/scrts.c\n+++ /dev/null\n@@ -1,42 +0,0 @@\n-/* scrts.c - auxiliary program to set the CRTSCTS flag on serial ttys\n- * called like: \"scrts ttyS1 ttyS5\"\n- * intended to be used on Linux, where sendfax cannot send the\n- * flag itself.\n- /\n-#include <stdio.h>\n-#include <fcntl.h>\n-#include <termios.h>\n-#include <strings.h>\n-\n-int main( int argc, char * argv )\n-{\n-int i, fd;\n-struct termios tio;\n-char device[1000];\n-\n- for ( i=1; i<argc; i++ )\n- {\n-\tif ( strchr( argv[i], '/' ) == NULL )\n-\t sprintf( device, \"/dev/%s\", argv[i] );\n-\telse\n-\t strcpy( device, argv[i] );\n-\n- \tprintf( \"setting CRTSCTS for device %s...\\n\", device );\n-\n- \tfd = open( device, O_RDONLY\|O_NDELAY );\n- \tif ( fd == -1 )\n- \t{ perror( \"open\" ); break; }\n-\n- \tif ( tcgetattr( fd, &tio ) == -1 )\n- \t{ perror( \"tcgetattr\" ); break; }\n-\n-\tif ( ( tio.c_cflag & CRTSCTS ) != 0 ) printf( \"CRTSCTS was already set!\\n\" );\n-\n- \ttio.c_cflag \|= CRTSCTS;\n-\n- \tif ( tcsetattr( fd, TCSANOW, &tio ) == -1 )\n- \t{ perror( \"tcsetattr\" ); break; }\n- \tclose( fd );\n- }\n- return 0;\n-}\nIndex: mgetty-1.1.37/doc/mgetty.texi-in\n===================================================================\n--- mgetty-1.1.37.orig/doc/mgetty.texi-in\n+++ mgetty-1.1.37/doc/mgetty.texi-in\n@@ -3378,11 +3378,6 @@ mgetty 1.1.10 or higher, as the timeout\n versions doesn't work under glibc. Unfortunately, this means that \n the version of mgetty shipped with RedHat 5.0 (1.1.9) won't work. Upgrade!\n \n-Hardware handshake (RTS+CTS) on Linux works flawlessly (but only if mgetty\n-is compiled with POSIX_TERMIOS, but that is default on Linux\n-anyway). Nevertheless, the @code{scrts.c} program in @file{contrib/} is\n-still provided, it has some other uses, too.\n-\n Linux has no poll(S), so, don't #define @code{USE_POLL}, and the default,\n @code{USE_SELECT}, will be used.\n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: mgetty-1.1.37/contrib/README\n===================================================================\n--- mgetty-1.1.37.orig/contrib/README\n+++ mgetty-1.1.37/contrib/README\n@@ -128,17 +128,6 @@ Make: just go to the mgetty directory, c\n \n gert@greenie.muc.de\n -----------------------------------------------------------\n-scrts.c\n-\n-A small tool for linux (only), to set the CRTSCTS hardware handshake\n-flag. Compile it with \"cc -o scrts scrts.c\", use it with \"scrts <device>\"\n-\n-It will (if possible) open the port in non-blocking mode (you need this\n-if \"stty crtscts </dev/ttyS...\" hangs), and set the CRTSCTS flag. If\n-something goes wrong, it will print an error message.\n-\n-gert@greenie.muc.de\n------------------------------------------------------------\n g3toxwd.c\n \n From:\tChel van Gennip <chel@bazis.nl>\nIndex: mgetty-1.1.37/contrib/scrts.c\n===================================================================\n--- mgetty-1.1.37.orig/contrib/scrts.c\n+++ /dev/null\n@@ -1,42 +0,0 @@\n-/* scrts.c - auxiliary program to set the CRTSCTS flag on serial ttys\n- * called like: \"scrts ttyS1 ttyS5\"\n- * intended to be used on Linux, where sendfax cannot send the\n- * flag itself.\n- /\n-#include <stdio.h>\n-#include <fcntl.h>\n-#include <termios.h>\n-#include <strings.h>\n-\n-int main( int argc, char * argv )\n-{\n-int i, fd;\n-struct termios tio;\n-char device[1000];\n-\n- for ( i=1; i<argc; i++ )\n- {\n-\tif ( strchr( argv[i], '/' ) == NULL )\n-\t sprintf( device, \"/dev/%s\", argv[i] );\n-\telse\n-\t strcpy( device, argv[i] );\n-\n- \tprintf( \"setting CRTSCTS for device %s...\\n\", device );\n-\n- \tfd = open( device, O_RDONLY\|O_NDELAY );\n- \tif ( fd == -1 )\n- \t{ perror( \"open\" ); break; }\n-\n- \tif ( tcgetattr( fd, &tio ) == -1 )\n- \t{ perror( \"tcgetattr\" ); break; }\n-\n-\tif ( ( tio.c_cflag & CRTSCTS ) != 0 ) printf( \"CRTSCTS was already set!\\n\" );\n-\n- \ttio.c_cflag \|= CRTSCTS;\n-\n- \tif ( tcsetattr( fd, TCSANOW, &tio ) == -1 )\n- \t{ perror( \"tcsetattr\" ); break; }\n- \tclose( fd );\n- }\n- return 0;\n-}\nIndex: mgetty-1.1.37/doc/mgetty.texi-in\n===================================================================\n--- mgetty-1.1.37.orig/doc/mgetty.texi-in\n+++ mgetty-1.1.37/doc/mgetty.texi-in\n@@ -3378,11 +3378,6 @@ mgetty 1.1.10 or higher, as the timeout\n versions doesn't work under glibc. Unfortunately, this means that \n the version of mgetty shipped with RedHat 5.0 (1.1.9) won't work. Upgrade!\n \n-Hardware handshake (RTS+CTS) on Linux works flawlessly (but only if mgetty\n-is compiled with POSIX_TERMIOS, but that is default on Linux\n-anyway). Nevertheless, the @code{scrts.c} program in @file{contrib/} is\n-still provided, it has some other uses, too.\n-\n Linux has no poll(S), so, don't #define @code{USE_POLL}, and the default,\n @code{USE_SELECT}, will be used.\n \n" } ]	{ "id": "mgetty-12289-mgetty-delete-obsolete.patch", "cves": [ "CVE-2019-1010190" ], "package": "mgetty", "incident_id": 12289, "patch_name": "mgetty-delete-obsolete.patch", "tier": "identical", "language": "c", "patch_lines_changed": 57, "patch_files_count": 3, "total_tokens_est": 1553, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2019-1010190", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2018-13441, CVE-2019-3698, CVE-2018-13458, CVE-2018-18245, CVE-2018-13457\n\ncgi/getcgi.c \| 3 +++\n\n## Package\nnagios\n\n## Files to modify\n- cgi/getcgi.c\n\n## Upstream Fix\n```diff\n---\n cgi/getcgi.c \| 3 +++\n 1 file changed, 3 insertions(+)\n\nIndex: nagios-4.4.2/cgi/getcgi.c\n===================================================================\n--- nagios-4.4.2.orig/cgi/getcgi.c\n+++ nagios-4.4.2/cgi/getcgi.c\n@@ -93,6 +93,9 @@ void unescape_cgi_input(char input) {\n \t\t\tbreak;\n \t\telse if(input[x] == '%') {\n \t\t\tinput[y] = hex_to_char(&input[x + 1]);\n+ if (input[y] == '+') {\n+ input[y] = ' ';\n+ }\n \t\t\tx += 2;\n \t\t\t}\n \t\telse\n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "---\n cgi/getcgi.c \| 3 +++\n 1 file changed, 3 insertions(+)\n\nIndex: nagios-4.4.2/cgi/getcgi.c\n===================================================================\n--- nagios-4.4.2.orig/cgi/getcgi.c\n+++ nagios-4.4.2/cgi/getcgi.c\n@@ -93,6 +93,9 @@ void unescape_cgi_input(char input) {\n \t\t\tbreak;\n \t\telse if(input[x] == '%') {\n \t\t\tinput[y] = hex_to_char(&input[x + 1]);\n+ if (input[y] == '+') {\n+ input[y] = ' ';\n+ }\n \t\t\tx += 2;\n \t\t\t}\n \t\telse\n" } ]	{ "id": "nagios-12298-nagios-fix_encoding_trends.cgi.patch", "cves": [ "CVE-2018-13441", "CVE-2018-13457", "CVE-2018-13458", "CVE-2018-18245", "CVE-2019-3698" ], "package": "nagios", "incident_id": 12298, "patch_name": "nagios-fix_encoding_trends.cgi.patch", "tier": "identical", "language": "c", "patch_lines_changed": 3, "patch_files_count": 1, "total_tokens_est": 392, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2018-13441", "upstream_commit": null, "upstream_repo": null }
[ { "role": "system", "content": "You are a security patch backporting assistant for SUSE/openSUSE.\n\nGiven a CVE description and an upstream fix, adapt the patch to work with\nthe target SUSE package version. Output the backported patch in unified\ndiff format. If the upstream fix applies directly, output it unchanged." }, { "role": "user", "content": "## CVE: CVE-2018-13441, CVE-2019-3698, CVE-2018-13458, CVE-2018-18245, CVE-2018-13457\n\n===================================================================\n\n## Package\nnagios\n\n## Files to modify\n- base/utils.c\n\n## Upstream Fix\n```diff\nIndex: nagios-4.4.2/base/utils.c\n===================================================================\n--- nagios-4.4.2.orig/base/utils.c\n+++ nagios-4.4.2/base/utils.c\n@@ -3297,122 +3297,6 @@ int check_for_nagios_updates(int force,\n \n /* checks for updates at api.nagios.org /\n int query_update_api(void) {\n-\tconst char api_server = \"api.nagios.org\";\n-\tconst char api_path = \"/versioncheck/\";\n-\tchar api_query = NULL;\n-\tchar api_query_opts = NULL;\n-\tchar buf = NULL;\n-\tchar recv_buf[1024];\n-\tint report_install = FALSE;\n-\tchar ptr = NULL;\n-\tint current_line = 0;\n-\tint buf_index = 0;\n-\tint in_header = TRUE;\n-\tchar var = NULL;\n-\tchar val = NULL;\n-\tint sd = 0;\n-\tint send_len = 0;\n-\tint recv_len = 0;\n-\tint update_check_succeeded = FALSE;\n-\n-\t/ report a new install, upgrade, or rollback /\n-\t/ Nagios monitors the world and we monitor Nagios taking over the world. :-) /\n-\tif(last_update_check == (time_t)0L)\n-\t\treport_install = TRUE;\n-\tif(last_program_version == NULL \|\| strcmp(PROGRAM_VERSION, last_program_version))\n-\t\treport_install = TRUE;\n-\tif(report_install == TRUE) {\n-\t\tasprintf(&api_query_opts, \"&firstcheck=1\");\n-\t\tif(last_program_version != NULL) {\n-\t\t\tchar qopts2 = NULL;\n-\t\t\tasprintf(&qopts2, \"%s&last_version=%s\", api_query_opts, last_program_version);\n-\t\t\tmy_free(api_query_opts);\n-\t\t\tapi_query_opts = qopts2;\n-\t\t\t}\n-\t\t}\n-\n-\t/* generate the query /\n-\tasprintf(&api_query, \"v=1&product=nagios&tinycheck=1&stableonly=1&uid=%lu\", update_uid);\n-\tif(bare_update_check == FALSE) {\n-\t\tchar api_query2 = NULL;\n-\t\tasprintf(&api_query2, \"%s&version=%s%s\", api_query, PROGRAM_VERSION, (api_query_opts == NULL) ? \"\" : api_query_opts);\n-\t\tmy_free(api_query);\n-\t\tapi_query = api_query2;\n-\t\t}\n-\n-\t/* generate the HTTP request /\n-\tasprintf(&buf,\n-\t \"POST %s HTTP/1.0\\r\\nUser-Agent: Nagios/%s\\r\\n\"\n-\t \"Connection: close\\r\\nHost: %s\\r\\n\"\n-\t \"Content-Type: application/x-www-form-urlencoded\\r\\n\"\n-\t \"Content-Length: %lu\\r\\n\\r\\n%s\",\n-\t api_path, PROGRAM_VERSION, api_server,\n-\t (unsigned long) strlen(api_query), api_query);\n-\n-\tif (buf == NULL) {\n-\t abort();\n-\t}\n-\n-\tmy_tcp_connect(api_server, 80, &sd, 2);\n-\tif(sd > 0) {\n-\t\t/ send request /\n-\t\tsend_len = strlen(buf);\n-\t\tmy_sendall(sd, buf, &send_len, 2);\n-\n-\t\t/ get response /\n-\t\trecv_len = sizeof(recv_buf);\n-\t\tmy_recvall(sd, recv_buf, &recv_len, 2);\n-\t\trecv_buf[sizeof(recv_buf) - 1] = '\\x0';\n-\n-\t\t/ close connection /\n-\t\tclose(sd);\n-\n-\t\t/ parse the result /\n-\t\tin_header = TRUE;\n-\t\twhile((ptr = get_next_string_from_buf(recv_buf, &buf_index, sizeof(recv_buf)))) {\n-\n-\t\t\tstrip(ptr);\n-\t\t\tcurrent_line++;\n-\n-\t\t\tif(!strcmp(ptr, \"\")) {\n-\t\t\t\tin_header = FALSE;\n-\t\t\t\tcontinue;\n-\t\t\t\t}\n-\t\t\tif(in_header == TRUE)\n-\t\t\t\tcontinue;\n-\n-\t\t\tvar = strtok(ptr, \"=\");\n-\t\t\tval = strtok(NULL, \"\\n\");\n-\n-\t\t\tif(!strcmp(var, \"UPDATE_AVAILABLE\")) {\n-\t\t\t\tupdate_available = atoi(val);\n-\t\t\t\t/ we were successful /\n-\t\t\t\tupdate_check_succeeded = TRUE;\n-\t\t\t\t}\n-\t\t\telse if(!strcmp(var, \"UPDATE_VERSION\")) {\n-\t\t\t\tif(new_program_version)\n-\t\t\t\t\tmy_free(new_program_version);\n-\t\t\t\tnew_program_version = strdup(val);\n-\t\t\t\t}\n-\t\t\telse if(!strcmp(var, \"UPDATE_RELEASEDATE\")) {\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\n-\t/ cleanup /\n-\tmy_free(buf);\n-\tmy_free(api_query);\n-\tmy_free(api_query_opts);\n-\n-\t/ we were successful! /\n-\tif(update_check_succeeded == TRUE) {\n-\n-\t\ttime(&last_update_check);\n-\t\tif(last_program_version)\n-\t\t\tfree(last_program_version);\n-\t\tlast_program_version = (char )strdup(PROGRAM_VERSION);\n-\t\t}\n-\n \treturn OK;\n \t}\n \n\n```\n\nGenerate a backported patch for the SUSE target version." }, { "role": "assistant", "content": "Index: nagios-4.4.2/base/utils.c\n===================================================================\n--- nagios-4.4.2.orig/base/utils.c\n+++ nagios-4.4.2/base/utils.c\n@@ -3297,122 +3297,6 @@ int check_for_nagios_updates(int force,\n \n /* checks for updates at api.nagios.org /\n int query_update_api(void) {\n-\tconst char api_server = \"api.nagios.org\";\n-\tconst char api_path = \"/versioncheck/\";\n-\tchar api_query = NULL;\n-\tchar api_query_opts = NULL;\n-\tchar buf = NULL;\n-\tchar recv_buf[1024];\n-\tint report_install = FALSE;\n-\tchar ptr = NULL;\n-\tint current_line = 0;\n-\tint buf_index = 0;\n-\tint in_header = TRUE;\n-\tchar var = NULL;\n-\tchar val = NULL;\n-\tint sd = 0;\n-\tint send_len = 0;\n-\tint recv_len = 0;\n-\tint update_check_succeeded = FALSE;\n-\n-\t/ report a new install, upgrade, or rollback /\n-\t/ Nagios monitors the world and we monitor Nagios taking over the world. :-) /\n-\tif(last_update_check == (time_t)0L)\n-\t\treport_install = TRUE;\n-\tif(last_program_version == NULL \|\| strcmp(PROGRAM_VERSION, last_program_version))\n-\t\treport_install = TRUE;\n-\tif(report_install == TRUE) {\n-\t\tasprintf(&api_query_opts, \"&firstcheck=1\");\n-\t\tif(last_program_version != NULL) {\n-\t\t\tchar qopts2 = NULL;\n-\t\t\tasprintf(&qopts2, \"%s&last_version=%s\", api_query_opts, last_program_version);\n-\t\t\tmy_free(api_query_opts);\n-\t\t\tapi_query_opts = qopts2;\n-\t\t\t}\n-\t\t}\n-\n-\t/* generate the query /\n-\tasprintf(&api_query, \"v=1&product=nagios&tinycheck=1&stableonly=1&uid=%lu\", update_uid);\n-\tif(bare_update_check == FALSE) {\n-\t\tchar api_query2 = NULL;\n-\t\tasprintf(&api_query2, \"%s&version=%s%s\", api_query, PROGRAM_VERSION, (api_query_opts == NULL) ? \"\" : api_query_opts);\n-\t\tmy_free(api_query);\n-\t\tapi_query = api_query2;\n-\t\t}\n-\n-\t/* generate the HTTP request /\n-\tasprintf(&buf,\n-\t \"POST %s HTTP/1.0\\r\\nUser-Agent: Nagios/%s\\r\\n\"\n-\t \"Connection: close\\r\\nHost: %s\\r\\n\"\n-\t \"Content-Type: application/x-www-form-urlencoded\\r\\n\"\n-\t \"Content-Length: %lu\\r\\n\\r\\n%s\",\n-\t api_path, PROGRAM_VERSION, api_server,\n-\t (unsigned long) strlen(api_query), api_query);\n-\n-\tif (buf == NULL) {\n-\t abort();\n-\t}\n-\n-\tmy_tcp_connect(api_server, 80, &sd, 2);\n-\tif(sd > 0) {\n-\t\t/ send request /\n-\t\tsend_len = strlen(buf);\n-\t\tmy_sendall(sd, buf, &send_len, 2);\n-\n-\t\t/ get response /\n-\t\trecv_len = sizeof(recv_buf);\n-\t\tmy_recvall(sd, recv_buf, &recv_len, 2);\n-\t\trecv_buf[sizeof(recv_buf) - 1] = '\\x0';\n-\n-\t\t/ close connection /\n-\t\tclose(sd);\n-\n-\t\t/ parse the result /\n-\t\tin_header = TRUE;\n-\t\twhile((ptr = get_next_string_from_buf(recv_buf, &buf_index, sizeof(recv_buf)))) {\n-\n-\t\t\tstrip(ptr);\n-\t\t\tcurrent_line++;\n-\n-\t\t\tif(!strcmp(ptr, \"\")) {\n-\t\t\t\tin_header = FALSE;\n-\t\t\t\tcontinue;\n-\t\t\t\t}\n-\t\t\tif(in_header == TRUE)\n-\t\t\t\tcontinue;\n-\n-\t\t\tvar = strtok(ptr, \"=\");\n-\t\t\tval = strtok(NULL, \"\\n\");\n-\n-\t\t\tif(!strcmp(var, \"UPDATE_AVAILABLE\")) {\n-\t\t\t\tupdate_available = atoi(val);\n-\t\t\t\t/ we were successful /\n-\t\t\t\tupdate_check_succeeded = TRUE;\n-\t\t\t\t}\n-\t\t\telse if(!strcmp(var, \"UPDATE_VERSION\")) {\n-\t\t\t\tif(new_program_version)\n-\t\t\t\t\tmy_free(new_program_version);\n-\t\t\t\tnew_program_version = strdup(val);\n-\t\t\t\t}\n-\t\t\telse if(!strcmp(var, \"UPDATE_RELEASEDATE\")) {\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\n-\t/ cleanup /\n-\tmy_free(buf);\n-\tmy_free(api_query);\n-\tmy_free(api_query_opts);\n-\n-\t/ we were successful! /\n-\tif(update_check_succeeded == TRUE) {\n-\n-\t\ttime(&last_update_check);\n-\t\tif(last_program_version)\n-\t\t\tfree(last_program_version);\n-\t\tlast_program_version = (char )strdup(PROGRAM_VERSION);\n-\t\t}\n-\n \treturn OK;\n \t}\n \n" } ]	{ "id": "nagios-12298-nagios-disable_phone_home.patch", "cves": [ "CVE-2018-13441", "CVE-2018-13457", "CVE-2018-13458", "CVE-2018-18245", "CVE-2019-3698" ], "package": "nagios", "incident_id": 12298, "patch_name": "nagios-disable_phone_home.patch", "tier": "identical", "language": "c", "patch_lines_changed": 116, "patch_files_count": 1, "total_tokens_est": 1899, "has_source_context": false, "upstream_enriched": false, "suse_license": "GPL-2.0-or-later", "upstream_license": null, "cve_id": "CVE-2018-13441", "upstream_commit": null, "upstream_repo": null }

Subsets and Splits

No community queries yet

The top public SQL queries from the community will appear here once available.