OpenBSD CVS

CVS log for src/usr.bin/ssh/xmalloc.c


[BACK] Up to [local] / src / usr.bin / ssh

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.37 / (download) - annotate - [select for diffs], Sun Mar 13 23:27:54 2022 UTC (2 years, 2 months ago) by cheloha
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, HEAD
Changes since 1.36: +2 -3 lines
Diff to previous 1.36 (colored)

ssh: xstrdup(): use memcpy(3)

Copying the given string into the buffer with strlcpy(3) confers no
benefit in this context because we have already determined the
string's length with strlen(3) in order to allocate that buffer.

Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2

ok dtucker@ millert@

Revision 1.36 / (download) - annotate - [select for diffs], Tue Nov 12 22:32:48 2019 UTC (4 years, 6 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.35: +14 -7 lines
Diff to previous 1.35 (colored)

add xvasprintf()

Revision 1.35 / (download) - annotate - [select for diffs], Thu Jun 6 05:13:13 2019 UTC (4 years, 11 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.34: +2 -8 lines
Diff to previous 1.34 (colored)

Replace calls to ssh_malloc_init() by a static init of malloc_options.
Prepares for changes in the way malloc is initialized.  ok guenther@ dtucker@

Revision 1.34 / (download) - annotate - [select for diffs], Wed May 31 09:15:42 2017 UTC (6 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.33: +13 -1 lines
Diff to previous 1.33 (colored)

Switch to recallocarray() for a few operations.  Both growth and shrinkage
are handled safely, and there also is no need for preallocation dances.
Future changes in this area will be less error prone.
Review and one bug found by markus

Revision 1.33 / (download) - annotate - [select for diffs], Mon Feb 15 09:47:49 2016 UTC (8 years, 3 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.32: +9 -1 lines
Diff to previous 1.32 (colored)

Add a function to enable security-related malloc_options.  With and ok
deraadt@, something similar has been in the snaps for a while.

Revision 1.32 / (download) - annotate - [select for diffs], Fri Apr 24 01:36:01 2015 UTC (9 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.31: +5 -13 lines
Diff to previous 1.31 (colored)

rename xrealloc() to xreallocarray() since it follows that form.
ok djm

Revision 1.31 / (download) - annotate - [select for diffs], Fri Feb 6 23:21:59 2015 UTC (9 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.30: +6 -6 lines
Diff to previous 1.30 (colored)

SIZE_MAX is standard, we should be using it in preference to the
obsolete SIZE_T_MAX.  OK miod@ beck@

Revision 1.30 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:12 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.29 / (download) - annotate - [select for diffs], Sat Jan 4 17:50:55 2014 UTC (10 years, 4 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.28: +6 -6 lines
Diff to previous 1.28 (colored)

use standard types and formats for size_t like variables. ok dtucker

Revision 1.28 / (download) - annotate - [select for diffs], Fri May 17 00:13:14 2013 UTC (11 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.27: +1 -9 lines
Diff to previous 1.27 (colored)

bye, bye xfree(); ok markus@

Revision 1.16.18.1 / (download) - annotate - [select for diffs], Fri Oct 6 03:19:33 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.16: +44 -4 lines
Diff to previous 1.16 (colored) next main 1.17 (colored)

upgrade to OpenSSH 4.4

Revision 1.16.20.1 / (download) - annotate - [select for diffs], Sat Sep 30 04:06:51 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.16: +44 -4 lines
Diff to previous 1.16 (colored) next main 1.17 (colored)

upgrade to OpenSSH 4.4

Revision 1.27 / (download) - annotate - [select for diffs], Thu Aug 3 03:34:42 2006 UTC (17 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.26: +1 -4 lines
Diff to previous 1.26 (colored)

almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step

Revision 1.26 / (download) - annotate - [select for diffs], Tue Aug 1 23:22:48 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.25: +2 -1 lines
Diff to previous 1.25 (colored)

move #include <stdio.h> out of includes.h

Revision 1.25 / (download) - annotate - [select for diffs], Wed Jul 26 13:57:17 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.24: +2 -1 lines
Diff to previous 1.24 (colored)

move #include <stdlib.h> out of includes.h

Revision 1.24 / (download) - annotate - [select for diffs], Wed Jul 26 02:35:17 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.23: +3 -1 lines
Diff to previous 1.23 (colored)

move #include <sys/param.h> out of includes.h

Revision 1.23 / (download) - annotate - [select for diffs], Sat Jul 22 20:48:23 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.22: +2 -1 lines
Diff to previous 1.22 (colored)

move #include <string.h> out of includes.h

Revision 1.22 / (download) - annotate - [select for diffs], Mon Jul 10 16:37:36 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.21: +3 -1 lines
Diff to previous 1.21 (colored)

move #include <stdarg.h> out of includes.h; ok markus@

Revision 1.21 / (download) - annotate - [select for diffs], Mon Mar 27 01:21:18 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)

we can do the size & nmemb check before the integer overflow check; evol

Revision 1.20 / (download) - annotate - [select for diffs], Sat Mar 25 13:17:03 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.19: +1 -0 lines
Diff to previous 1.19 (colored)

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

Revision 1.19 / (download) - annotate - [select for diffs], Sat Mar 25 01:13:23 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.18: +7 -3 lines
Diff to previous 1.18 (colored)

change OpenSSH's xrealloc() function from being xrealloc(p, new_size) to
xrealloc(p, new_nmemb, new_itemsize).

realloc is particularly prone to integer overflows because it is almost
always allocating "n * size" bytes, so this is a far safer API;
ok deraadt@

Revision 1.18 / (download) - annotate - [select for diffs], Sat Mar 25 00:05:41 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.17: +32 -0 lines
Diff to previous 1.17 (colored)

introduce xcalloc() and xasprintf() failure-checked allocations functions
and use them throughout openssh

xcalloc is particularly important because malloc(nmemb * size) is a
dangerous idiom (subject to integer overflow) and it is time for it to
die

feedback and ok deraadt@

Revision 1.17 / (download) - annotate - [select for diffs], Sun Mar 19 18:51:19 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.16: +0 -1 lines
Diff to previous 1.16 (colored)

RCSID() can die

Revision 1.15.2.2 / (download) - annotate - [select for diffs], Sat Mar 9 00:20:45 2002 UTC (22 years, 2 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.15.2.1: +0 -0 lines
Diff to previous 1.15.2.1 (colored) to branchpoint 1.15 (colored) next main 1.16 (colored)

Merge OpenSSH 3.1, keeping /etc as configuration files directory.
(i.e. OpenSSH 3.1 + openbsd29_3.1.patch)

Revision 1.15.2.1 / (download) - annotate - [select for diffs], Thu Sep 27 19:03:56 2001 UTC (22 years, 7 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.15: +3 -4 lines
Diff to previous 1.15 (colored)

Pull in OpenSSH-2.9.9

Revision 1.8.2.5 / (download) - annotate - [select for diffs], Thu Sep 27 00:15:43 2001 UTC (22 years, 7 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.8.2.4: +3 -4 lines
Diff to previous 1.8.2.4 (colored) to branchpoint 1.8 (colored) next main 1.9 (colored)

Pull in OpenSSH 2.9.9 to the 2.8 branch.

Revision 1.16 / (download) - annotate - [select for diffs], Mon Jul 23 18:21:46 2001 UTC (22 years, 9 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_8_BASE, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6, OPENBSD_3_5_BASE, OPENBSD_3_5, OPENBSD_3_4_BASE, OPENBSD_3_4, OPENBSD_3_3_BASE, OPENBSD_3_3, OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1, OPENBSD_3_0_BASE, OPENBSD_3_0
Branch point for: OPENBSD_3_9, OPENBSD_3_8
Changes since 1.15: +3 -4 lines
Diff to previous 1.15 (colored)

no zero size xstrdup() error; ok markus@

Revision 1.8.2.4 / (download) - annotate - [select for diffs], Mon May 7 21:09:39 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_8
Changes since 1.8.2.3: +4 -3 lines
Diff to previous 1.8.2.3 (colored) to branchpoint 1.8 (colored)

Pull in OpenSSH-2.9 to 2.8 branch.

Revision 1.15 / (download) - annotate - [select for diffs], Mon Apr 16 08:05:34 2001 UTC (23 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE
Branch point for: OPENBSD_2_9
Changes since 1.14: +4 -3 lines
Diff to previous 1.14 (colored)

xrealloc dealing with ptr == nULL; mouring

Revision 1.8.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 19:46:32 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.8.2.2: +0 -0 lines
Diff to previous 1.8.2.2 (colored) to branchpoint 1.8 (colored)

Pull in OpenSSH-2.5.2 for 2.8 branch.

Revision 1.6.2.4 / (download) - annotate - [select for diffs], Wed Mar 21 18:53:21 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.6.2.3: +0 -0 lines
Diff to previous 1.6.2.3 (colored) to branchpoint 1.6 (colored) next main 1.7 (colored)

Pull in OpenSSH-2.5.2 for 2.7 branch.

Revision 1.6.2.3 / (download) - annotate - [select for diffs], Mon Mar 12 15:44:18 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.6.2.2: +18 -8 lines
Diff to previous 1.6.2.2 (colored) to branchpoint 1.6 (colored)

OpenSSH-2.5.1 for 2.7 patch branch

Revision 1.8.2.2 / (download) - annotate - [select for diffs], Mon Feb 19 17:19:44 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.8.2.1: +0 -0 lines
Diff to previous 1.8.2.1 (colored) to branchpoint 1.8 (colored)

Pull in OpenSSH-2.5.1

Revision 1.8.2.1 / (download) - annotate - [select for diffs], Fri Feb 16 20:13:25 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.8: +18 -8 lines
Diff to previous 1.8 (colored)

Pull in OpenSSH 2.5.0

Revision 1.14 / (download) - annotate - [select for diffs], Wed Feb 7 18:04:50 2001 UTC (23 years, 3 months ago) by itojun
Branch: MAIN
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

fix size_t -> int cast (use u_long).  markus ok

Revision 1.13 / (download) - annotate - [select for diffs], Wed Feb 7 16:46:08 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.12: +3 -3 lines
Diff to previous 1.12 (colored)

typo in fatal()

Revision 1.12 / (download) - annotate - [select for diffs], Wed Feb 7 08:57:26 2001 UTC (23 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.11: +12 -3 lines
Diff to previous 1.11 (colored)

deal with new ANSI malloc stuff

Revision 1.11 / (download) - annotate - [select for diffs], Sun Feb 4 15:32:27 2001 UTC (23 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.10: +2 -2 lines
Diff to previous 1.10 (colored)

unexpand and remove end-of-line whitespace; ok markus@

Revision 1.10 / (download) - annotate - [select for diffs], Sun Jan 28 20:53:21 2001 UTC (23 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

use size_t for strlen() return.  ok markus@

Revision 1.9 / (download) - annotate - [select for diffs], Sun Jan 21 19:06:02 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.8: +3 -2 lines
Diff to previous 1.8 (colored)

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

Revision 1.6.2.2 / (download) - annotate - [select for diffs], Wed Nov 8 21:31:40 2000 UTC (23 years, 6 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.6.2.1: +7 -2 lines
Diff to previous 1.6.2.1 (colored) to branchpoint 1.6 (colored)

openssh-2.3.0 (again) for 2.7 branch

Revision 1.8 / (download) - annotate - [select for diffs], Thu Sep 7 20:27:55 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE
Branch point for: OPENBSD_2_8
Changes since 1.7: +7 -2 lines
Diff to previous 1.7 (colored)

cleanup copyright notices on all files.  I have attempted to be accurate with
the details.  everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence.  We're not changing any rules, just
being accurate.

Revision 1.6.2.1 / (download) - annotate - [select for diffs], Fri Sep 1 18:23:25 2000 UTC (23 years, 8 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.6: +1 -1 lines
Diff to previous 1.6 (colored)

Pull in the rest of openssh-2.2.0 to 2.7 branch (luvin' cvs...)

Revision 1.7 / (download) - annotate - [select for diffs], Tue Jun 20 01:39:45 2000 UTC (23 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.6: +1 -1 lines
Diff to previous 1.6 (colored)

OpenBSD tag

Revision 1.6 / (download) - annotate - [select for diffs], Fri Apr 14 10:30:34 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE
Branch point for: OPENBSD_2_7
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

whitespace cleanup

Revision 1.5 / (download) - annotate - [select for diffs], Wed Nov 24 00:26:04 1999 UTC (24 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.4: +8 -15 lines
Diff to previous 1.4 (colored)

much more KNF

Revision 1.4 / (download) - annotate - [select for diffs], Tue Nov 23 22:25:56 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.3: +27 -23 lines
Diff to previous 1.3 (colored)

KNF part 1

Revision 1.3 / (download) - annotate - [select for diffs], Thu Sep 30 04:30:03 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.2: +1 -7 lines
Diff to previous 1.2 (colored)

more culling

Revision 1.2 / (download) - annotate - [select for diffs], Wed Sep 29 21:14:16 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +5 -3 lines
Diff to previous 1.1 (colored)

numerous sprintf, strncpy, strcpy cleanups

Revision 1.1 / (download) - annotate - [select for diffs], Sun Sep 26 20:53:38 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN

i bet a lot of people didn't know what ssh 1.2.16 had a nice license.
well, except for the patent issues.  someone in sweden (forget their
name at the moment) cleaned out most of the patented code, and now
this code removes rsa code.  when this is done, it will link against
libssl, but the work isn't completely done yet.  then we need to bring
this up to modern days, featurewise.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.