Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp836345pja; Wed, 1 Apr 2020 09:34:51 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtl5klWYh6r8W1VDmLPaMudQirTCfTkASUUucFmtfWiaUtsEfGyZ0WsqYzcAnQBqHRTNQUY X-Received: by 2002:a9d:2002:: with SMTP id n2mr6155621ota.127.1585758890987; Wed, 01 Apr 2020 09:34:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585758890; cv=none; d=google.com; s=arc-20160816; b=luIu4ntDahjownZeGeH5pUjeeOFe36OYZKQ+BtbHHyvi4chcOmnd7aDeWRoC1opH2Y L50WYQ2PSnPo+YM5/gfhZy0edK6OpRtOD0TxRK4cdXb5erqd6l2jfx5aTsHvve5z9Wi6 nHKo/kpVYHqpMOXIlcorVbFlKOfPb/vS7qJ74l5/TCGbiE8Pb4GDpacrirzN4s99A5SS u3bCEuB3Z9OS2MUwPgtZ6P6gzyz0L7pF8iIxILXMtqUx1ZuovI8vXrQBuciUiQgch6z8 UT1fxTCtlwN776tTwYyxVj1+zN7nxvUAQHSXB6DqR02NCg645esI6dLzSjUPsKMyjcw1 y2hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+bQuX5RZymQJGvLj4M7V/Owpno6EcQX+Ubt4I4iy4RU=; b=HVxFWqKz+mF4an/1CIwGZ09sc6ksFAN2sd/A1lQSsul/oT+bg7o9lOg3QJOqT/JKvj 2hYB+vEodvWUeq0YCCW1uxIaU81SqkLJFgtgroeH7qaTOLMW1DpvE/JU5sarYiJlbmjj B7/JB5gbx+eBi/4VS+qQEaan00gUXSnK617hTGYjj/5M3LgEOWUbwiReYShMASnhPA4s Wj/azEIjsL+5uLioUaQiNRvJSbtvbjno3TD0GEE0HA5qC1ETfjEI6P5QFPcStsVyw6fs HfGH+VErGONtAm8xNvW3UFy1XqJC4gewO35TBoEQwXmrIG6JkMlldZbYYBk+rIiFACho rFag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ohPKAsYW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si1020484ote.164.2020.04.01.09.34.37; Wed, 01 Apr 2020 09:34:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ohPKAsYW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388519AbgDAQdM (ORCPT + 99 others); Wed, 1 Apr 2020 12:33:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:59702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388506AbgDAQdL (ORCPT ); Wed, 1 Apr 2020 12:33:11 -0400 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 748CC20658; Wed, 1 Apr 2020 16:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758790; bh=LMexIkopUo954GN94LuWkdP8HZYMrYwcMo5e4teYJZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ohPKAsYW7jVGY9zmvLFqN3lHgiKq5ne17KN2kvk0xmmoxAaO568q2iJVHPraFMlQ5 rDEw+D4bH6YWbd2oefaLLKm22ncDjhxAJDOubcZzZHOcFUkOsa/718K7D3aUJzIYmH Fm8E2gkOfcB52iYwqhQolRH733qLfMGpKxhEXgVY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+fcab69d1ada3e8d6f06b@syzkaller.appspotmail.com, Alexander Potapenko , Eric Biggers , Kees Cook Subject: [PATCH 4.4 77/91] libfs: fix infoleak in simple_attr_read() Date: Wed, 1 Apr 2020 18:18:13 +0200 Message-Id: <20200401161538.101114467@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161512.917494101@linuxfoundation.org> References: <20200401161512.917494101@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: Eric Biggers commit a65cab7d7f05c2061a3e2490257d3086ff3202c6 upstream. Reading from a debugfs file at a nonzero position, without first reading at position 0, leaks uninitialized memory to userspace. It's a bit tricky to do this, since lseek() and pread() aren't allowed on these files, and write() doesn't update the position on them. But writing to them with splice() *does* update the position: #define _GNU_SOURCE 1 #include #include #include int main() { int pipes[2], fd, n, i; char buf[32]; pipe(pipes); write(pipes[1], "0", 1); fd = open("/sys/kernel/debug/fault_around_bytes", O_RDWR); splice(pipes[0], NULL, fd, NULL, 1, 0); n = read(fd, buf, sizeof(buf)); for (i = 0; i < n; i++) printf("%02x", buf[i]); printf("\n"); } Output: 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a30 Fix the infoleak by making simple_attr_read() always fill simple_attr::get_buf if it hasn't been filled yet. Reported-by: syzbot+fcab69d1ada3e8d6f06b@syzkaller.appspotmail.com Reported-by: Alexander Potapenko Fixes: acaefc25d21f ("[PATCH] libfs: add simple attribute files") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Acked-by: Kees Cook Link: https://lore.kernel.org/r/20200308023849.988264-1-ebiggers@kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/libfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/fs/libfs.c +++ b/fs/libfs.c @@ -761,7 +761,7 @@ int simple_attr_open(struct inode *inode { struct simple_attr *attr; - attr = kmalloc(sizeof(*attr), GFP_KERNEL); + attr = kzalloc(sizeof(*attr), GFP_KERNEL); if (!attr) return -ENOMEM; @@ -801,9 +801,11 @@ ssize_t simple_attr_read(struct file *fi if (ret) return ret; - if (*ppos) { /* continued read */ + if (*ppos && attr->get_buf[0]) { + /* continued read */ size = strlen(attr->get_buf); - } else { /* first read */ + } else { + /* first read */ u64 val; ret = attr->get(attr->data, &val); if (ret)