From patchwork Tue Dec 13 03:05:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Moore X-Patchwork-Id: 13071679 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28A98C4167B for ; Tue, 13 Dec 2022 03:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234451AbiLMDGF (ORCPT ); Mon, 12 Dec 2022 22:06:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234453AbiLMDFz (ORCPT ); Mon, 12 Dec 2022 22:05:55 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C8DA1DDF2 for ; Mon, 12 Dec 2022 19:05:44 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id js9so1956094pjb.2 for ; Mon, 12 Dec 2022 19:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+11UAkspQI3Jl+0ZwasHXEveHAO0fduT9eEWrtO/NFw=; b=vAmV6Ve9T1g68nyf2BTmmpfK3ZAGVjLDM0mB03JCVfPJ+0zm5oDlT2x1lMWBmWvEun JWccJWMmHWfCBtbI4jaNV6v5hZDiD/Nru7tBCwZYniVVgfjvbfIgqz6NiaXNRUWCEscJ tIoB+qjES458S02apGDAi4zOFeC+lmlicxeU/8GekT6FthKNDxvGD7yxGvrd0xRrkMbA iMUjUYosY6NT0XivSapHmBKx8zDGq7a8gw5Q2MlX7LBEiHObn7KM6aa1Tw7/pMUqKnl2 6zr+2AN4bupICc0bCNyd0yqN6ynMNsz2QNxvoA3K/Cs5Sya66ZPRtBP6GvBNXmoWUbfs 6+7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+11UAkspQI3Jl+0ZwasHXEveHAO0fduT9eEWrtO/NFw=; b=F8trxwTotW6S6sPmJwaA8YGT/fzF8U6UxF/GivjUB8Q7fjByrJaD7QQbUmbbCZaFYR 1SXqz4mMJqGXFxLGOcs/HoVxm2q5T8WYQEzV8YKSs0oB51l8xvtaQH2yRJ62vxnIj2tg YGdUSURDOXN7RNpeH575A+2u5O7OsZWkK0NWlcB131gHYVZ3qltASo7nEzJj+Ae6o0zy 8QFsOajMIk+7+JUpTeIibcRYG+w7Qwl42Bypira4Hf0zM7UFhdPkmhgdQ3dfX20WI80C GGaU3bQHzX6DpSLl316uGcMcqjh4Ozhpj5a2ZexME+U67trqfSjgLLwoob4CmtuRhpSJ 5SLw== X-Gm-Message-State: ANoB5pnQfqejsUrgGYvdpHuaWOhwzJmsaWkg1vcRdmwLz+t03ixzU7eu OI6dF2M9fMqmUsjdkTQB2EujqLg4Awnub9tmz29fM76N5leM6Tc= X-Google-Smtp-Source: AA0mqf4dO55J3qEuFKf35PPU8uD2z8ih9tAlQEyhv0JLUdm0PiTX77Y0W9NqQv+W5PCq12uE/0W2kosgxqOLYeCqGaU= X-Received: by 2002:a17:90a:fa8c:b0:221:5597:5de7 with SMTP id cu12-20020a17090afa8c00b0022155975de7mr136592pjb.147.1670900743486; Mon, 12 Dec 2022 19:05:43 -0800 (PST) MIME-Version: 1.0 From: Paul Moore Date: Mon, 12 Dec 2022 22:05:32 -0500 Message-ID: Subject: [GIT PULL] SELinux patches for v6.2 To: Linus Torvalds Cc: selinux@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: Hi Linus, Two SELinux patches for Linux v6.2: one increases the sleep time on deprecated functionality, and one removes the indirect calls in the sidtab context conversion code. Unfortunately, this pull request does conflict with fixes that were merged during the v6.1-rcX cycle so you will either need to do some manual fixup or you can pull the tag below which has the necessary fixes and has been sanity tested today. If you're looking for something different to handle this merge, let me know. * tags/selinux-pr-20221212.merge -Paul --- The following changes since commit 9abf2313adc1ca1b6180c508c25f22f9395cc780: Linux 6.1-rc1 (2022-10-16 15:36:24 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git tags/selinux-pr-20221212 for you to fetch changes up to 048be156491ff1aeb0fe5ff0862644d38cd39015: selinux: remove the sidtab context conversion indirect calls (2022-11-09 11:00:49 -0500) ---------------------------------------------------------------- selinux/stable-6.2 PR 20221212 ---------------------------------------------------------------- Paul Moore (2): selinux: increase the deprecation sleep for checkreqprot and runtime disable selinux: remove the sidtab context conversion indirect calls security/selinux/selinuxfs.c | 4 ++-- security/selinux/ss/services.c | 51 ++++++++++++++---------------------- security/selinux/ss/services.h | 14 +++++++++--- security/selinux/ss/sidtab.c | 21 +++++++++-------- security/selinux/ss/sidtab.h | 3 +-- 5 files changed, 47 insertions(+), 46 deletions(-)