From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21983C432C0 for ; Tue, 19 Nov 2019 06:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCDBC2082F for ; Tue, 19 Nov 2019 06:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574143574; bh=ENGAVoNEsilAix5+Fhardf+5+hp2R8Zkomic5SD8fds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bSXbdeWMa2bMNQGRgaBtQO7TT6FfhJ2ouU7kiFUmCyelrbfU/sFMLRik0efrn9B2A jWr/5VO04D9nqGnYSEiHkLJAeXJbJyWCp1Fb3zVjx6ddOk3XQoHKa+cjR0JpxokqO9 Efpn/TKeEnqrD/ZtsUgafLhL2VHFIXvcCHv/uCiA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729064AbfKSGGN (ORCPT ); Tue, 19 Nov 2019 01:06:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:56054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728481AbfKSFfK (ORCPT ); Tue, 19 Nov 2019 00:35:10 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D4ED21783; Tue, 19 Nov 2019 05:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141710; bh=ENGAVoNEsilAix5+Fhardf+5+hp2R8Zkomic5SD8fds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GWebbpsoxgP/FRVkGwwGArph9Q6ohqtgxMJav5EvzrbYDlZ2xHTB5TaRAndqzf0fn NmCHnblhRgScupLPVjXWo0pvLaj6kCBzbDT/c5sIw1IxTum2dX+SS5hm76Ku3XApaS NL/kf0Q5eIRzHA/X52EocbZLvtEn70iBsdNmhqLg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bernd Edlinger , Tejun Heo , Sasha Levin Subject: [PATCH 4.19 227/422] kernfs: Fix range checks in kernfs_get_target_path Date: Tue, 19 Nov 2019 06:17:04 +0100 Message-Id: <20191119051413.347959671@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bernd Edlinger [ Upstream commit a75e78f21f9ad4b810868c89dbbabcc3931591ca ] The terminating NUL byte is only there because the buffer is allocated with kzalloc(PAGE_SIZE, GFP_KERNEL), but since the range-check is off-by-one, and PAGE_SIZE==PATH_MAX, the returned string may not be zero-terminated if it is exactly PATH_MAX characters long. Furthermore also the initial loop may theoretically exceed PATH_MAX and cause a fault. Signed-off-by: Bernd Edlinger Acked-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- fs/kernfs/symlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c index 305b220af45d3..162f43b80c84c 100644 --- a/fs/kernfs/symlink.c +++ b/fs/kernfs/symlink.c @@ -72,6 +72,9 @@ static int kernfs_get_target_path(struct kernfs_node *parent, if (base == kn) break; + if ((s - path) + 3 >= PATH_MAX) + return -ENAMETOOLONG; + strcpy(s, "../"); s += 3; base = base->parent; @@ -88,7 +91,7 @@ static int kernfs_get_target_path(struct kernfs_node *parent, if (len < 2) return -EINVAL; len--; - if ((s - path) + len > PATH_MAX) + if ((s - path) + len >= PATH_MAX) return -ENAMETOOLONG; /* reverse fillup of target string from target to base */ -- 2.20.1