From 2c54f70b1a33f339a36600b9c4df857ea9e1adf0 Mon Sep 17 00:00:00 2001 From: magnificGH Date: Mon, 14 Mar 2022 16:30:10 +0800 Subject: [PATCH 1/5] change static file mode to 644 Signed-off-by: magnificGH --- BUILD.gn | 0 OAT.xml | 0 config.h | 0 gio/tests/gdbus-example-peer.c | 0 glib/ggettext.c | 0 glib/gi18n.h | 0 glib/glibconfig.h | 0 gmodule/gmoduleconf.h | 0 gobject/glib-enumtypes.c | 0 gobject/glib-enumtypes.h | 0 10 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 BUILD.gn mode change 100755 => 100644 OAT.xml mode change 100755 => 100644 config.h mode change 100755 => 100644 gio/tests/gdbus-example-peer.c mode change 100755 => 100644 glib/ggettext.c mode change 100755 => 100644 glib/gi18n.h mode change 100755 => 100644 glib/glibconfig.h mode change 100755 => 100644 gmodule/gmoduleconf.h mode change 100755 => 100644 gobject/glib-enumtypes.c mode change 100755 => 100644 gobject/glib-enumtypes.h diff --git a/BUILD.gn b/BUILD.gn old mode 100755 new mode 100644 diff --git a/OAT.xml b/OAT.xml old mode 100755 new mode 100644 diff --git a/config.h b/config.h old mode 100755 new mode 100644 diff --git a/gio/tests/gdbus-example-peer.c b/gio/tests/gdbus-example-peer.c old mode 100755 new mode 100644 diff --git a/glib/ggettext.c b/glib/ggettext.c old mode 100755 new mode 100644 diff --git a/glib/gi18n.h b/glib/gi18n.h old mode 100755 new mode 100644 diff --git a/glib/glibconfig.h b/glib/glibconfig.h old mode 100755 new mode 100644 diff --git a/gmodule/gmoduleconf.h b/gmodule/gmoduleconf.h old mode 100755 new mode 100644 diff --git a/gobject/glib-enumtypes.c b/gobject/glib-enumtypes.c old mode 100755 new mode 100644 diff --git a/gobject/glib-enumtypes.h b/gobject/glib-enumtypes.h old mode 100755 new mode 100644 -- Gitee From 6acb191dfac62c6c9c1d872d31a359b9d308b915 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 18 Mar 2022 20:19:12 +0800 Subject: [PATCH 2/5] CVE update Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I573b771f7f7a55cddb9f21f30179806aa713b0fd --- gio/tests/async-close-output-stream.c | 2 + gio/tests/file.c | 111 +++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/gio/tests/async-close-output-stream.c b/gio/tests/async-close-output-stream.c index 00e0687..d3f97a1 100644 --- a/gio/tests/async-close-output-stream.c +++ b/gio/tests/async-close-output-stream.c @@ -24,6 +24,8 @@ #include #include +#include "gstrfuncsprivate.h" + #define DATA_TO_WRITE "Hello world\n" typedef struct diff --git a/gio/tests/file.c b/gio/tests/file.c index efb2eaa..5b02526 100644 --- a/gio/tests/file.c +++ b/gio/tests/file.c @@ -685,7 +685,7 @@ test_replace_cancel (void) guint count; GError *error = NULL; - g_test_bug ("629301"); + g_test_bug ("https://bugzilla.gnome.org/629301"); path = g_dir_make_tmp ("g_file_replace_cancel_XXXXXX", &error); g_assert_no_error (error); @@ -804,6 +804,112 @@ test_replace_cancel (void) g_object_unref (tmpdir); } +static void +test_replace_symlink (void) +{ +#ifdef G_OS_UNIX + gchar *tmpdir_path = NULL; + GFile *tmpdir = NULL, *source_file = NULL, *target_file = NULL; + GFileOutputStream *stream = NULL; + const gchar *new_contents = "this is a test message which should be written to source and not target"; + gsize n_written; + GFileEnumerator *enumerator = NULL; + GFileInfo *info = NULL; + gchar *contents = NULL; + gsize length = 0; + GError *local_error = NULL; + + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2325"); + + /* Create a fresh, empty working directory. */ + tmpdir_path = g_dir_make_tmp ("g_file_replace_symlink_XXXXXX", &local_error); + g_assert_no_error (local_error); + tmpdir = g_file_new_for_path (tmpdir_path); + + g_test_message ("Using temporary directory %s", tmpdir_path); + g_free (tmpdir_path); + + /* Create symlink `source` which points to `target`. */ + source_file = g_file_get_child (tmpdir, "source"); + target_file = g_file_get_child (tmpdir, "target"); + g_file_make_symbolic_link (source_file, "target", NULL, &local_error); + g_assert_no_error (local_error); + + /* Ensure that `target` doesn’t exist */ + g_assert_false (g_file_query_exists (target_file, NULL)); + + /* Replace the `source` symlink with a regular file using + * %G_FILE_CREATE_REPLACE_DESTINATION, which should replace it *without* + * following the symlink */ + stream = g_file_replace (source_file, NULL, FALSE /* no backup */, + G_FILE_CREATE_REPLACE_DESTINATION, NULL, &local_error); + g_assert_no_error (local_error); + + g_output_stream_write_all (G_OUTPUT_STREAM (stream), new_contents, strlen (new_contents), + &n_written, NULL, &local_error); + g_assert_no_error (local_error); + g_assert_cmpint (n_written, ==, strlen (new_contents)); + + g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, &local_error); + g_assert_no_error (local_error); + + g_clear_object (&stream); + + /* At this point, there should still only be one file: `source`. It should + * now be a regular file. `target` should not exist. */ + enumerator = g_file_enumerate_children (tmpdir, + G_FILE_ATTRIBUTE_STANDARD_NAME "," + G_FILE_ATTRIBUTE_STANDARD_TYPE, + G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &local_error); + g_assert_no_error (local_error); + + info = g_file_enumerator_next_file (enumerator, NULL, &local_error); + g_assert_no_error (local_error); + g_assert_nonnull (info); + + g_assert_cmpstr (g_file_info_get_name (info), ==, "source"); + g_assert_cmpint (g_file_info_get_file_type (info), ==, G_FILE_TYPE_REGULAR); + + g_clear_object (&info); + + info = g_file_enumerator_next_file (enumerator, NULL, &local_error); + g_assert_no_error (local_error); + g_assert_null (info); + + g_file_enumerator_close (enumerator, NULL, &local_error); + g_assert_no_error (local_error); + g_clear_object (&enumerator); + + /* Double-check that `target` doesn’t exist */ + g_assert_false (g_file_query_exists (target_file, NULL)); + + /* Check the content of `source`. */ + g_file_load_contents (source_file, + NULL, + &contents, + &length, + NULL, + &local_error); + g_assert_no_error (local_error); + g_assert_cmpstr (contents, ==, new_contents); + g_assert_cmpuint (length, ==, strlen (new_contents)); + g_free (contents); + + /* Tidy up. */ + g_file_delete (source_file, NULL, &local_error); + g_assert_no_error (local_error); + + g_file_delete (tmpdir, NULL, &local_error); + g_assert_no_error (local_error); + + g_clear_object (&target_file); + g_clear_object (&source_file); + g_clear_object (&tmpdir); +#else /* if !G_OS_UNIX */ + g_test_skip ("Symlink replacement tests can only be run on Unix") +#endif +} + static void on_file_deleted (GObject *object, GAsyncResult *result, @@ -1739,7 +1845,7 @@ main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); - g_test_bug_base ("http://bugzilla.gnome.org/"); + g_test_bug_base (""); g_test_add_func ("/file/basic", test_basic); g_test_add_func ("/file/build-filename", test_build_filename); @@ -1754,6 +1860,7 @@ main (int argc, char *argv[]) g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINTER (4096), test_create_delete); g_test_add_func ("/file/replace-load", test_replace_load); g_test_add_func ("/file/replace-cancel", test_replace_cancel); + g_test_add_func ("/file/replace-symlink", test_replace_symlink); g_test_add_func ("/file/async-delete", test_async_delete); #ifdef G_OS_UNIX g_test_add_func ("/file/copy-preserve-mode", test_copy_preserve_mode); -- Gitee From 90135d9db262d54fe62f17b9386e02bc452a1235 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 18 Mar 2022 20:22:50 +0800 Subject: [PATCH 3/5] CVE update Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I511e57fd40d6771aa4a01f9b345bf963125778c3 --- gio/glocalfileoutputstream.c | 100 +++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 34 deletions(-) diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c index a3dd621..f470578 100644 --- a/gio/glocalfileoutputstream.c +++ b/gio/glocalfileoutputstream.c @@ -58,6 +58,12 @@ #define O_BINARY 0 #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#else +#define HAVE_O_CLOEXEC 1 +#endif + struct _GLocalFileOutputStreamPrivate { char *tmp_filename; char *original_filename; @@ -847,11 +853,12 @@ handle_overwrite_open (const char *filename, int res; int mode; int errsv; + gboolean replace_destination_set = (flags & G_FILE_CREATE_REPLACE_DESTINATION); mode = mode_from_flags_or_info (flags, reference_info); /* We only need read access to the original file if we are creating a backup. - * We also add O_CREATE to avoid a race if the file was just removed */ + * We also add O_CREAT to avoid a race if the file was just removed */ if (create_backup || readable) open_flags = O_RDWR | O_CREAT | O_BINARY; else @@ -874,16 +881,22 @@ handle_overwrite_open (const char *filename, /* Could be a symlink, or it could be a regular ELOOP error, * but then the next open will fail too. */ is_symlink = TRUE; - fd = g_open (filename, open_flags, mode); + if (!replace_destination_set) + fd = g_open (filename, open_flags, mode); } -#else - fd = g_open (filename, open_flags, mode); - errsv = errno; +#else /* if !O_NOFOLLOW */ /* This is racy, but we do it as soon as possible to minimize the race */ is_symlink = g_file_test (filename, G_FILE_TEST_IS_SYMLINK); + + if (!is_symlink || !replace_destination_set) + { + fd = g_open (filename, open_flags, mode); + errsv = errno; + } #endif - if (fd == -1) + if (fd == -1 && + (!is_symlink || !replace_destination_set)) { char *display_name = g_filename_display_name (filename); g_set_error (error, G_IO_ERROR, @@ -897,7 +910,10 @@ handle_overwrite_open (const char *filename, #ifdef G_OS_WIN32 res = GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); #else - res = fstat (fd, &original_stat); + if (!is_symlink) + res = fstat (fd, &original_stat); + else + res = lstat (filename, &original_stat); #endif errsv = errno; @@ -909,23 +925,33 @@ handle_overwrite_open (const char *filename, _("Error when getting information for file “%s”: %s"), display_name, g_strerror (errsv)); g_free (display_name); - goto err_out; + goto error; } /* not a regular file */ if (!S_ISREG (original_stat.st_mode)) { if (S_ISDIR (original_stat.st_mode)) - g_set_error_literal (error, - G_IO_ERROR, - G_IO_ERROR_IS_DIRECTORY, - _("Target file is a directory")); - else - g_set_error_literal (error, + { + g_set_error_literal (error, + G_IO_ERROR, + G_IO_ERROR_IS_DIRECTORY, + _("Target file is a directory")); + goto error; + } + else if (!is_symlink || +#ifdef S_ISLNK + !S_ISLNK (original_stat.st_mode) +#else + FALSE +#endif + ) + { + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, _("Target file is not a regular file")); - goto err_out; + goto error; } if (etag != NULL) @@ -938,7 +964,7 @@ handle_overwrite_open (const char *filename, G_IO_ERROR_WRONG_ETAG, _("The file was externally modified")); g_free (current_etag); - goto err_out; + goto error; } g_free (current_etag); } @@ -954,7 +980,7 @@ handle_overwrite_open (const char *filename, * to a backup file and rewrite the contents of the file. */ - if ((flags & G_FILE_CREATE_REPLACE_DESTINATION) || + if (replace_destination_set || (!(original_stat.st_nlink > 1) && !is_symlink)) { char *dirname, *tmp_filename; @@ -973,7 +999,7 @@ handle_overwrite_open (const char *filename, /* try to keep permissions (unless replacing) */ - if ( ! (flags & G_FILE_CREATE_REPLACE_DESTINATION) && + if (!replace_destination_set && ( #ifdef HAVE_FCHOWN fchown (tmpfd, original_stat.st_uid, original_stat.st_gid) == -1 || @@ -1006,7 +1032,8 @@ handle_overwrite_open (const char *filename, } } - g_close (fd, NULL); + if (fd >= 0) + g_close (fd, NULL); *temp_filename = tmp_filename; return tmpfd; } @@ -1030,7 +1057,7 @@ handle_overwrite_open (const char *filename, G_IO_ERROR_CANT_CREATE_BACKUP, _("Backup file creation failed")); g_free (backup_filename); - goto err_out; + goto error; } bfd = g_open (backup_filename, @@ -1044,7 +1071,7 @@ handle_overwrite_open (const char *filename, G_IO_ERROR_CANT_CREATE_BACKUP, _("Backup file creation failed")); g_free (backup_filename); - goto err_out; + goto error; } /* If needed, Try to set the group of the backup same as the @@ -1061,7 +1088,7 @@ handle_overwrite_open (const char *filename, g_unlink (backup_filename); g_close (bfd, NULL); g_free (backup_filename); - goto err_out; + goto error; } if ((original_stat.st_gid != tmp_statbuf.st_gid) && @@ -1078,7 +1105,7 @@ handle_overwrite_open (const char *filename, g_unlink (backup_filename); g_close (bfd, NULL); g_free (backup_filename); - goto err_out; + goto error; } } #endif @@ -1093,7 +1120,7 @@ handle_overwrite_open (const char *filename, g_close (bfd, NULL); g_free (backup_filename); - goto err_out; + goto error; } g_close (bfd, NULL); @@ -1108,11 +1135,11 @@ handle_overwrite_open (const char *filename, g_io_error_from_errno (errsv), _("Error seeking in file: %s"), g_strerror (errsv)); - goto err_out; + goto error; } } - if (flags & G_FILE_CREATE_REPLACE_DESTINATION) + if (replace_destination_set) { g_close (fd, NULL); @@ -1124,7 +1151,7 @@ handle_overwrite_open (const char *filename, g_io_error_from_errno (errsv), _("Error removing old file: %s"), g_strerror (errsv)); - goto err_out2; + goto error; } if (readable) @@ -1141,7 +1168,7 @@ handle_overwrite_open (const char *filename, _("Error opening file “%s”: %s"), display_name, g_strerror (errsv)); g_free (display_name); - goto err_out2; + goto error; } } else @@ -1159,15 +1186,16 @@ handle_overwrite_open (const char *filename, g_io_error_from_errno (errsv), _("Error truncating file: %s"), g_strerror (errsv)); - goto err_out; + goto error; } } return fd; - err_out: - g_close (fd, NULL); - err_out2: +error: + if (fd >= 0) + g_close (fd, NULL); + return -1; } @@ -1197,7 +1225,7 @@ _g_local_file_output_stream_replace (const char *filename, sync_on_close = FALSE; /* If the file doesn't exist, create it */ - open_flags = O_CREAT | O_EXCL | O_BINARY; + open_flags = O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC; if (readable) open_flags |= O_RDWR; else @@ -1228,7 +1256,11 @@ _g_local_file_output_stream_replace (const char *filename, return NULL; } - +#if !defined(HAVE_O_CLOEXEC) && defined(F_SETFD) + else + fcntl (fd, F_SETFD, FD_CLOEXEC); +#endif + stream = g_object_new (G_TYPE_LOCAL_FILE_OUTPUT_STREAM, NULL); stream->priv->fd = fd; stream->priv->sync_on_close = sync_on_close; -- Gitee From 106baadee5baf6123de70219aec79a5237424823 Mon Sep 17 00:00:00 2001 From: huang-xl Date: Fri, 18 Mar 2022 20:23:44 +0800 Subject: [PATCH 4/5] CVE update Signed-off-by: huang-xl Signed-off-by: huang-xl Change-Id: I5eea76d62b6edab2760ec01698cc4bad27e930d4 --- gio/tests/async-close-output-stream.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/gio/tests/async-close-output-stream.c b/gio/tests/async-close-output-stream.c index d3f97a1..00e0687 100644 --- a/gio/tests/async-close-output-stream.c +++ b/gio/tests/async-close-output-stream.c @@ -24,8 +24,6 @@ #include #include -#include "gstrfuncsprivate.h" - #define DATA_TO_WRITE "Hello world\n" typedef struct -- Gitee From 4a24c1b2df5aaaa5825f451aca3bbf2021a8532c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E7=9C=BC=E5=9C=88?= Date: Fri, 18 Mar 2022 13:52:29 +0000 Subject: [PATCH 5/5] Signed-off-by: huang-xl --- gio/glocalfileoutputstream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c index f470578..3222886 100644 --- a/gio/glocalfileoutputstream.c +++ b/gio/glocalfileoutputstream.c @@ -951,7 +951,8 @@ handle_overwrite_open (const char *filename, G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, _("Target file is not a regular file")); - goto error; + goto error; + } } if (etag != NULL) -- Gitee