From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (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 7A424157487 for ; Tue, 14 Jan 2025 15:25:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736868318; cv=none; b=puyJK++CCmFZGqrZEW7YMqMDE6+OUsqZdJXVPuocpQUWWSntiLPupUxE0txMjSRhR9mRjsXVMaW4eztpjOK2EDTQXrPQhIN8zQg8FJEaRQiMc+e20aTyTAdWlcrshv9pxBDxNfeFqu/Gmgi1mTdt3lhJJMrOp3tRwMaY6331Yok= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736868318; c=relaxed/simple; bh=bfYihCfAIigf4GfbI86CDwscUaj/dr6QORIh9fL1WHk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SGskHhW4AzhvXN8gCcGSKbHg1uh7ZXc2EYRvflNBzoZmB3LpuaRpDUDxRFhy2C3mlSq9pVydGwMyK5SHVsjBNDiNJlFXtpl1488/cxaPr/ggAfAb/dx8LLDSu6KbkLjnaEBKoPdBLGYL21Sp9HPEF7Yh4U7c88YAtVSB9qO/hcE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=DGN+KMOE; arc=none smtp.client-ip=209.85.166.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="DGN+KMOE" Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-3a813899384so17423985ab.1 for ; Tue, 14 Jan 2025 07:25:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1736868314; x=1737473114; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=v+1Lu+c4d+CZfkxxtpb+u7W/NPbLrNX6Z4fG+B04hbI=; b=DGN+KMOEpMJphLFL3Hj19J9zSa7DC3nUazi0Dx6qp6KUB58NprtnUPGRlyHR/9G7yb /T7KZO1kMdZ26UGLbIaw6QCW40ePUTImssP84MSBXE0nUW+U7ZTZalS37KpgE1KCxEv8 zwM48keCglnJJQC3/evlZgqtSPDggU8twNJSQntQAqFMaKMNiAmR72pWPPgMgsGacPSF qZBYPViDW5YBUBPEBJJ6M33Y1ns03AahrntSev8JVqBTMdkE5BKcJeOps1/w/AIFQB0k K/2lTZ0yXUjJC6r1wCNEoKosdr5fQU+DdXnr1R/vXcF68+Tm19/U32MjN9P1+6kjePN2 Ng8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736868314; x=1737473114; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=v+1Lu+c4d+CZfkxxtpb+u7W/NPbLrNX6Z4fG+B04hbI=; b=GozI9CsoafYqXitAxT5leBhLnQxl+3+7alyVXsUhRAYiHfqGTouyf5770IC4TaiRNG HOnU4bfd2b4mSdlYKlAZ9P/iSu5Z7Gke5mUZ7Oe3FPWf0muG3aLvEysHuUedmJjLM+bu k6V7JdoeXacbXljD8ygS9pfA4/YZo0VIVK3nqzDrCux7eBR63QKRJfn4UrGRgK8+3Sc2 hhEMXsQTp8mS9paa4VrIF8uqMlmMP5M9C2e4A8xW9A9mR2kGKUP6vZay0zO53fL35Z3h qAZYICyI5THdLcATUr6SQTDoWW1o2H1yyW+7dN3s+SIP9aidh7CuP29t6vOryB315oY6 nnRA== X-Forwarded-Encrypted: i=1; AJvYcCWBoEkIJVqDXD178jRUqbaY7sj/OkKW2qiCuXE5MI0tfQr1fnPQifZ3ihxKhZ5aJpoMGwB2BXrjKUe5cHg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxq11Yj6CmxnAec0K5OWoRrWQZrJw9ndMf5m6YPtqU/XDkPs9JZ Aoz4GB+HlOeZk6plDF2+M0iRWeIk+GX6TN5roPt1ARIQ7dczvc3YXLJhRCzyN2w= X-Gm-Gg: ASbGncseLb71g6coWmsj8kgEaLEV49HihNP2b4sKw0zDQjs3ifBo2dF1xT8e7/FuLZC ZzWhSJZpcI2cOYyXcOpXYilqF4Vlwr9bGIsTuYbvseIhYDoEFeA1GE2lzOIzfPWv5BrGtgS3jvY sdHTQfrTy4LmdCCHj6WPoIkeQtlU+fO10mB/UtXkA5dUUfz6TN49IjeqV1KceCW1o52I1a2DQ+W wRcApn2n1Z9zIMOUkTdplQjxHoRR6K0fJe2/luqLgwtqU58nYFW X-Google-Smtp-Source: AGHT+IF8LamTOlS2aHRZbet7Phl2C57F9X7NDOwRyxc5onvJqlq3yKESwAxYurSfcbjuvtoQHrJY2g== X-Received: by 2002:a05:6e02:1687:b0:3a7:85ee:fa78 with SMTP id e9e14a558f8ab-3ce3a9c190dmr195163205ab.18.1736868314572; Tue, 14 Jan 2025 07:25:14 -0800 (PST) Received: from [192.168.1.116] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3ce4af56569sm34515995ab.63.2025.01.14.07.25.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jan 2025 07:25:13 -0800 (PST) Message-ID: <2df5c0d7-cf9e-49ce-a39a-4e3d50c6df0c@kernel.dk> Date: Tue, 14 Jan 2025 08:25:13 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V3] block: no show partitions if partno corrupted To: Edward Adam Davis Cc: hare@suse.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+fcee6b76cf2e261c51a4@syzkaller.appspotmail.com, syzkaller-bugs@googlegroups.com References: <813564af-a67a-4feb-ab32-1ca3bb41edfb@kernel.dk> From: Jens Axboe Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 1/14/25 8:15 AM, Edward Adam Davis wrote: > On Tue, 14 Jan 2025 08:02:15 -0700, Jens Axboe wrote: >>> diff --git a/block/genhd.c b/block/genhd.c >>> index 9130e163e191..3a9c36ad6bbd 100644 >>> --- a/block/genhd.c >>> +++ b/block/genhd.c >>> @@ -890,6 +890,9 @@ static int show_partition(struct seq_file *seqf, void *v) >>> >>> rcu_read_lock(); >>> xa_for_each(&sgp->part_tbl, idx, part) { >>> + int partno = bdev_partno(part); >>> + >>> + WARN_ON_ONCE(partno >= DISK_MAX_PARTS); >>> if (!bdev_nr_sectors(part)) >>> continue; >>> seq_printf(seqf, "%4d %7d %10llu %pg\n", >> >> Surely you still want to continue for that condition? > No. No? > But like following, ok? > diff --git a/block/genhd.c b/block/genhd.c > index 9130e163e191..142b13620f0c 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -890,7 +890,10 @@ static int show_partition(struct seq_file *seqf, void *v) > > rcu_read_lock(); > xa_for_each(&sgp->part_tbl, idx, part) { > - if (!bdev_nr_sectors(part)) > + int partno = bdev_partno(part); > + > + WARN_ON_ONCE(partno >= DISK_MAX_PARTS); > + if (!bdev_nr_sectors(part) || partno >= DISK_MAX_PARTS) > continue; > seq_printf(seqf, "%4d %7d %10llu %pg\n", > MAJOR(part->bd_dev), MINOR(part->bd_dev), That's just silly... xa_for_each(&sgp->part_tbl, idx, part) { int partno = bdev_partno(part); if (!bdev_nr_sectors(part)) continue; if (WARN_ON_ONCE(partno >= DISK_MAX_PARTS)) continue; ... } -- Jens Axboe