From patchwork Thu Oct 20 15:20:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Moore X-Patchwork-Id: 13013645 X-Patchwork-Delegate: paul@paul-moore.com 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 96D60C433FE for ; Thu, 20 Oct 2022 15:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230315AbiJTPVH (ORCPT ); Thu, 20 Oct 2022 11:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbiJTPU4 (ORCPT ); Thu, 20 Oct 2022 11:20:56 -0400 Received: from mail-yb1-xb31.google.com (mail-yb1-xb31.google.com [IPv6:2607:f8b0:4864:20::b31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CEC0537D3 for ; Thu, 20 Oct 2022 08:20:45 -0700 (PDT) Received: by mail-yb1-xb31.google.com with SMTP id n130so3066502yba.10 for ; Thu, 20 Oct 2022 08:20:45 -0700 (PDT) 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=oYUwx9AXAxDG20sYfr7hKVXI1VbVXzou7obOOp8onp8=; b=WiGPTWCGYwX8f8SzDcsA9Kdlw67nvMpM8MpRjR3rU/ZkY7hcm0usk+B/ltYnnlVlxc ZvdC29ayU64TWGzkCRI4Yp7s/+yvd/UX44ugg0u9wCOc4nmetKPQI4PSHK2r7Atndg5o iM4GbnDcr035neabM2A+NVxzd28/vESR4x7dhA6gtaFvfdU3f1/ZT7bXIj77mJMJSweg +ysNJoAQB6wTMyp9lDnV8xDQ+mL+rcPBf0mGhZd8/6wrYH2gkXhqjPtinJup3EscuDcL PWsqg4g66tKDwB8RyQOKN5svEnqZXpVZdGodC51851SgEaH1EGetaKIH1WOJqVRRATIl xSRg== 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=oYUwx9AXAxDG20sYfr7hKVXI1VbVXzou7obOOp8onp8=; b=1gG9g4aYG9P4g69wYlyIO7djnBzvYHHO1PIkmuz8uNjVdFVSmCmKuDgHOIFCULb8J5 DgzjxUUtU1iKUQmRCfywHGVc7KXPikpsGgGdeXxXK97wkUfSLiQ3mSIEdBC2onnoeFtM UmgCwqT1wDthCotpLA1iEQf9YmJqzut3a/nbmp8Vx2Bvq76kPhsC6wblv6/IG0y9ytcG rQZHrg1gmukNzpLxbxQVnypWfn8gUC5I4XDRgjA5tUgjhy2ezw4G+7pTt4armGbqOxZi DU2Tt2FtK2ZepzL69iD1TEClPzQFOeLrV6uPrYOqrup3ezmsLFMyI2hhvl36MonG/Acm VVxQ== X-Gm-Message-State: ACrzQf0kcy0HhIOVvWpEb5kaP4NWDlKjPiNL1yCYQPDH8X2iNeCuZoXJ mP/UnsS7tucQNCQVTyIuyE6lsHkIP1BGE14ESkVJ X-Google-Smtp-Source: AMsMyM6xfDCwoV3AvDAeKK8J5VQLV5nF9Bo12pK9302x4ErUVdKzZZrQKaUpkLrNOT9SgahFOhsdXqdSfitZjK+OmTI= X-Received: by 2002:a25:9a88:0:b0:6b9:c29a:2f4b with SMTP id s8-20020a259a88000000b006b9c29a2f4bmr12094852ybo.236.1666279242056; Thu, 20 Oct 2022 08:20:42 -0700 (PDT) MIME-Version: 1.0 From: Paul Moore Date: Thu, 20 Oct 2022 11:20:07 -0400 Message-ID: Subject: [GIT PULL] SELinux fixes for v6.1 (#1) To: Linus Torvalds Cc: selinux@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Hi Linus, A small SELinux fix for v6.1 to fix a GFP_KERNEL allocation while a spinlock is held. The patch, while still fairly small, is a bit larger than one might expect from a simple s/GFP_KERNEL/GFP_ATOMIC/ conversion because we added support for the function to be called with different gfp flags depending on the context, preserving GFP_KERNEL for those cases that can safely sleep. Please merge for v6.1-rcX. -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: git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git tags/selinux-pr-20221020 for you to fetch changes up to abe3c631447dcd1ba7af972fe6f054bee6f136fa: selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context() (2022-10-19 09:55:53 -0400) ---------------------------------------------------------------- selinux/stable-6.1 PR 20221020 ---------------------------------------------------------------- GONG, Ruiqi (1): selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context() security/selinux/ss/services.c | 5 +++-- security/selinux/ss/sidtab.c | 4 ++-- security/selinux/ss/sidtab.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)