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;
From:   Eiichi Tsukata <eiichi.tsukata@nutanix.com>
To:     paul@paul-moore.com, eparis@redhat.com,
        linux-kernel@vger.kernel.org, audit@vger.kernel.org
Cc:     Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Subject: [PATCH 0/4] audit: refactor and fix for potential deadlock
Date:   Mon,  8 May 2023 07:58:08 +0000
Message-Id: <20230508075812.76077-1-eiichi.tsukata@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?arfCXgpUeTR5rYEWBliOsrsKKs8EMBejCMVDk42awIDt/s4T3SE7mNdSkOEJ?=
 =?us-ascii?Q?2F2ufvQLJfo4gb25CExz0og3nH9ySyV317sf4MSdL79nGUMmMzNGr1yyhf2d?=
 =?us-ascii?Q?DNOsfCutcg1i9/tdaAa3KU2pYnm8r/nb5n3i9sps+z5MLzX2tt3ZhMMYHjc1?=
 =?us-ascii?Q?gKN46Q7WmHHQv2wLg04uXjGeNdXjNm5gxwUqhnkxaFwcdXQQnvBKOTTdWjot?=
 =?us-ascii?Q?gvbhKPTelQ3asKEQaks/zy38gTIH6HPIESFioyIZ0/QyOCGG19vFfzxu26cO?=
 =?us-ascii?Q?NKe0JiXAuywd5r1KNqDF2DgXClDAv0INZs0ehRKXuCV7sksH3c0/6wYtaL6n?=
 =?us-ascii?Q?2nSnxXZUYffh8f1bI85s/36l3eOlgElSBDsKibKd30nmyB/3mmfucWkx0D5g?=
 =?us-ascii?Q?sIBExxb8qa4bw0hCSzws1Vq6IDapSBgCaVXE2akszTq8vZ0ULoYuDzRHsDEx?=
 =?us-ascii?Q?CyUySUwjWCqBKWO5WLV61bCumx2KOTpKyKMKXjEFs07NnoOtzZKKhILqODZs?=
 =?us-ascii?Q?T0uIknvz+qoInjOk75jcCCRH9nXqIkh/0pxFaqt157hS0D0CxaPAyzc54cC1?=
 =?us-ascii?Q?syF5BkJqmcX4rZlU9PMtRw1dGoSP0XS9PRr5ucsaDbDmdmaMP+eYKGK88FUg?=
 =?us-ascii?Q?OGoWyc3rQVpXDj7droglWx3h8qgp5zBbUSLFrqQ+v+Talug8jm/cLuasrwFX?=
 =?us-ascii?Q?pNIu1tcHvlwpTckIoCXMwLG9FuiyL3DcAFJc+8NQXQetawaVfPqMQneOiJon?=
 =?us-ascii?Q?xeKn0LQe1I9ZgKYZQbhNPqK6/fMp1GhDIcXWKtByE0sNboqmu1Rc8wKsde1q?=
 =?us-ascii?Q?TFCS6c3wh/suUrKtTSglmhhON2kg+Gwu87eRjW/cyjZGLt0ED1ezb2/BoCok?=
 =?us-ascii?Q?SKO4ebTF03fQ0StS0ZoQK+Ol5kJvOR9oOJWj/6AlxD0eFR4GyqsDBqGKAsK1?=
 =?us-ascii?Q?qYOEqmcCaWX8itDNBvclMoosQAvm1nNrLKQu3YSVZOeLboCSW81kgIJZ37pS?=
 =?us-ascii?Q?9TumPOP0lkL8ZawbviWAfEeAylBqjZ3ZNglWKowsVWI3JDX7z+uti31XFxvp?=
 =?us-ascii?Q?S7AxsrpBG0mj3VM/UctpN/PXXzVSG78tvOQH8PCHYh6GVTTWS+rcfiPGo+Ef?=
 =?us-ascii?Q?3i31/nrC1TwvQaUAhqk0a1dtOLhVIq1/PUTMQJIZVR242bLTi1bPe93Ll9rE?=
 =?us-ascii?Q?42eam75NH2aio9rRC2QDcxBYb8cdBZ0JsS9vGb5chcBN0QfLeOX0CZQ46jyn?=
 =?us-ascii?Q?SgunHgK9OnfwMkW5Spnqh81GGiY8hQqCVPxIsG2HrugwH+k0tMf9anNyAqof?=
 =?us-ascii?Q?TpCybIM31CwZmot4ullWiHyYizXHTwqsPAloTzAzzrIKn29w9HjdZC+QfIv/?=
 =?us-ascii?Q?uIGgiqmMfnIeaNGxLSRG3siC/gme65/ikYU7o+aoaPCcb9qNBtOi4PJuOz+M?=
 =?us-ascii?Q?MRZdNG41ngb/a2YBdBTJ8ofch5f2UlAgSfwd2VzrM/2WGd72aqjsTCkCzKoW?=
 =?us-ascii?Q?vxdEgC2TFYyPhSDp8WkItrGE93cHB0hw1R3jPozjBs2HFTI7q36DtHHyasek?=
 =?us-ascii?Q?zlQ6tgRsIZmlyY9iUkWBakmrq4Dhe0Uo1sKSOIBx7nlHSrnCOOT3bpa5o4SL?=
 =?us-ascii?Q?tw=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 024ba718-b69d-47ca-dc25-08db4f9a0c82
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 07:58:45.8769
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: g2UKVcoNT9D+eXIG6I8Sy/vEnrBROyg/0GK+djT2nEZNmCFl+h9QAh17UoyY1Fc3qQYIqmwlJktCGYWPbO+Pm2zy76JawNFYeS3o6qDPD6Y=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0201MB8821
X-Proofpoint-GUID: o9KngwlqifAhUNGrQviQ-ATo-O8S3D8m
X-Proofpoint-ORIG-GUID: o9KngwlqifAhUNGrQviQ-ATo-O8S3D8m
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-08_05,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit 7ffb8e317bae ("audit: we don't need to
__set_current_state(TASK_RUNNING)") accidentally moved queue full check
before add_wait_queue_exclusive() which introduced the following race:

    CPU1                           CPU2
  ========                       ========
  (in audit_log_start())         (in kauditd_thread())

  queue is full
                                 wake_up(&audit_backlog_wait)
                                 wait_event_freezable()
  add_wait_queue_exclusive()
  ...
  schedule_timeout()

Once this happens, both audit_log_start() and kauditd_thread() can cause
deadlock for up to backlog_wait_time waiting for each other. To prevent
the race, this patch adds queue full check after
prepare_to_wait_exclusive().

This patchset consists of the following parts:

Patch 1-3: Refactorings and a small fix preferable for deadlock fix
Patch 4: Actual deadlock fix

Eiichi Tsukata (4):
  audit: refactor queue full checks
  audit: account backlog waiting time in audit_receive()
  audit: convert DECLARE_WAITQUEUE to DEFINE_WAIT
  audit: check if queue is full after prepare_to_wait_exclusive()

 kernel/audit.c | 71 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 28 deletions(-)

-- 
2.40.0