From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80B81206281 for ; Mon, 16 Dec 2024 17:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734371691; cv=none; b=tiThk230TRsUBvsZe1SsvEfCQyepr9yt6F1uN5sFw2VCTMhxTr/uk7+K9EVduM5sY15tP4TvzNtjHDwJ/pZ/kQpF0k9dg3AluHm4PzSzN7q+RlBgAg8vw96Nd98tsrFpjdZwyvKaMF6PFzuamvJxiQf4p11tpd0Aby7zJvErYqE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734371691; c=relaxed/simple; bh=t4FYe7Gm5xtC06oaiScu5p5Cbwegv+blsaKqUEyBo0g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=VOhcSAuFgKkb582LV9FywwabgSq7fOd30GCwGE36unYC/8QKUZYkf1b0gAfOwvrX/QTKGrVDhev9tfx/XwCUF97PPzIKyBDfkDj8jYPPi9lpVLylJdnEk8YmuB+k+d3le9yo1rzElgQmcFBeS1muY25HesuYvr6CTshSJR7C5Sc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jT4XH837; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jT4XH837" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-385d7b4da2bso4281478f8f.1 for ; Mon, 16 Dec 2024 09:54:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734371688; x=1734976488; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=G3AbEFKqDmJ/1viuki0ESyzjIWrD2kKZVZPFr7133W8=; b=jT4XH837vdHMX7hXcbldsGvaElnHnwASUn7SxdwbUt51LMc+tq4LD/xC3m9cI2PapC EzX+LTL3NfG/HsWV4FEpBWlF8I4ZW/s9LLppuUsmBGoxjsIuuw4urlW5CVqmSh0zOsQh 7/eRDGrrd1HxrqVYtP3QoEtteybVy65rfmXHLGIvCQ1wLuQ2KFpXue18zDXMBKrLareN PbBkMxCW5N0yFP+a1b4/e6OC6elGIkxe2Ih8JwwTrkIzIoQ/FWJYkVz0gtr0NS5Zv01d YZAm1zK9vIrRGC4SBzbYrXECFLRcSfppWTub+XHihodcRZAApeC68nIkJuGicwCn2yPl NGFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734371688; x=1734976488; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=G3AbEFKqDmJ/1viuki0ESyzjIWrD2kKZVZPFr7133W8=; b=abQVrUyy5NmaH6msoZQG51D0utWQ6AeYV5s9I7MW3Q+RUsJDqNqASY8D7NzNc7E+Ns s+482vD92ZoizlEGs3XqHkw0ogrU+qfsUCKm0d+g9vIu2uvugdkCtN+3OvkPIGsHDkxF 7ytupVY4fuzWYBTQLniYYdsXZevz4roOhRamgs8CiKkN2MRRW3s9LqsDsvQXFUEfMbpT zdP/2LpPNcjzI7cAGCwCiuiMt92wXI+osxGwNUZ32Qq8slFvdYJofIB0c+iBmuL6q4Km W5YGxaDBFkvouSKWv/uUsqkql6adCMs8J3h3QznIigKQ5VItmP9C4QwQI0VOekFXViGU wXSA== X-Forwarded-Encrypted: i=1; AJvYcCUc3w61NX3b1UZjC3o7AXIRIW7EOcAnZMHgvSzNBoXzpuhmgLZt6+1nm09lFWFfZDqZccMRlnebgMqCVVdawM/L/fA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6Cgs3ue/fnsWNe91sV7Pl6IPydXqVIyLQAyjvp2HviSsb1tPZ J8CkUpIl5pe7LSt9mwlAowLicJq+OLs/qu/C1WFugKOj9LZ9MErJ7Q8tYxXQBA== X-Gm-Gg: ASbGnctQJK/V8ldjUlAfPsHN8YP0OXliLWp27Ig3T+Nr7GK8CLmNLNKsTEwrnHG9af6 3tzGSbbN/B89m9Cxs7NVLxka540fjED6ap7kO+m/gDnrShcBiIoQBoSN9Z7U2Lo9h1ZRRnQg3f+ ZzN8yEKSAnWuGG3z9VhGq2fztxh6kGSmyDzsMH4USvXDPFTOFkWH/RI3+MECbWlvsfSxpyjb8kz oovF2L+8jffUdVM41lvcO6zIK543dwnC4wxT07LJKbay3TngyvKsPXQrDZWAjHu3mKOwjHhX5oP sIy4mF8t4a/K34DbBQySvg== X-Google-Smtp-Source: AGHT+IGlns8j8gYRX+8al9zuzgAiKn/tbr/9/wdBkt9kQs6HtCRG/bDMRMDr27QgDSp6SOTOy/GBrA== X-Received: by 2002:a05:6000:70d:b0:385:ded5:86ee with SMTP id ffacd0b85a97d-3888e0c0515mr12706974f8f.57.1734371687837; Mon, 16 Dec 2024 09:54:47 -0800 (PST) Received: from google.com (202.88.205.35.bc.googleusercontent.com. [35.205.88.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c80121d4sm8996562f8f.2.2024.12.16.09.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 09:54:47 -0800 (PST) Date: Mon, 16 Dec 2024 17:54:43 +0000 From: Vincent Donnefort To: Jeongjun Park Cc: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: Re: [PATCH] ring-buffer: fix array bounds checking Message-ID: References: <20241216164931.57323-1-aha310510@gmail.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241216164931.57323-1-aha310510@gmail.com> On Tue, Dec 17, 2024 at 01:49:30AM +0900, Jeongjun Park wrote: > If there is a case where the variable s is greater than or equal to nr_subbufs > before entering the loop, oob read or use-after-free will occur. This problem > occurs because the variable s is used as an index to dereference the > struct page before the variable value range check. This logic prevents the > wrong address value from being copied to the pages array through the subsequent > range check, but oob read still occurs, so the code needs to be modified. Hi Jeongjun, thanks for the patch. Did you find a reproducer for that problem or has it just been found by code inspection? As discussed here [1], s >= nr_subbufs should really never happen as we already cap nr_pages. [1] https://lore.kernel.org/all/78e20e98-bdfc-4d7b-a59c-988b81fcc58b@redhat.com/, > > Fixes: 117c39200d9d ("ring-buffer: Introducing ring-buffer mapping functions") > Signed-off-by: Jeongjun Park > --- > kernel/trace/ring_buffer.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c > index 7e257e855dd1..83da74bf7bd6 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -6994,9 +6994,9 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, > { > unsigned long nr_subbufs, nr_pages, nr_vma_pages, pgoff = vma->vm_pgoff; > unsigned int subbuf_pages, subbuf_order; > - struct page **pages; > + struct page **pages, *page; > int p = 0, s = 0; > - int err; > + int err, off; > > /* Refuse MP_PRIVATE or writable mappings */ > if (vma->vm_flags & VM_WRITE || vma->vm_flags & VM_EXEC || > @@ -7055,14 +7055,14 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, > } > > while (p < nr_pages) { > - struct page *page = virt_to_page((void *)cpu_buffer->subbuf_ids[s]); > - int off = 0; > - I believe we can keep the struct page and off declaration within the while loop. > if (WARN_ON_ONCE(s >= nr_subbufs)) { > err = -EINVAL; > goto out; > } > > + page = virt_to_page((void *)cpu_buffer->subbuf_ids[s]); > + off = 0; > + > for (; off < (1 << (subbuf_order)); off++, page++) { > if (p >= nr_pages) > break; > --