head 1.3; access; symbols pkgsrc-2018Q1:1.2.0.62 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.60 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.58 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.54 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.52 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.50 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.48 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.46 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.44 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.42 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.40 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.38 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.36 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.34 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.32 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.30 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.28 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.26 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.24 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.22 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.20 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.18 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.16 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.14 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.12 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.10 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.8 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.6 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.4 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.2 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.1.0.44 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.42 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.40 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.38 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.36 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.34 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.32 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.30 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.28 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.26 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.24 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.22 pkgsrc-2008Q1:1.1.0.20 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.18 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.16 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.14 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.12 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.10 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.8 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.6 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2; locks; strict; comment @# @; 1.3 date 2018.04.13.16.59.13; author he; state dead; branches; next 1.2; commitid wQspnYVmt8NFOiyA; 1.2 date 2010.10.16.09.57.39; author adam; state Exp; branches; next 1.1; 1.1 date 2006.01.14.00.52.33; author seb; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2006.01.14.00.52.33; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2006.01.14.02.43.42; author salo; state Exp; branches; next ; desc @@ 1.3 log @Add a patch to main.c.in (and in the process rename the diff): Make a copy of the basename() result, so as to avoid a fortify abort due to overlapping memcpy() when the result from basename() is subsequently passed to basename(). Bump PKGREVISION. @ text @$NetBSD: patch-ab,v 1.2 2010/10/16 09:57:39 adam Exp $ --- main.c.in.orig 2010-08-01 19:43:30.000000000 +0000 +++ main.c.in @@@@ -198,7 +198,7 @@@@ char **build_shell_args( struct passwd u * build_arg_vector() in the chroot helper instead... */ - if ( !(argvec = (char **)malloc(6 * sizeof (char *))) ){ + if ( !(argvec = (char **)malloc(4 * sizeof (char *))) ){ log_set_priority(LOG_ERR); log_msg("OOM error in build_shell_args() (fatal)"); exit(1); @@@@ -229,9 +229,9 @@@@ char **build_shell_args( struct passwd u /* change the command to run to the chroot helper */ *cmd = PATH_CHROOT_HELPER; - /* set up buffer to log command line ('"' + ' ' + '\0' = 9) */ - len = strlen(cmdline) + strlen(argvec[2]) + - strlen(PATH_CHROOT_HELPER) + 9; + /* set up buffer to log command line (argvec[1] + '"' + ' ' + '\0' = 6) */ + len = strlen(cmdline) + + strlen(PATH_CHROOT_HELPER) + 6; if ( !(temp = (char *)malloc(len)) ){ log_set_priority(LOG_ERR); log_msg("OOM error in build_shell_args() (fatal)"); @ 1.2 log @Changes 2.3.3: This release solves two small bugs, with minor security implications. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update to version 2.3.2. Changes since last packaged version (2.3.0): 2.3.2 - fixed segfault due to checking the length of variables that I forgot to remove from build_arg_vector() since the chroot root exploit fix in 2.3.0 2.3.1 - fixed stupid bug that caused rssh not to allow rsync and rdist @ text @d3 1 a3 1 --- main.c.in.orig 2006-01-03 17:25:05.000000000 +0000 d5 1 a5 1 @@@@ -195,7 +195,7 @@@@ char **build_shell_args( struct passwd u d14 1 a14 1 @@@@ -226,9 +226,9 @@@@ char **build_shell_args( struct passwd u @ 1.1.2.1 log @file patch-ab was added on branch pkgsrc-2005Q4 on 2006-01-14 00:52:33 +0000 @ text @d1 26 @ 1.1.2.2 log @Pullup ticket 1027 - requested by Stoned Elipot security update for rssh Revisions pulled up: - pkgsrc/shells/rssh/Makefile 1.9 - pkgsrc/shells/rssh/distinfo 1.3 - pkgsrc/shells/rssh/patches/patch-ab 1.1 Module Name: pkgsrc Committed By: seb Date: Sat Jan 14 00:52:33 UTC 2006 Modified Files: pkgsrc/shells/rssh: Makefile distinfo Added Files: pkgsrc/shells/rssh/patches: patch-ab Log Message: Update to version 2.3.2. Changes since last packaged version (2.3.0): 2.3.2 - fixed segfault due to checking the length of variables that I forgot to remove from build_arg_vector() since the chroot root exploit fix in 2.3.0 2.3.1 - fixed stupid bug that caused rssh not to allow rsync and rdist @ text @a0 26 $NetBSD: patch-ab,v 1.1.2.1 2006/01/14 02:43:42 salo Exp $ --- main.c.in.orig 2006-01-03 17:25:05.000000000 +0000 +++ main.c.in @@@@ -195,7 +195,7 @@@@ char **build_shell_args( struct passwd u * build_arg_vector() in the chroot helper instead... */ - if ( !(argvec = (char **)malloc(6 * sizeof (char *))) ){ + if ( !(argvec = (char **)malloc(4 * sizeof (char *))) ){ log_set_priority(LOG_ERR); log_msg("OOM error in build_shell_args() (fatal)"); exit(1); @@@@ -226,9 +226,9 @@@@ char **build_shell_args( struct passwd u /* change the command to run to the chroot helper */ *cmd = PATH_CHROOT_HELPER; - /* set up buffer to log command line ('"' + ' ' + '\0' = 9) */ - len = strlen(cmdline) + strlen(argvec[2]) + - strlen(PATH_CHROOT_HELPER) + 9; + /* set up buffer to log command line (argvec[1] + '"' + ' ' + '\0' = 6) */ + len = strlen(cmdline) + + strlen(PATH_CHROOT_HELPER) + 6; if ( !(temp = (char *)malloc(len)) ){ log_set_priority(LOG_ERR); log_msg("OOM error in build_shell_args() (fatal)"); @