mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Alexander Monakov <amonakov@ispras.ru>
To: musl@lists.openwall.com
Subject: Re: [PATCH] fix use of pointer after free in unsetenv
Date: Mon, 4 Jan 2016 18:47:36 +0300 (MSK)	[thread overview]
Message-ID: <alpine.LNX.2.20.1601041818480.29953@monopod.intra.ispras.ru> (raw)
In-Reply-To: <alpine.LNX.2.20.1601041403590.15644@monopod.intra.ispras.ru>

On Mon, 4 Jan 2016, Alexander Monakov wrote:
> To me the implementation looks weird due to how it restarts scanning __environ
> with 'goto again' from position 0 instead of current position. I can propose
> the following rewrite (untested):
> 
> for (i=0; __environ[i]; i++) {
> 	char *e = __environ[i];
> 	if (!memcmp(name, e, l) && e[l] == '=') {
> 		for (j=i--; __environ[j]; j++)
> 			__environ[j] = __environ[j+1];
> 		if (__env_map) {
> 			for (j=0; __env_map[j] && __env_map[j] != e; j++);
> 			if (__env_map[j]) {
> 				free(__env_map[j]);
> 				do __env_map[j] = __env_map[j+1];
> 				while (__env_map[++j]);
> 			}
> 		}
> 	}
> }

Hm, there's no need to preserve relative order of env entries, is there?

for (i=0; __environ[i]; i++);
for (int im=i-1; i-->0; )
	if (!memcmp(name, __environ[i], l) && __environ[i][l] == '=') {
		if (__env_map) {
			for (j=0; __env_map[j]; j++);
			for (int jm=j-1; j-->0; )
				if (__env_map[j] == __environ[i]) {
					__env_map[j] = __env_map[jm];
					__env_map[jm] = 0;
					free(__environ[i]);
					break;
				}
		}
		if (i != im)
			__environ[i] = __environ[im];
		__environ[im--] = 0;
	}

(in practice I'd rather spell i-->0 as --i>=0 above)

Alexander


  reply	other threads:[~2016-01-04 15:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-03 23:09 Alexander Cherepanov
2016-01-04  3:05 ` Rich Felker
2016-01-04 10:52   ` Alexander Cherepanov
2016-01-04 11:56     ` Alexander Monakov
2016-01-04 15:47       ` Alexander Monakov [this message]
2016-01-04 21:05         ` Rich Felker
2016-01-04 21:28           ` Alexander Monakov
2016-01-04 21:53             ` Rich Felker
2016-01-04  7:42 ` Markus Wichmann
2016-01-04 11:58   ` Alexander Cherepanov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LNX.2.20.1601041818480.29953@monopod.intra.ispras.ru \
    --to=amonakov@ispras.ru \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).