Accepting request 242845 from home:vitezslav_cizek:branches:Archiving
- fix a truncation check in mt * added cpio-fix_truncation_check.patch - prevent cpio from extracting over a symlink (bnc#658010) * added cpio-check_for_symlinks.patch OBS-URL: https://build.opensuse.org/request/show/242845 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=44
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
21da25607d
commit
d69eec703b
152
cpio-check_for_symlinks.patch
Normal file
152
cpio-check_for_symlinks.patch
Normal file
@ -0,0 +1,152 @@
|
||||
Index: cpio-2.11/src/copyin.c
|
||||
===================================================================
|
||||
--- cpio-2.11.orig/src/copyin.c 2014-07-01 14:02:39.991007263 +0200
|
||||
+++ cpio-2.11/src/copyin.c 2014-07-22 16:05:28.171344584 +0200
|
||||
@@ -686,6 +686,51 @@ copyin_link(struct cpio_file_stat *file_
|
||||
free (link_name);
|
||||
}
|
||||
|
||||
+
|
||||
+static int
|
||||
+path_contains_symlink(char *path)
|
||||
+{
|
||||
+ struct stat st;
|
||||
+ char *slash;
|
||||
+ char *nextslash;
|
||||
+
|
||||
+ /* we got NULL pointer or empty string */
|
||||
+ if (!path || !*path) {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ slash = path;
|
||||
+
|
||||
+ while ((nextslash = strchr(slash + 1, '/')) != NULL) {
|
||||
+ slash = nextslash;
|
||||
+ *slash = '\0';
|
||||
+
|
||||
+ if (lstat(path, &st) != 0) {
|
||||
+ if (errno == ELOOP) {
|
||||
+ /* ELOOP - too many symlinks */
|
||||
+ *slash = '/';
|
||||
+ return true;
|
||||
+ } else if (errno == ENOMEM) {
|
||||
+ /* No memory for lstat - terminate */
|
||||
+ xalloc_die();
|
||||
+ } else {
|
||||
+ /* cannot lstat path - give up */
|
||||
+ *slash = '/';
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (S_ISLNK(st.st_mode)) {
|
||||
+ *slash = '/';
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ *slash = '/';
|
||||
+ }
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
copyin_file (struct cpio_file_stat *file_hdr, int in_file_des)
|
||||
{
|
||||
@@ -1463,6 +1508,23 @@ process_copy_in ()
|
||||
{
|
||||
/* Copy the input file into the directory structure. */
|
||||
|
||||
+ /* Can we write files over symlinks? */
|
||||
+ if (!extract_over_symlinks)
|
||||
+ {
|
||||
+ if (path_contains_symlink(file_hdr.c_name))
|
||||
+ {
|
||||
+ /* skip the file */
|
||||
+ /*
|
||||
+ fprintf(stderr, "Can't write over symlinks. Skipping %s\n", file_hdr.c_name);
|
||||
+ tape_toss_input (in_file_des, file_hdr.c_filesize);
|
||||
+ tape_skip_padding (in_file_des, file_hdr.c_filesize);
|
||||
+ continue;
|
||||
+ */
|
||||
+ /* terminate */
|
||||
+ error (1, 0, _("Can't write over symlinks: %s\n"), file_hdr.c_name);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/* Do we need to rename the file? */
|
||||
if (rename_flag || rename_batch_file)
|
||||
{
|
||||
Index: cpio-2.11/src/global.c
|
||||
===================================================================
|
||||
--- cpio-2.11.orig/src/global.c 2014-07-17 16:33:09.768900927 +0200
|
||||
+++ cpio-2.11/src/global.c 2014-07-21 17:45:58.563494706 +0200
|
||||
@@ -187,6 +187,9 @@ bool to_stdout_option = false;
|
||||
/* The name this program was run with. */
|
||||
char *program_name;
|
||||
|
||||
+/* Extract files over symbolic links */
|
||||
+bool extract_over_symlinks;
|
||||
+
|
||||
/* A pointer to either lstat or stat, depending on whether
|
||||
dereferencing of symlinks is done for input files. */
|
||||
int (*xstat) ();
|
||||
Index: cpio-2.11/src/main.c
|
||||
===================================================================
|
||||
--- cpio-2.11.orig/src/main.c 2014-07-01 14:02:39.840005051 +0200
|
||||
+++ cpio-2.11/src/main.c 2014-07-17 20:33:47.839215571 +0200
|
||||
@@ -57,7 +57,8 @@ enum cpio_options {
|
||||
FORCE_LOCAL_OPTION,
|
||||
DEBUG_OPTION,
|
||||
BLOCK_SIZE_OPTION,
|
||||
- TO_STDOUT_OPTION
|
||||
+ TO_STDOUT_OPTION,
|
||||
+ EXTRACT_OVER_SYMLINKS
|
||||
};
|
||||
|
||||
const char *program_authors[] =
|
||||
@@ -222,6 +223,8 @@ static struct argp_option options[] = {
|
||||
N_("Create leading directories where needed"), GRID+1 },
|
||||
{"no-preserve-owner", NO_PRESERVE_OWNER_OPTION, 0, 0,
|
||||
N_("Do not change the ownership of the files"), GRID+1 },
|
||||
+ {"extract-over-symlinks", EXTRACT_OVER_SYMLINKS, 0, 0,
|
||||
+ N_("Force writing over symbolic links"), GRID+1 },
|
||||
{"unconditional", 'u', NULL, 0,
|
||||
N_("Replace all files unconditionally"), GRID+1 },
|
||||
{"sparse", SPARSE_OPTION, NULL, 0,
|
||||
@@ -413,6 +416,10 @@ crc newc odc bin ustar tar (all-caps als
|
||||
no_chown_flag = true;
|
||||
break;
|
||||
|
||||
+ case EXTRACT_OVER_SYMLINKS: /* --extract-over-symlinks */
|
||||
+ extract_over_symlinks = true;
|
||||
+ break;
|
||||
+
|
||||
case 'o': /* Copy-out mode. */
|
||||
if (copy_function != 0)
|
||||
error (PAXEXIT_FAILURE, 0, _("Mode already defined"));
|
||||
Index: cpio-2.11/src/extern.h
|
||||
===================================================================
|
||||
--- cpio-2.11.orig/src/extern.h 2014-07-01 14:02:39.907006032 +0200
|
||||
+++ cpio-2.11/src/extern.h 2014-07-17 17:11:20.948908806 +0200
|
||||
@@ -95,6 +95,7 @@ extern char input_is_special;
|
||||
extern char output_is_special;
|
||||
extern char input_is_seekable;
|
||||
extern char output_is_seekable;
|
||||
+extern bool extract_over_symlinks;
|
||||
extern int (*xstat) ();
|
||||
extern void (*copy_function) ();
|
||||
|
||||
Index: cpio-2.11/doc/cpio.1
|
||||
===================================================================
|
||||
--- cpio-2.11.orig/doc/cpio.1 2009-02-14 19:15:50.000000000 +0100
|
||||
+++ cpio-2.11/doc/cpio.1 2014-07-21 23:00:33.878746855 +0200
|
||||
@@ -22,6 +22,7 @@ cpio \- copy files to and from archives
|
||||
[\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message]
|
||||
[\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse]
|
||||
[\-\-only\-verify\-crc] [\-\-to\-stdout] [\-\-quiet] [\-\-rsh-command=command]
|
||||
+[\-\-extract\-over\-symlinks]
|
||||
[\-\-help] [\-\-version] [pattern...] [< archive]
|
||||
|
||||
.B cpio
|
||||
13
cpio-fix_truncation_check.patch
Normal file
13
cpio-fix_truncation_check.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: cpio-2.11/src/mt.c
|
||||
===================================================================
|
||||
--- cpio-2.11.orig/src/mt.c 2014-07-29 11:02:31.631881572 +0200
|
||||
+++ cpio-2.11/src/mt.c 2014-07-29 11:02:31.665881951 +0200
|
||||
@@ -428,7 +428,7 @@ parse_opt (int key, char *arg, struct ar
|
||||
{
|
||||
char *p;
|
||||
long val = strtol (arg, &p, 0);
|
||||
- if (*p || (count = val) != count)
|
||||
+ if (*p || (count = val) != val)
|
||||
error (MT_EXIT_INVOP, 0, _("invalid count value"));
|
||||
}
|
||||
break;
|
||||
12
cpio.changes
12
cpio.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 29 10:23:21 UTC 2014 - vcizek@suse.com
|
||||
|
||||
- fix a truncation check in mt
|
||||
* added cpio-fix_truncation_check.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 17 18:40:27 UTC 2014 - vcizek@suse.com
|
||||
|
||||
- prevent cpio from extracting over a symlink (bnc#658010)
|
||||
* added cpio-check_for_symlinks.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 23 11:43:47 UTC 2013 - vcizek@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package cpio
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -43,6 +43,8 @@ Patch20: cpio-close_files_after_copy.patch
|
||||
Patch21: cpio-pattern-file-sigsegv.patch
|
||||
Patch22: cpio-stdio.in.patch
|
||||
Patch23: paxutils-rtapelib_mtget.patch
|
||||
Patch24: cpio-check_for_symlinks.patch
|
||||
Patch25: cpio-fix_truncation_check.patch
|
||||
|
||||
PreReq: %install_info_prereq
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -82,6 +84,8 @@ Authors:
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
#chmod 755 .
|
||||
#chmod u+w *
|
||||
#chmod a+r *
|
||||
|
||||
Loading…
Reference in New Issue
Block a user