Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <2643836.mvXUDI8C0e@kreacher> <FA016A79-B2B1-42A4-A63F-3A44B3EC57CB@chromium.org>
In-Reply-To: <FA016A79-B2B1-42A4-A63F-3A44B3EC57CB@chromium.org>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Fri, 5 Aug 2022 16:10:29 +0200
Message-ID: <CAJZ5v0j0ebQMWeR2VWjdRufYEoQ_viysYjsvFSVFX11ef2R17Q@mail.gmail.com>
Subject: Re: [PATCH] PM: core: Do not randomize struct dev_pm_ops layout
To:     Kees Cook <keescook@chromium.org>
Cc:     "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Linux PM <linux-pm@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, Aug 5, 2022 at 4:12 AM Kees Cook <keescook@chromium.org> wrote:
>
>
>
> On August 4, 2022 10:15:08 AM PDT, "Rafael J. Wysocki" <rjw@rjwysocki.net> wrote:
> >From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> >Because __rpm_get_callback() uses offsetof() to compute the address of
> >the callback in question in struct dev_pm_ops, randomizing the layout
> >of the latter leads to interesting, but unfortunately also undesirable
> >results in some cases.
>
> How does this manifest? This is a compile-time randomization, so offsetof() will find the correct location.

Well, I would think so.

> Is struct dev_pm_ops created or consumed externally from the kernel at any point?

I'm not sure TBH.  I have seen a trace where pci_pm_resume_noirq() is
evidently called via rpm_callback() which should never happen if the
offset computation is correct.

The driver in question (which is out of the tree for now) is modular,
so in theory it could be built separately from the rest of the kernel,
but I think that this still should work, shouldn't it?

> >
> >Prevent that from happening by using the __no_randomize_layout
> >annotation on struct dev_pm_ops.
> >
> >Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >---
> > include/linux/pm.h |    2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >Index: linux-pm/include/linux/pm.h
> >===================================================================
> >--- linux-pm.orig/include/linux/pm.h
> >+++ linux-pm/include/linux/pm.h
> >@@ -307,7 +307,7 @@ struct dev_pm_ops {
> >       int (*runtime_suspend)(struct device *dev);
> >       int (*runtime_resume)(struct device *dev);
> >       int (*runtime_idle)(struct device *dev);
> >-};
> >+} __no_randomize_layout;
> >
> > #define SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
> >       .suspend = pm_sleep_ptr(suspend_fn), \
> >
> >
> >
>
> --
> Kees Cook