From patchwork Mon Aug 10 20:48:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 40238 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 384143861925; Mon, 10 Aug 2020 20:49:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 384143861925 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1597092547; bh=mix2hueujaxJHVkT6sbo6RckKIS/0IqTNK+DzkBljTQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=uKQPNaMe4FTtDINEnb11o6sk0jEDOpa4sIJYVUgyAFS+hgh5mPQQ92Q20XziPpc7o ZPD92CyCBelpyW9+MIWmhW+6BFa27gz1mCSF2/76DbI/jzvEUnaO+9TVO+C7U9W6fs PPAh9o4TbXXVJStsEC4nTmw88jeRnBN1lHxOuJ1I= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 94DBC3850424 for ; Mon, 10 Aug 2020 20:49:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 94DBC3850424 Received: by mail-qk1-x744.google.com with SMTP id x69so9769959qkb.1 for ; Mon, 10 Aug 2020 13:49:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mix2hueujaxJHVkT6sbo6RckKIS/0IqTNK+DzkBljTQ=; b=mUvzoKXOIBH2HD27oGdImokKw34tO2o80TijvUI9spNZi55EoMhtiGYqkrxaO6kfJ/ B/NUbjzBfhnAFrSHaY2XGHSDwizupLCiOG9IH4W2ye7YOoOTNdvnGJH6wmos1LzFXQbE G/s8d+PQR48HdmvhjVYMaO0IWmu+dhOTqNFTmvIR+4i+nz2jxgQuZX0DSYnV5ebbyALg lfHKs5l+1Y2FM8bup2M+0KL8utZ2Tpf0ydvo+XRGx5KIvBbl7ac+RNXUo6AWTLZ0gXU/ JiQIomujK1ix2p4F57N0vSrCVLonJJzKc4JhzVLGLjKdqmvN/3AuX+d1JSMyqeLrJuGN FAEw== X-Gm-Message-State: AOAM5302You4c6mCLhggpbx0A7z2Q4GHVRD7QILz/9qKYsdpgwQLdePC 5HIo3C/JyQwAGSZz5K7LL/nPjkkhUujvMw== X-Google-Smtp-Source: ABdhPJzNt/Qsgr6hPLu4TcCP9p/OObRxrsdD7ygGPF1JnvcV++abxHAOX+ibEDXZLJmFmJLcQhKMfw== X-Received: by 2002:a05:620a:a05:: with SMTP id i5mr26820305qka.444.1597092544050; Mon, 10 Aug 2020 13:49:04 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id n128sm9823185qke.8.2020.08.10.13.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2020 13:49:03 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 2/3] stdlib: Enforce PATH_MAX on allocated realpath buffer Date: Mon, 10 Aug 2020 17:48:55 -0300 Message-Id: <20200810204856.2111211-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200810204856.2111211-1-adhemerval.zanella@linaro.org> References: <20200810204856.2111211-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Cc: Xiaoming Ni Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It removes the buffer resize for sizes larger than PATH_MAX in the case where the 'resolved' buffer is not specified. This allow assume realpath limit is PATH_MAX for all cases. Checked on x86_64-linux-gnu and i686-linux-gnu. --- stdlib/canonicalize.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 554ba221e4..91c30e38be 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -122,36 +122,16 @@ __realpath (const char *name, char *resolved) } else { - size_t new_size; - if (dest[-1] != '/') *dest++ = '/'; if (dest + (end - start) >= rpath_limit) { - ptrdiff_t dest_offset = dest - rpath; - char *new_rpath; - - if (resolved) - { - __set_errno (ENAMETOOLONG); - if (dest > rpath + 1) - dest--; - *dest = '\0'; - goto error; - } - new_size = rpath_limit - rpath; - if (end - start + 1 > PATH_MAX) - new_size += end - start + 1; - else - new_size += PATH_MAX; - new_rpath = (char *) realloc (rpath, new_size); - if (new_rpath == NULL) - goto error; - rpath = new_rpath; - rpath_limit = rpath + new_size; - - dest = rpath + dest_offset; + __set_errno (ENAMETOOLONG); + if (dest > rpath + 1) + dest--; + *dest = '\0'; + goto error; } dest = __mempcpy (dest, start, end - start);