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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 99EECC388F7 for ; Mon, 9 Nov 2020 13:36:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D44220658 for ; Mon, 9 Nov 2020 13:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604929010; bh=Ba8ejmRJaJTHm0BtxP8Zu5VIUwq0Z1XprR6TwG7e3f8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mzuc4U3hshqmqVoIMDMf3JuE0SBG/my+3NK+cWEMMYB9UXZyPaKb7vYlAj868DG4+ 86bxUZYOzxzZ7IpSA0/a5E541MRGpO0cXj9n8jyp00FSkQfVjrTcl5RYs7T0lYqHmx odqLtxg6na9gXwRbiuL7sbHyduS/yNLQlDaL+uXE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730789AbgKINgt (ORCPT ); Mon, 9 Nov 2020 08:36:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:57596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730464AbgKINEn (ORCPT ); Mon, 9 Nov 2020 08:04:43 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 96E9721D46; Mon, 9 Nov 2020 13:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927073; bh=Ba8ejmRJaJTHm0BtxP8Zu5VIUwq0Z1XprR6TwG7e3f8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bbhHnHiKwKlLbdZREeaaxpd2zHdq/6u5QA/vXehctdizd++aLXsbJNxskz+fcsYsB jyVAupyISLQ7jAXgN+i6xWDPhnenvVn7BQ4aw+4JdehALUV+jv3xoUht5HtePF5ExG agEC1iHhKZGKIVnGIE84biyMEKqnA03j4ovI8IrU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiujun Huang , "Steven Rostedt (VMware)" Subject: [PATCH 4.9 101/117] tracing: Fix out of bounds write in get_trace_buf Date: Mon, 9 Nov 2020 13:55:27 +0100 Message-Id: <20201109125030.496019435@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125025.630721781@linuxfoundation.org> References: <20201109125025.630721781@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiujun Huang commit c1acb4ac1a892cf08d27efcb964ad281728b0545 upstream. The nesting count of trace_printk allows for 4 levels of nesting. The nesting counter starts at zero and is incremented before being used to retrieve the current context's buffer. But the index to the buffer uses the nesting counter after it was incremented, and not its original number, which in needs to do. Link: https://lkml.kernel.org/r/20201029161905.4269-1-hqjagain@gmail.com Cc: stable@vger.kernel.org Fixes: 3d9622c12c887 ("tracing: Add barrier to trace_printk() buffer nesting modification") Signed-off-by: Qiujun Huang Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2382,7 +2382,7 @@ static char *get_trace_buf(void) /* Interrupts must see nesting incremented before we use the buffer */ barrier(); - return &buffer->buffer[buffer->nesting][0]; + return &buffer->buffer[buffer->nesting - 1][0]; } static void put_trace_buf(void)