Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp2041821ybh; Fri, 24 Jul 2020 03:01:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylDak7fwe3wDi4bNV5wGoR8M2TRJk6mgKP72qwjErJYgku7Z0wRvNoy7hYBTdVudMDPxoD X-Received: by 2002:a17:906:1f8e:: with SMTP id t14mr1991309ejr.336.1595584877378; Fri, 24 Jul 2020 03:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595584877; cv=none; d=google.com; s=arc-20160816; b=k7D/GHWf+HTQ4o0oFNYJshkPpM+3etXo21cURLM46GnaxUXckm/BTy+Ubx2s7XKGvx v4D3EvDhTD6z74CwSIFJfd/oj7elVhg2rsUk7beTYKiEiYh34EaBKd47DrIYwgan6rxa uzQ/gVcajyY//fzJ9MGwnNJeLv5PGCT4kKlFoKH3NDjyM+DdKK5h7yIuq1nkt5RJ+YBz 9RtV1DQPxPRcW4JyUTMAaZKAbN2W24Agmo6ns0VxaFA6cFMT6uxTkHa0qSXBKLAGxVNf 9NI5UjLdQN3AmVVmA29Yn2j543AjXXHjUHrFM/NZzN1720IPCJan/ClzxV+5c/jxM/g6 uryQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version; bh=lfdi8y7XT/GLwjnF+qwRBjmFZVJUF6UVVDZU9wm5TaQ=; b=mVOb/lmz3dqG0+D4fImd1WXWv2pTUyVNbIo0Y1KjmoXusm//JEji0vss0Wo5m7sGpM QKUnPHIrwCyCBJSr43eO7h+6VRjBCJNjeNLko8QjKwXGV5neWzHTf6f8pYDVZlsJJKcM b2O7rPMk8S8Z61lN/mWcQ+z+jzURVjUrS+TPFaqsML1eotksdP6xKtNZcixPHNB6bmA0 GH0/21cKHiuFi7CWKHt2hqY8h+shb/Y7l+PV+pjBsSNYqaV0fZa6cG8dqjR8oN2EDte/ L7G7TeaIncTBXXkeTTQag20/i4si1drEWazDpT9sEB1nZcw+ouaoa33ou2MuiIID7cbQ e5sQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c25si278809ejb.6.2020.07.24.03.00.54; Fri, 24 Jul 2020 03:01:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727845AbgGXJ5u (ORCPT + 99 others); Fri, 24 Jul 2020 05:57:50 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:38760 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726114AbgGXJ5t (ORCPT ); Fri, 24 Jul 2020 05:57:49 -0400 Received: by mail-oi1-f194.google.com with SMTP id r8so7569102oij.5; Fri, 24 Jul 2020 02:57:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lfdi8y7XT/GLwjnF+qwRBjmFZVJUF6UVVDZU9wm5TaQ=; b=Ez+sMokykO4w4KpZehFNr7BA5uhHCSc4xXzgwp5QiYK+vnky5ScwO5vFCaqqqiaYSf ObCXes2JOIvaMkcOnz96S3/aL+SMR29FNyVhT7bkwPklTXLczgsepDnfS+TsJpv5cLUP MH9X7F/TQIQTnZoRhyJ1/uTFczOp2BIarRVFRftbtRpTsqNRVx7wm6irfs5vC2Bu4dNS 1lnVRr7VALhlvO08+oULoaBKjyEMTteLb6xPW9Ks8doOURX6yI+JjhEg3oBtENL6yguq eCKZxdGqWqs+LmgPJ9UpxRocBzE1dFm6fYRUOZ6Xx4TkjjDr3CxEgcXVTUNfO6bKFoT9 hL6A== X-Gm-Message-State: AOAM5327SSChE3uN6u+HJEVr8bY3b8flL10O2gVJpff++tBBr0fYSriE WAtwbsSaydo9ui7hq5XOzwVbuA4Yuq0TlPbcj8pwEA== X-Received: by 2002:a05:6808:34e:: with SMTP id j14mr7576095oie.110.1595584668419; Fri, 24 Jul 2020 02:57:48 -0700 (PDT) MIME-Version: 1.0 References: <1594005196-16327-1-git-send-email-neal.liu@mediatek.com> <1594005196-16327-2-git-send-email-neal.liu@mediatek.com> <1594350535.4670.13.camel@mtkswgap22> <1595233294.8055.0.camel@mtkswgap22> <20200723190724.GA1339461@google.com> In-Reply-To: <20200723190724.GA1339461@google.com> From: "Rafael J. Wysocki" Date: Fri, 24 Jul 2020 11:57:37 +0200 Message-ID: Subject: Re: [PATCH v2] cpuidle: change enter_s2idle() prototype To: Sami Tolvanen Cc: Neal Liu , "Rafael J. Wysocki" , "Rafael J. Wysocki" , Len Brown , Daniel Lezcano , Thierry Reding , Jonathan Hunter , Jacob Pan , Matthias Brugger , ACPI Devel Maling List , Linux PM , linux-tegra , Linux ARM , "moderated list:ARM/Mediatek SoC..." , lkml , wsd_upstream Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 23, 2020 at 9:07 PM Sami Tolvanen wrote: > > On Mon, Jul 20, 2020 at 04:21:34PM +0800, Neal Liu wrote: > > Gentle ping on this patch. > > > > > > On Fri, 2020-07-10 at 11:08 +0800, Neal Liu wrote: > > > On Thu, 2020-07-09 at 14:18 +0200, Rafael J. Wysocki wrote: > > > > On Mon, Jul 6, 2020 at 5:13 AM Neal Liu wrote: > > > > > > > > > > Control Flow Integrity(CFI) is a security mechanism that disallows > > > > > changes to the original control flow graph of a compiled binary, > > > > > making it significantly harder to perform such attacks. > > > > > > > > > > init_state_node() assign same function callback to different > > > > > function pointer declarations. > > > > > > > > > > static int init_state_node(struct cpuidle_state *idle_state, > > > > > const struct of_device_id *matches, > > > > > struct device_node *state_node) { ... > > > > > idle_state->enter = match_id->data; ... > > > > > idle_state->enter_s2idle = match_id->data; } > > > > > > > > > > Function declarations: > > > > > > > > > > struct cpuidle_state { ... > > > > > int (*enter) (struct cpuidle_device *dev, > > > > > struct cpuidle_driver *drv, > > > > > int index); > > > > > > > > > > void (*enter_s2idle) (struct cpuidle_device *dev, > > > > > struct cpuidle_driver *drv, > > > > > int index); }; > > > > > > > > > > In this case, either enter() or enter_s2idle() would cause CFI check > > > > > failed since they use same callee. > > > > > > > > Can you please explain this in a bit more detail? > > > > > > > > As it stands, I don't understand the problem statement enough to apply > > > > the patch. > > > > > > > > > > Okay, Let's me try to explain more details. > > > Control Flow Integrity(CFI) is a security mechanism that disallows > > > changes to the original control flow graph of a compiled binary, making > > > it significantly harder to perform such attacks. > > > > > > There are multiple control flow instructions that could be manipulated > > > by the attacker and subvert control flow. The target instructions that > > > use data to determine the actual destination. > > > - indirect jump > > > - indirect call > > > - return > > > > > > In this case, function prototype between caller and callee are mismatch. > > > Caller: (type A)funcA > > > Callee: (type A)funcB > > > Callee: (type C)funcC > > > > > > funcA calls funcB -> no problem > > > funcA calls funcC -> CFI check failed > > > > > > That's why we try to align function prototype. > > > Please feel free to feedback if you have any questions. > > I think you should include a better explanation in the commit message. > Perhaps something like this? > > init_state_node assigns the same callback function to both enter and > enter_s2idle despite mismatching function types, which trips indirect > call checking with Control-Flow Integrity (CFI). > > > > > > Align function prototype of enter() since it needs return value for > > > > > some use cases. The return value of enter_s2idle() is no > > > > > need currently. > > > > > > > > So last time I requested you to document why ->enter_s2idle needs to > > > > return an int in the code, which has not been done. Please do that. > > Rafael, are you happy with the commit message documenting the reason, > or would you prefer to also add a comment before enter_s2idle? As I said before, it would be good to have a comment in the code as well or people will be wondering why it is necessary to return anything from that callback, because its return value is never used. Thanks!