From patchwork Wed Sep 27 03:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13399847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9F5CE7F15B for ; Wed, 27 Sep 2023 03:42:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEB3E8D0079; Tue, 26 Sep 2023 23:42:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4E648D0002; Tue, 26 Sep 2023 23:42:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F0A48D007A; Tue, 26 Sep 2023 23:42:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 667B08D0002 for ; Tue, 26 Sep 2023 23:42:31 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 123401CABAB for ; Wed, 27 Sep 2023 03:42:30 +0000 (UTC) X-FDA: 81280980060.22.EB76215 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 26E71C001B for ; Wed, 27 Sep 2023 03:42:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=ZLi8Tqig; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf10.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.172 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695786146; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fmhcOt0Phh+K4fShkXGPXzhG2+0EGgvMOT3Anhb5JtI=; b=a8Pn8PIw8g0ihd9rllcbIVMcFGtgLa9KY23AALvjL9B+pAZaNgX1e+pS+Y+UoQfN+IEx/U TS+G0KLj+ZQq38+GBq6kdYgUES0H0BeRPdYmxz33hJfPdD7tNJtucZHA/ewsT3u48BUVkO 1prdiHQ3nMFq2PisAambroexYShreD4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=ZLi8Tqig; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf10.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.172 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695786146; a=rsa-sha256; cv=none; b=IQwyIe6w3ZzuvQsypKzT85x4lVqhjCy/EOgb5r5E32zpYZKBHtGphfhegL8S++h25gOPvD gYNBf4/+RzEkMFj1A6d7D5sMax0dmG6rH9c7cOFmxTTCCLbSwkeRd+UsmBRUvK4dBr1F0i y5UZhCGIzKIBxCpk/lTC5Pi7LfEfB/Y= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-692c02adeefso5457172b3a.3 for ; Tue, 26 Sep 2023 20:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695786145; x=1696390945; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fmhcOt0Phh+K4fShkXGPXzhG2+0EGgvMOT3Anhb5JtI=; b=ZLi8TqigE9tYl97AyGxsMEO7xBsnBObO1cnisnVqqpgbdAdZy95jx+Qso+P9ffSyz1 Z52EOf/YZqXkIYDLpRcUm+WjD+OUFcKAniKiXUyDBhPr1ONPkUxxzcAcYEeNDjOMclIA JbwDi+gnojOTpaYo6yO5PRRVaRZaRVsPOmvaA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695786145; x=1696390945; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fmhcOt0Phh+K4fShkXGPXzhG2+0EGgvMOT3Anhb5JtI=; b=eVhaiKtmmdFWHzPgmn5JB6igHaWKZKgyFXXjRPco7eRbvQ0r9seZu9aP0FL7WI3khI D4iraSDNrcumfgHKgaH5AZS1XBYj19YdTqD2uvITyxyQA71G6krF+wnLxp17VCEb/UhY 6W631la46aq5uBQAw0evPPZhJqA6f62WHZQwhlk92A7LpSRbVjc9nReO1SReeEd9R41a A+eKG7qnagw8or5kMqqZWD35y/lnU7eXIyrLYxj1NxxhZqbduNQGcFTSGewKGkRw1mQM EtbYS8DkfMAl6fM/qPw5GFGnq52h1dvNK/4qtHuemYiYhLSKdXibuGL+5yoIg0sRZkY/ qLMQ== X-Gm-Message-State: AOJu0Yx/Vk/gqCv2Lg4DprHHDX8QCTgyvcY/N+V3zx4BTm6ioQrcQENI X58k2CxXcCV8xvB1gvWAeOsVsQ== X-Google-Smtp-Source: AGHT+IEnkEHkAMyfzsQkaO55Avyrk0ulpfRxCywQvRCp4n7UkR+naKdiK+KW8D+X2wQeWkwJJchcfQ== X-Received: by 2002:a05:6a00:cc2:b0:690:ca4e:661b with SMTP id b2-20020a056a000cc200b00690ca4e661bmr1032600pfv.13.1695786144968; Tue, 26 Sep 2023 20:42:24 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id i13-20020aa78b4d000000b00688965c5227sm3826941pfd.120.2023.09.26.20.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 20:42:24 -0700 (PDT) From: Kees Cook To: Eric Biederman Cc: Kees Cook , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Sebastian Ott , =?utf-8?q?Thomas_Wei?= =?utf-8?q?=C3=9Fschuh?= , Pedro Falcato , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v3 3/4] binfmt_elf: Provide prot bits as context for padzero() errors Date: Tue, 26 Sep 2023 20:42:20 -0700 Message-Id: <20230927034223.986157-3-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927033634.make.602-kees@kernel.org> References: <20230927033634.make.602-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3658; i=keescook@chromium.org; h=from:subject; bh=wBfTuibkI1ZafUlyw4M9Ln83egyXuZyKwCYBlE+Ln0Q=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlE6SdGv8DDqtwm5Ol0LgrgyjZaP+4ZO6Wq6Zvc ewLHcLJGtKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZROknQAKCRCJcvTf3G3A JgOCD/9Yn5Qu3vikEH/yBMhn9z8VzLRLFdyRg9vmKyaQg1Y1oUqxhPpmdoBiT9lo4FEZcAz3Pbo slZs7xhhxScfjwwayUC/3eCa2sGC4pDlomjzWuLKZx+rhUKBTXLGk57l/T030w/BTGRk8OApPaS 19sBIkkgXFNfHvlcgw1zzeX4/JPF7yvsr936vFS/ypc4nuzEzdrRoMKxuTMgP+eVrsgNAri296j DeMk8JiLE+PzpbV1vRrhK/nP6G5m/OdH6OVZP3UIOq0+M1GnvJS0F1LVRL9T1aolQyan5mAn1/3 Tt2f5wsLeGNsy09fY4++KWw22oYo6YHGAYfwbp93cdnjtqCniroSVvEYPNiPdsd6OXtZm8O2ERQ IhyT1RCKLWjAXpK6Ow8yZYZwS2FmI0TRhU8BgygE3Qh5XkzdsjY0oi+QUkh3s0ktiqKyZxXrW40 k6zgbv7iGb6zTzbkqeecY4Tju47/elEUbwqNCxRnPcmd3SfCF0jwKWVwGGxUcBRaWdao36it2H0 09ADuzAuiBrMa1Z24c5C99+xO7kPruaySYYC7DV703FB3q5+qWFThooJ4gzw8qx5HyOZhtzvQhz zyn1WsqYfrF04pj19ZYwP3oimZ2OctqtY4fYgdF0pZadU5BzKZlwRvxwrEMy713xxETHnY6nu8b rYdT6wNKfO8hgTw== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 26E71C001B X-Stat-Signature: f7fnbgip41npwtwa8u1g4jo9wxeg5u49 X-HE-Tag: 1695786145-425173 X-HE-Meta: U2FsdGVkX1+4Z0jtbId5quQtewijaWdPjLelqXoG9bmSq8KtJi05LB9xK2sX+KS9sHykj1lAhXRy2QlW2wVn0kEBCTHo7vX3+JDXwNVr45wG8Db6WxKPQoVMFuozVTNcncXPUVvcHeWfJZbbFjNX+vb6c9yQ3Mgc3qNbRY8ps5J+q7r/kxt/UaMbaxDYGDbpkzOxB9WuxSeV56yWD+IETJixrULmEMlwo9Am+NV0HZJDQW/qy8vwk17r4NWxMfgg+TZRoto5yVyZrhUqc5fKcyLmtRI0Qa99i1HgDMOn+t9judYv/xNobs6ch5pp/Ob6fcg6idmUew6m99cKi3ooH6Tbd/zfkHOZDu6aE1i8JR15yFauL4TGmWDuXSsaCdVKNmbmE+surXPz1mxigyBRb15+/Ai0sV1jv0kPan1mHWvikfOFcRFbBkWMauuXx+HYd9uWhAAe0EjS5Zu/zPfPv7tw4zvxnK3cq3FG79bNf8den45fPMjMaqXm2a9b6n+QZa+6L3yzv8QgwMWNCmtqhy3xuSQExYlL6gKaXNsbOrIgVDiovOMpm1qbpiOoa0iXhN7oEckVloGpR81jQiVsQQBn1ZvfmV/YleyTdflGlSSFKFSL6/yMmQcW5aHZ0jZWC7eRC4ySfw0T4SSv7Jwwbs/V+M1vJ4fxgpA9MXzjunuGOXQ/ftEdP9tW1St7JXf2830RO2A7QgkqHuFddMcXRc4o32X6xgdaOvgg7zZnXgXh1WhLgANzp9J1PKq+E0sL7pvAJ1b2knz36gSRHevDZeGjTk7YIEs32A32J47+xFg6bj/1EYSB385XPpGw2cG8FZ7PjZ3CdypQWiIspX0r89nwdQMKgY2700ljPIaRPtgaqmivMwPKfeBDC5tW+zRs9O0icKcNkVvIs7bmQH7eR29P8xJZyzz6ZQBZPz/5Uz6oF2f8slxIy5Wb6BTS5Z6eUBZ3qt0+YYBzuPCVdFJ V89kmIb1 A8tJFQXKST32tbKupGt1C4rIG/cO9qZoN1Y3x2ShZRJoduTwpq1E1sawaipxmyTnpyd+6fdl5+LtqqUPAqUkYBce7nhcCFMscKhvPHxY586+sm7qVmFS0YAwP9aqfw4B7ROWHI2AommTsegv/g6erP5m0OKQkC81wYXdiSKeF81yi0Y1iyC1pcSdzfbY9cTs+hN31t+mag856CyPVYPk1T3xB5nAlIThd9rpP51FtRFxDT/22QdLG/O0eC1w48PV2oicopnGgx6GR5NJAmKJDZAJ3tq1bEGEUa9rDUuhhLINBcwlMqmfIOebaS3/k46vWTmxetxtfA4/cM7N537oyTw3oKKPpGQsvPWDgdeFN6tJu0/M4//MwbjsZ+5p+ihw9qOzUx0Vrd35C5cSdbbcDamo2LtEDQFs1Jqkof/XYih9393SjggFon0OJ5le8sD147mUUjK5hVI1mw/VDZCfCLsbGbfgveAS5QrwBU/zRwJJz9pBYbM1R7q+D7VLx7aAHMt8EJ2wR9oW+6PJ516GSukb6bdWgIzXu6494XDi1EEO+SQAt0DfTxlbcAckW72tBgEVjzdIbXNDNbA2TSZ1b7MOVKpKdSUWBYw/dRiDV9zerDTFPtuLfa2D4/Dxg/W3KWYSiM1gdi/iPTg72zYl3zxswtBljVIk4Ku/XMKz0IAeJ+egnbFh2U4ViE0AyhzscqRTUlSj8uG+HCxJWFf2CKjvTtmphjN4V9MCsVBNXKc7Y2SeGTfcJwtwRRD/qgTzIC1lK X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Errors with padzero() should be caught unless we're expecting a pathological (non-writable) segment. Report -EFAULT only when PROT_WRITE is present. Additionally add some more documentation to padzero(), elf_map(), and elf_load(). Cc: Eric Biederman Cc: Alexander Viro Cc: Christian Brauner Cc: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org Suggested-by: Eric Biederman Signed-off-by: Kees Cook --- fs/binfmt_elf.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 0214d5a949fc..b939cfe3215c 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -110,19 +110,21 @@ static struct linux_binfmt elf_format = { #define BAD_ADDR(x) (unlikely((unsigned long)(x) >= TASK_SIZE)) -/* We need to explicitly zero any fractional pages - after the data section (i.e. bss). This would - contain the junk from the file that should not - be in memory +/* + * We need to explicitly zero any trailing portion of the page that follows + * p_filesz when it ends before the page ends (e.g. bss), otherwise this + * memory will contain the junk from the file that should not be present. */ -static int padzero(unsigned long elf_bss) +static int padzero(unsigned long address, int prot) { unsigned long nbyte; - nbyte = ELF_PAGEOFFSET(elf_bss); + nbyte = ELF_PAGEOFFSET(address); if (nbyte) { nbyte = ELF_MIN_ALIGN - nbyte; - if (clear_user((void __user *) elf_bss, nbyte)) + /* Only report errors when the segment is writable. */ + if (clear_user((void __user *)address, nbyte) && + prot & PROT_WRITE) return -EFAULT; } return 0; @@ -348,6 +350,11 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec, return 0; } +/* + * Map "eppnt->p_filesz" bytes from "filep" offset "eppnt->p_offset" + * into memory at "addr". (Note that p_filesz is rounded up to the + * next page, so any extra bytes from the file must be wiped.) + */ static unsigned long elf_map(struct file *filep, unsigned long addr, const struct elf_phdr *eppnt, int prot, int type, unsigned long total_size) @@ -387,6 +394,11 @@ static unsigned long elf_map(struct file *filep, unsigned long addr, return(map_addr); } +/* + * Map "eppnt->p_filesz" bytes from "filep" offset "eppnt->p_offset" + * into memory at "addr". Memory from "p_filesz" through "p_memsz" + * rounded up to the next page is zeroed. + */ static unsigned long elf_load(struct file *filep, unsigned long addr, const struct elf_phdr *eppnt, int prot, int type, unsigned long total_size) @@ -405,7 +417,8 @@ static unsigned long elf_load(struct file *filep, unsigned long addr, eppnt->p_memsz; /* Zero the end of the last mapped page */ - padzero(zero_start); + if (padzero(zero_start, prot)) + return -EFAULT; } } else { map_addr = zero_start = ELF_PAGESTART(addr); @@ -712,7 +725,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, * the file up to the page boundary, and zero it from elf_bss * up to the end of the page. */ - if (padzero(elf_bss)) { + if (padzero(elf_bss, bss_prot)) { error = -EFAULT; goto out; } @@ -1407,7 +1420,7 @@ static int load_elf_library(struct file *file) goto out_free_ph; elf_bss = eppnt->p_vaddr + eppnt->p_filesz; - if (padzero(elf_bss)) { + if (padzero(elf_bss, PROT_WRITE)) { error = -EFAULT; goto out_free_ph; }