emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/transaction_commit.c: CID 62740 (toctou)

Browse Source
This commit is contained in:
Juan RP 2014-10-08 10:13:21 +02:00
parent b157407684
commit 09c630a825
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/transaction_commit.c
View File

@ -206,8 +206,8 @@ xbps_transaction_commit(struct xbps_handle *xhp)
/* /*
* Create cachedir if necessary. * Create cachedir if necessary.
*/ */
if (access(xhp->cachedir, R_OK|X_OK|W_OK) == -1) { if (xbps_mkpath(xhp->cachedir, 0755) == -1) {
if (xbps_mkpath(xhp->cachedir, 0755) == -1) { if (errno != EEXIST) {
xbps_set_cb_state(xhp, XBPS_STATE_TRANS_FAIL, xbps_set_cb_state(xhp, XBPS_STATE_TRANS_FAIL,
errno, NULL, errno, NULL,
"[trans] cannot create cachedir `%s': %s", "[trans] cannot create cachedir `%s': %s",
@ -252,16 +252,9 @@ xbps_transaction_commit(struct xbps_handle *xhp)
/* /*
* Create rootdir if necessary. * Create rootdir if necessary.
*/ */
if (access(xhp->rootdir, R_OK) == -1) { if (xbps_mkpath(xhp->rootdir, 0750) == -1) {
if (errno != ENOENT) { rv = errno;
rv = errno; if (rv != EEXIST) {
xbps_set_cb_state(xhp, XBPS_STATE_TRANS_FAIL, errno, xhp->rootdir,
"[trans] failed to access rootdir `%s': %s",
xhp->rootdir, strerror(rv));
goto out;
}
if (xbps_mkpath(xhp->rootdir, 0750) == -1) {
rv = errno;
xbps_set_cb_state(xhp, XBPS_STATE_TRANS_FAIL, errno, xhp->rootdir, xbps_set_cb_state(xhp, XBPS_STATE_TRANS_FAIL, errno, xhp->rootdir,
"[trans] failed to create rootdir `%s': %s", "[trans] failed to create rootdir `%s': %s",
xhp->rootdir, strerror(rv)); xhp->rootdir, strerror(rv));