From patchwork Tue Dec 20 22:31:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 35208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3214861wrn; Tue, 20 Dec 2022 14:32:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXtKhm7dgEsPghcO0Ka3PPDxvw72+HhAtls6TnWvdUNlVOBlv5q0HST+YW86oc1qe+urye4J X-Received: by 2002:a05:6a20:9b93:b0:af:98cd:846a with SMTP id mr19-20020a056a209b9300b000af98cd846amr27299981pzb.30.1671575549825; Tue, 20 Dec 2022 14:32:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671575549; cv=none; d=google.com; s=arc-20160816; b=YgJxYFB5COsMeMUyQxaCg5YBcJBAOu+z7FRIlke5fmrqncQ+uVHSHU5bAT7nEtsxuz EfnDS6Vf01s7C1vE3qHdCVKAvxFVTVArGPRB0U2jYVeHYaO3R76Wc+PL8+gIzIKtX4Cq qD20ZxzvcUhIx0Oc4wyGGiCLTdnjFO1rg5yLs5wXCruXkOdIOC3JsXlgIcu68khJqsqA pVXx+JHFK81JlEyimjA+Jc62E8HfOvlNxDOEBM/kP4fridTftJJh0TqoSVSYRxjouzus G89krUT0P46C6EUSOFpbUvlXL08vC2/xXqukd255+ytdgqCHYMoIutKAqtJGR0wmdvGe MsEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=U5Pe07mEzVE78EvLTCD6fYM83lCIt58BET379Vpv3LY=; b=xqiOOQkgZC54w4iw/gyNXGL7i3Jn4txCGJhVQ9aikznsohiLj6g+I0twjIMKy4BcGh dJ1v2Ss18X2reVDE+Ezy09u/uxldqkrIoCKCBOJyh5JPY4/hQaH6mNHa11Z6xuz/X4ls 7a+dO8sL9UXb+LzOs16eNTYgpe8rk7FnwANiCSZLudoDUgPw8ede3gQLrduL3HoCj2rd q/yQYfmLc+tevdfpWegXw7UBdsVfjBRBv2Wtfi3k/KIW6JS1NfYl6Ftap+uJ9w/rn7sx NIRt0ejZ8NjB1/85vfuwaSKs0CmyjNMnQQPWLdkoYs9XmGJ7D2C1nKqpSkQHRmS0RKm+ 9D+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lBmDiboc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 135-20020a63018d000000b00489a4cba34fsi9391786pgb.21.2022.12.20.14.32.16; Tue, 20 Dec 2022 14:32:29 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lBmDiboc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S234029AbiLTWbr (ORCPT + 99 others); Tue, 20 Dec 2022 17:31:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233959AbiLTWbp (ORCPT ); Tue, 20 Dec 2022 17:31:45 -0500 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5A131C931; Tue, 20 Dec 2022 14:31:43 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id u7so5528861plq.11; Tue, 20 Dec 2022 14:31:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=U5Pe07mEzVE78EvLTCD6fYM83lCIt58BET379Vpv3LY=; b=lBmDibocl83YZZUlii4qBcmZIL6kJHoMdaPxxevMX/AMm7ohl8MRB/WRDsgspNmm1m IzyOwftrVlNRB4tE9MYO5wMYlNmFa5ExN9SQ76W9ZXT2s2fTkO4jWtToNuVBCmwzaO4z XWYneZWgqKA57oOeCNdqudLQ5doMieYnTGrFTJMT9wZhdGacEPYQ4fdXXP4L8FfKab2/ wTfl4XG+plwSe7Q7cRwVfcBjdeGF8vgZIdGi7tVxbCQMyVbNaxYCLXurftJqQkNtfLOi 6mSUHQKLMZKD7zVyv+MRhdmfcR4iHepny1M0aK7svv45n8Ui5oGxayQ6rK2xhtAozrjd p8eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=U5Pe07mEzVE78EvLTCD6fYM83lCIt58BET379Vpv3LY=; b=BG6c0h2PTnSzT1sjLy48AvnMMjWKfJIHCdYn37OYGhQFyEKxx1/De8pDISL6QtnzNw waajJK4NcpZIMloYfX8v025SWaXq0HyHU+dmsyi2oLHO2DrKujDA0bfaKUyiaQArsTzG +XemE4HUpnA2/viWqmoh3qcCBFmYUVtaZMeOzWjmULzY3FNGPJnHjY67sW8TvnIr33oZ HrUymNGCjsMDmKgA9s/qAXakvLr4gLK4m/cd7L7FJ6mM6ccisfT9mDZlbDq8SST+fpfe d67qOsA2DyfmRVg/D0XLLUpKenJ1WagoEK9eLSsI+7c6GUpEw+TpDRt1YQXhLLJOHPGh 2ZcA== X-Gm-Message-State: ANoB5pkedZaczw1G5zzhQUbIcENzXWJ0AAIMjG0AtQvOJhxmdDgNUV3O LGvAlRGbO6Ib3E9rLg8wiVDDD/tLn0k= X-Received: by 2002:a17:902:f602:b0:187:4920:3a3c with SMTP id n2-20020a170902f60200b0018749203a3cmr51067334plg.33.1671575503283; Tue, 20 Dec 2022 14:31:43 -0800 (PST) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:68c4:de54:581a:ee2]) by smtp.gmail.com with ESMTPSA id f15-20020a170902684f00b00182d25a1e4bsm9825160pln.259.2022.12.20.14.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 14:31:42 -0800 (PST) Sender: Namhyung Kim From: Namhyung Kim To: Peter Zijlstra Cc: Ingo Molnar , Mark Rutland , Alexander Shishkin , Arnaldo Carvalho de Melo , Jiri Olsa , LKML , KP Singh , stable@vger.kernel.org, Joel Fernandes Subject: [PATCH RESEND] perf/core: Call LSM hook after copying perf_event_attr Date: Tue, 20 Dec 2022 14:31:40 -0800 Message-Id: <20221220223140.4020470-1-namhyung@kernel.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752774003481321436?= X-GMAIL-MSGID: =?utf-8?q?1752774003481321436?= It passes the attr struct to the security_perf_event_open() but it's not initialized yet. Fixes: da97e18458fb ("perf_event: Add support for LSM and SELinux checks") Cc: stable@vger.kernel.org Reviewed-by: Joel Fernandes (Google) Signed-off-by: Namhyung Kim --- kernel/events/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 65e20c5c3c44..5d7193d3ffef 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -12293,12 +12293,12 @@ SYSCALL_DEFINE5(perf_event_open, if (flags & ~PERF_FLAG_ALL) return -EINVAL; - /* Do we allow access to perf_event_open(2) ? */ - err = security_perf_event_open(&attr, PERF_SECURITY_OPEN); + err = perf_copy_attr(attr_uptr, &attr); if (err) return err; - err = perf_copy_attr(attr_uptr, &attr); + /* Do we allow access to perf_event_open(2) ? */ + err = security_perf_event_open(&attr, PERF_SECURITY_OPEN); if (err) return err;