summaryrefslogtreecommitdiff
path: root/builtins
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-09-25 20:18:40 +0200
committerDaniil Baturin <daniil@baturin.org>2014-09-25 20:18:40 +0200
commit38f3ad640a2ce50cbf934db240afaab2eda2da27 (patch)
tree7ffed568f4f97428792c23bd0fdffe25257b3d0e /builtins
parentc196461c4a8e7376d1ce7a1ae675f73861a751cd (diff)
downloadvyatta-bash-38f3ad640a2ce50cbf934db240afaab2eda2da27.tar.gz
vyatta-bash-38f3ad640a2ce50cbf934db240afaab2eda2da27.zip
CVE-2014-6271: Import patch by Chet Ramey.
Diffstat (limited to 'builtins')
-rw-r--r--builtins/common.h2
-rw-r--r--builtins/evalstring.c11
2 files changed, 13 insertions, 0 deletions
diff --git a/builtins/common.h b/builtins/common.h
index efbb078..39ba687 100644
--- a/builtins/common.h
+++ b/builtins/common.h
@@ -35,6 +35,8 @@
#define SEVAL_NOLONGJMP 0x040
/* Flags for describe_command, shared between type.def and command.def */
+#define SEVAL_FUNCDEF 0x080 /* only allow function definitions */
+#define SEVAL_ONECMD 0x100 /* only allow a single command */
#define CDESC_ALL 0x001 /* type -a */
#define CDESC_SHORTDESC 0x002 /* command -V */
#define CDESC_REUSABLE 0x004 /* command -v */
diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index 40abe00..ab43f23 100644
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -261,6 +261,14 @@ parse_and_execute (string, from_file, flags)
{
struct fd_bitmap *bitmap;
+ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
+ {
+ internal_warning ("%s: ignoring function definition attempt", from_file);
+ should_jump_to_top_level = 0;
+ last_result = last_command_exit_value = EX_BADUSAGE;
+ break;
+ }
+
bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
begin_unwind_frame ("pe_dispose");
add_unwind_protect (dispose_fd_bitmap, bitmap);
@@ -321,6 +329,9 @@ parse_and_execute (string, from_file, flags)
dispose_command (command);
dispose_fd_bitmap (bitmap);
discard_unwind_frame ("pe_dispose");
+
+ if (flags & SEVAL_ONECMD)
+ break;
}
}
else