Commit Graph

1079 Commits

Author SHA1 Message Date
Jon Trulson 6539c8c71a ksh93: re-add the ksh submodule at 47468f 2021-01-23 18:40:40 -07:00
Jon Trulson 047cefcf32 Merge branch 'master' into master-ksh93-upgrade 2021-01-23 18:31:28 -07:00
Chase eab8cf4c16 dtksh: update ksh to commit 47468f (fix musl compiler errors) 2021-01-23 17:13:46 -07:00
Lev Kujawski e54ee036ac Fix incompatibilites between the Desktop Korn Shell and the musl C library:
- Only check for POSIX's termios.h when deciding to use the POSIX terminal interfaces.
- Check for C99's va_copy in addition to __va_copy.
2021-01-23 16:39:44 -07:00
Chase ad39eebb2d dtksh: use std malloc instead of ast malloc 2021-01-18 18:02:11 -07:00
Chase 47dfe49a72 dtksh: make it build under openindiana 2021-01-18 18:00:41 -07:00
Chase e75a8162ad dtksh/Imakefile: make patch obey POSIX 2021-01-18 18:00:41 -07:00
Lev Kujawski 325132735b Use the C99 standard va_copy if possible for compatibility with the musl C library. 2021-01-10 18:08:00 -07:00
Lev Kujawski 13c173d22c On Linux, use SVR4's (now POSIX) mktime() instead of BSD's non-standard timelocal(). 2021-01-10 18:08:00 -07:00
Lev Kujawski 0e282a0ad7 On Linux, use the SVR4 (now POSIX) signal and locking interfaces instead of the non-standard BSD equivalents. 2021-01-10 18:08:00 -07:00
Lev Kujawski 5c801a07a0 Hide FILE internals from the musl C library that conflict with the Desktop Korn Shell's SFIO. 2021-01-10 18:08:00 -07:00
Chase 10f2382561 dtksh/findsym.c: fix compiler warnings 2021-01-01 18:41:26 -07:00
Chase 428223ee80 use a patchfile to augment init.c instead of copying it entirely 2021-01-01 18:41:26 -07:00
Chase 90fff44682 dtksh: use bin/package flat make instead of shell
Shell isn't portable, so upstream ksh93 has a "flat" function that we can use
to put binaries in a static place that doesn't require a shell command. We still
do need an intermediate setup.sh shell script due to a bug in ksh that object
files aren't being put in lib, and FEATURE not in include. We also cut out some
 unused symbols, and a hpux specific implementation of dynlib (new hpux should
 conform to the posix implementation anyhow.)
2021-01-01 18:41:26 -07:00
Liang Chang 12f2fb1f10 dtdocbook: fix a segmentation fault. 2021-01-01 03:07:37 +08:00
Liang Chang bc39b47162 dtopen: fix the syntax errors of comment. 2020-12-29 00:20:37 +08:00
Chase f884dce398 dtkcmds.c: use Empty macro instead of empty string 2020-12-13 17:45:39 -07:00
Chase 5cec09b9f2 dtksh: use sh_addbuiltin instead of manually editing builtins.c 2020-12-06 18:24:33 -07:00
Chase 80825d1651 dtksh: update to commit 67880e3 2020-12-06 18:24:33 -07:00
Peter Howkins d98b2c4c34 dtcm: Always use ANSI function prototypes 2020-11-29 01:55:09 +00:00
Peter Howkins aef196c6ca dtcalc: remove some pointless macroing of function names to uppercase versionss 2020-11-26 23:00:18 +00:00
Peter Howkins e4024b0bf9 dtcalc: Remove support for optional K&R prototypes to simplify code 2020-11-26 22:24:51 +00:00
Peter Howkins 25d34e6398 dtcreate: remove hacky solution to declaring and defining variables in .h files
Split them into .c and .h like usual.y
2020-11-26 03:16:16 +00:00
Peter Howkins dc45d133c9 dthelp: Resolve GCC 10 errors about multiple definitions of global variables 2020-11-24 05:42:59 +00:00
Peter Howkins 9ff00704b3 dtudcfonted: Resolve GCC 10 errors about multiple definitions of global variables 2020-11-24 03:16:50 +00:00
Peter Howkins ee04641879 dticon: Resolve GCC 10 errors about multiple definitions of global variables 2020-11-24 02:25:30 +00:00
Peter Howkins 30f2d925ef dtcreate: Resolve GCC 10 errors about multiple definitions of global variables 2020-11-24 02:19:05 +00:00
Peter Howkins 361b8f1456 dtappbbuilder: Resolve GCC 10 errors about multiple definitions of global variables 2020-11-24 02:19:05 +00:00
Peter Howkins e1196cdfec dtcalc: Resolve gcc 10 errors about multiple definitions of global variables 2020-11-24 02:19:05 +00:00
Peter Howkins 4fd18c3c16 dtstyle: Remove duplicate definition of NumOfPalettes that was a) wrong b) causing issues on recent compilers 2020-11-23 18:28:01 +00:00
Peter Howkins 67f62e5a8a all: remove deprecated sys_errlist[] and replace with ANSI C strerror() 2020-11-02 05:30:08 +00:00
Chase fc700e296b Dtksh: fix callback segfault 2020-10-19 18:36:29 -06:00
Chase 9f290039eb ksh93: update to commit dd9bc2 2020-10-19 18:36:29 -06:00
Chase 461d326bbe dtksh: Use ksh93 translate over augmented version
We can reduce our differences from upstream ksh by simply using their
ERROR_translate() function instead of our janky and obsolete msg_translate,
we also move DtGetMessage() to msgs.c and lockedfiledescriptors and,
unlockfiledescriptors to extra.c to lessen modifications to init.c, which
all changes will hopefully be moved elsewhere in the future
2020-10-19 18:36:29 -06:00
Chase 3443543744 dtkcmds.c: add extra field to discipline functions 2020-10-12 05:32:57 -06:00
Chase 96c4a3ea52 ksh: update to commit 092b90 2020-09-20 11:29:00 -06:00
Chase 9d798ad6d0 dtksh: make new ksh submodule build 2020-08-23 20:13:30 -06:00
Chase 994772518a dtksh/examples: clean up scripts
This commit does three thing:
1. Sets appropriate bits on source files
2. Tells imake to build them as script files, not data files
3. Remove broken examples based on unused code
2020-08-23 20:13:24 -06:00
Chase 5d0125b393 dtksh: add new ksh93 submodule 2020-08-23 20:13:18 -06:00
Chase 0069a6e084 dtksh: remove old ksh from repo 2020-08-23 20:13:14 -06:00
Chase 0f3bcae232 dtksh: Turn dtksh aliases into builtins and discard BLT_SPC flag
Upstream ksh has removed it's builtin aliases, favoring instead to make them
all builtin commands, this would also allow us to skip having to manually
merge another file, it was explained best in this email:

"Default aliases are an ugly hack that you are better off without.
Disadvantages include:
- 'unalias -a' becomes basically unusable as it gets rid of commands you
probably want;
- shell functions by those names are ignored (unless you quote their
names upon invocation);
- something like 'cmdname=foo; "$cmdname" bar baz' doesn't work if
$cmdname is an alias.

I strongly recommend removing the BLT_SPC flag from all of
your extra dtksh builtins. Making builtins "special builtins" is of no
real benefit at all, while introducing a pointless restriction: shell
functions by those names cannot be defined, which causes a risk of
incompatibility with scripts written for other shells. The BLT_SPC flag
is for a very few historic builtins that must have certain weird
corner-case behaviour of "special" builtins for POSIX compliance and
Bourne shell compatibility reasons."
2020-07-19 19:15:57 -06:00
Jon Trulson 15a2032626 Convert uses of XKeycodeToKeysym (deprecated) to XkbKeycodeToKeysym
patch supplied from Peter G.
2020-03-23 12:51:18 -06:00
Jon Trulson 6f1a110e1d dtksh: fix 32b/64b issues with XmTextGetString and XmTextFieldGetString
Some of these functions were returning pointers cast as integers,
which of course is bad on a 64b LP64 systems.

This code should probably just be refactored at some point.  There may
be other hidden issues, and all the casting just sucks.
2020-03-09 15:37:59 -06:00
Jon Trulson 6b32246d06 dtsession, DtSvc: fix CVE-2020-2696/VU#308289
Marco Ivaldi <marco.ivaldi@mediaservice.net> has identified 3
vulnerabilities in CDE.

Two of them could affect our CDE (open-source version), while the 3rd
(sdtcm_convert) is Solaris specific.

The two vulnerabilities, both of which affect dtsession could allow a
local privilege escalation to root.  A POC exists for Solaris.  The
POC will not function on our CDE for two main reasons:

- the POC is Solaris specific
- The overflowed variables in question are allocated on the heap,
  whereas in Solaris these variables are located on the stack.

The first vulnerability allows an extra long palette name to be used
to cause a crash via insufficient validation in
SrvPalette.c:CheckMonitor().

The second, which has not yet been assigned a CERT CVE resides in
SmCreateDirs.c:_DtCreateDtDirs() in libDtSvc.  Due to insufficient
bounds checking, a crash or corruption can be achieved by using a very
long DISPLAY name.

This one is considered difficult to exploit, and no POC code is
available at this time.  CDE 2.x code-bases are also listed as not
vulnerable, however some work has been done anyway to do some proper
bounds checking in this function.

The following text portions are copied from the relevant advisories,
which have not been released as of this writing.

NOTE: Oracle CDE does NOT use CDE 2.3.0a or earlier as mentioned
below.  They are completely different code-bases):

Regarding CVE-2020-2692:

  A buffer overflow in the CheckMonitor() function in the Common
  Desktop Environment 2.3.0a and earlier, as distributed with Oracle
  Solaris 10 1/13 (Update 11) and earlier, allows local users to gain
  root privileges via a long palette name passed to dtsession in a
  malicious .Xdefaults file.

  Note that Oracle Solaris CDE is based on the original CDE 1.x train,
  which is different from the CDE 2.x codebase that was later open
  sourced. Most notably, the vulnerable buffer in the Oracle Solaris
  CDE is stack-based, while in the open source version it is
  heap-based.

Regarding the DtSvc bug, which does not currently have a CERT CVE:

  A difficult to exploit stack-based buffer overflow in the
  _DtCreateDtDirs() function in the Common Desktop Environment version
  distributed with Oracle Solaris 10 1/13 (Update 11) and earlier may
  allow local users to corrupt memory and potentially execute
  arbitrary code in order to escalate privileges via a long X11
  display name. The vulnerable function is located in the libDtSvc
  library and can be reached by executing the setuid program
  dtsession.

  The open source version of CDE (based on the CDE 2.x codebase) is
  not affected.
2020-01-13 19:13:23 -07:00
Chase 008512c777 extra.h: remove unused prototypes 2019-12-15 14:07:52 -07:00
Chase f28abfe8dd dtksh: remove needless OS defines 2019-12-15 14:07:52 -07:00
Chase cc73d03e49 dtkcmds.c: avoid c99 collision 2019-12-15 14:07:52 -07:00
Chase 3152b0bc4e dtksh: remove unused files and functions 2019-12-15 14:07:52 -07:00
Marcin Cieślak 5cebd7c4da dtdocbook/instant: fix buffer overlow on German umlaut in latin-1
One-off error:

Old buffer length was 6 for one character (3 * 1 + 3)
We need one more byte par character in the buffer for
the hex representation of it.

+0 '"'
+1 '\\'
+2 'x'
+3 'f'
+4 'c'
+5 '"'
+6 0x0 << overflow

tcl combined with RCHECK will abort because memory blocks
are allocated contiguously and we overwrite the magic marker
of the next block.
2019-11-30 10:13:43 -07:00
Jon Trulson de9d913b77 dtinfo: link proper localized (utf8) dirs 2019-11-17 15:07:14 -07:00