The patch titled
Subject: mm: /proc/pid/smaps_rollup: fix no vma's null-deref
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
mm-proc-pid-smaps_rollup-fix-no-vmas-null-deref.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche…
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Seth Jenkins <sethjenkins(a)google.com>
Subject: mm: /proc/pid/smaps_rollup: fix no vma's null-deref
Date: Mon, 3 Oct 2022 18:45:31 -0400
Commit 258f669e7e88 ("mm: /proc/pid/smaps_rollup: convert to single value
seq_file") introduced a null-deref if there are no vma's in the task in
show_smaps_rollup.
Link: https://lkml.kernel.org/r/20221003224531.1930646-1-sethjenkins@google.com
Fixes: 258f669e7e88 ("mm: /proc/pid/smaps_rollup: convert to single value seq_file")
Signed-off-by: Seth Jenkins <sethjenkins(a)google.com>
Reviewed-by: Alexey Dobriyan <adobriyan(a)gmail.com>
Tested-by: Alexey Dobriyan <adobriyan(a)gmail.com>
Cc: Jann Horn <jannh(a)google.com>
Cc: Vlastimil Babka <vbabka(a)suse.cz>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
fs/proc/task_mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/proc/task_mmu.c~mm-proc-pid-smaps_rollup-fix-no-vmas-null-deref
+++ a/fs/proc/task_mmu.c
@@ -969,7 +969,7 @@ static int show_smaps_rollup(struct seq_
vma = vma->vm_next;
}
- show_vma_header_prefix(m, priv->mm->mmap->vm_start,
+ show_vma_header_prefix(m, priv->mm->mmap ? priv->mm->mmap->vm_start : 0,
last_vma_end, 0, 0, 0, 0);
seq_pad(m, ' ');
seq_puts(m, "[rollup]\n");
_
Patches currently in -mm which might be from sethjenkins(a)google.com are
mm-proc-pid-smaps_rollup-fix-no-vmas-null-deref.patch
On Tue, Oct 04, 2022 at 06:46:10AM -0500, David Matthew Mattli wrote:
> Thorsten Leemhuis writes:
>
> > On 03.10.22 19:48, Ville Syrjälä wrote:
> >> On Mon, Oct 03, 2022 at 08:45:18PM +0300, Ville Syrjälä wrote:
> >>> On Sat, Oct 01, 2022 at 12:07:39PM +0200, Thorsten Leemhuis wrote:
> >>>> On 30.09.22 14:26, Jerry Ling wrote:
> >>>>>
> >>>>> looks like someone has done it:
> >>>>> https://bbs.archlinux.org/viewtopic.php?pid=2059823#p2059823
> >>>>>
> >>>>> and the bisect points to:
> >>>>>
> >>>>> |# first bad commit: [fc6aff984b1c63d6b9e54f5eff9cc5ac5840bc8c]
> >>>>> drm/i915/bios: Split VBT data into per-panel vs. global parts Best, Jerry
> |
> >>>>
> >>>> FWIW, that's 3cf050762534 in mainline. Adding Ville, its author to the
> >>>> list of recipients.
> >>>
> >>> I definitely had no plans to backport any of that stuff,
> >>> but I guess the automagics did it anyway.
> >>>
> >>> Looks like stable is at least missing this pile of stuff:
> >>> 50759c13735d drm/i915/pps: Keep VDD enabled during eDP probe
> >>> 67090801489d drm/i915/pps: Reinit PPS delays after VBT has been fully
> parsed
> >>> 8e75e8f573e1 drm/i915/pps: Split PPS init+sanitize in two
> >>> 586294c3c186 drm/i915/pps: Stash away original BIOS programmed PPS delays
> >>> 89fcdf430599 drm/i915/pps: Don't apply quirks/etc. to the VBT PPS
> >>> delays if they haven't been initialized
> >>> 60b02a09598f drm/i915/pps: Introduce pps_delays_valid()
> >>>
> >>> But dunno if even that is enough.
> >
> > If you need testers: David (now CCed) apparently has a affected machine
> > and offered to test patches in a different subthread of this thread.
> >
>
> I cherry-picked the six commits Thorsten listed onto 5.19.12 and it
> resolved the issue on my Framework laptop.
Thanks for testing, but I'm just going to revert the offending commits
as they probably shouldn't all be added to 5.19.y
thanks,
greg k-h
I'm announcing the release of the 5.19.13 kernel.
This release is to resolve a regression on some Intel graphics systems that had
problems with 5.19.12. If you do not have this problem with 5.19.12, there is
no need to upgrade.
The updated 5.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
drivers/gpu/drm/i915/display/g4x_dp.c | 22
drivers/gpu/drm/i915/display/icl_dsi.c | 18
drivers/gpu/drm/i915/display/intel_backlight.c | 23 -
drivers/gpu/drm/i915/display/intel_bios.c | 384 +++++++----------
drivers/gpu/drm/i915/display/intel_bios.h | 4
drivers/gpu/drm/i915/display/intel_ddi.c | 22
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 9
drivers/gpu/drm/i915/display/intel_display_types.h | 69 ---
drivers/gpu/drm/i915/display/intel_dp.c | 40 -
drivers/gpu/drm/i915/display/intel_dp.h | 2
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 6
drivers/gpu/drm/i915/display/intel_drrs.c | 3
drivers/gpu/drm/i915/display/intel_dsi.c | 2
drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 9
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 56 +-
drivers/gpu/drm/i915/display/intel_lvds.c | 6
drivers/gpu/drm/i915/display/intel_panel.c | 13
drivers/gpu/drm/i915/display/intel_pps.c | 70 ---
drivers/gpu/drm/i915/display/intel_psr.c | 35 -
drivers/gpu/drm/i915/display/intel_sdvo.c | 3
drivers/gpu/drm/i915/display/vlv_dsi.c | 21
drivers/gpu/drm/i915/i915_drv.h | 63 ++
23 files changed, 385 insertions(+), 497 deletions(-)
Greg Kroah-Hartman (9):
Revert "drm/i915/display: Fix handling of enable_psr parameter"
Revert "drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+"
Revert "drm/i915/dsi: filter invalid backlight and CABC ports"
Revert "drm/i915/bios: Split VBT data into per-panel vs. global parts"
Revert "drm/i915/bios: Split VBT parsing to global vs. panel specific parts"
Revert "drm/i915/bios: Split parse_driver_features() into two parts"
Revert "drm/i915/pps: Split pps_init_delays() into distinct parts"
Revert "drm/i915: Extract intel_edp_fixup_vbt_bpp()"
Linux 5.19.13