From mboxrd@z Thu Jan 1 00:00:00 1970 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 us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4AB78ECAAD5 for ; Mon, 29 Aug 2022 16:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661790753; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=R1I2/LdBJOfdx/at3xE22kT49p7g0Tp+6H4EJVCjKWk=; b=CMlgEC3NzAHH+rAPpo24YPGverUDR9r62oX9o63ZjZSazSWJkzhpgNlC894XsYlJt+JW4M g1IimSMlDp8pw4gUS0pK1Avsd+efcWGlhmucol7+/wZbe7Ts2fSFuhjim9i064uP1aocxo 5Lw3y+dZuvJAIF/4QwpGvhJ3ooVhI/k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-155-kFkaWfMMNseAM_TBVg5MYA-1; Mon, 29 Aug 2022 12:32:29 -0400 X-MC-Unique: kFkaWfMMNseAM_TBVg5MYA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBEA31857F02; Mon, 29 Aug 2022 16:32:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7AAE1121319; Mon, 29 Aug 2022 16:32:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C1B631946A4E; Mon, 29 Aug 2022 16:32:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 42C6A1946A40 for ; Mon, 29 Aug 2022 16:26:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C92F3C15BBA; Mon, 29 Aug 2022 16:26:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5678C15BB3 for ; Mon, 29 Aug 2022 16:26:19 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AEF6B804191 for ; Mon, 29 Aug 2022 16:26:19 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-502-qafvS7SGOQO6mYIDWLkHSQ-2; Mon, 29 Aug 2022 12:26:16 -0400 X-MC-Unique: qafvS7SGOQO6mYIDWLkHSQ-2 Received: by mail-pl1-f178.google.com with SMTP id l3so8490077plb.10; Mon, 29 Aug 2022 09:26:15 -0700 (PDT) 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:x-gm-message-state:from:to:cc; bh=sCQOXjIRhx098eyDLNjkm2xdki3mFdMs6DS03OL+UzQ=; b=cPWpEnIOsPcuM6QyDpxfKEUJnhrK3ZZYmKVZtEqwNLJCwkBcfwGT7XD7jtEKhuIxnC bDTmHTQy+qJOcmM6qbtuCDpKCk8to+iYFZa8bcoH3hQYDpMTyjbg58ZBFGpfZs2IRKWK IrPBnDz2UZy51i+vSq3hJxlz3EGcsaIkZMkJS3S4c/DLkT6gkRFN5CtOIJP/F0GXQvQE va6JNB2pAKD2wHGT6cr6DMbItJ65KGpOgG3Ycs8elcv1DSf79WpfHXyGhOEnhn3gyRrL /AMQQIPu5bUe3DyGffy/bLQNl0qbuvOVBFbOCG7lKTxHHrmqR6xmrM84+2OliLqd/Mm1 +b6A== X-Gm-Message-State: ACgBeo1RzyPZ7ULYycXfW97C2XR8vfMbxnyOkHVQGDRi8sTRts68xCvr vDQfmwBUyggFe6slqJi1HSk= X-Google-Smtp-Source: AA6agR4i3guSKlTbUhr4lF4mL1CrpYMiQD+HjyyN8n9KfAi+HUSlAcVEwgfDn4X1JTy68OkE2vbMGQ== X-Received: by 2002:a17:902:7582:b0:172:db9d:99de with SMTP id j2-20020a170902758200b00172db9d99demr17305618pll.125.1661790375160; Mon, 29 Aug 2022 09:26:15 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.237]) by smtp.gmail.com with ESMTPSA id l9-20020a170903244900b0016dbdf7b97bsm7813008pls.266.2022.08.29.09.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 09:26:14 -0700 (PDT) From: wuchi To: paul@paul-moore.com, eparis@redhat.com, rgb@redhat.com Subject: [PATCH] audit: use time_after to compare time Date: Tue, 30 Aug 2022 00:26:09 +0800 Message-Id: <20220829162609.25105-1-wuchi.zero@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-Mailman-Approved-At: Mon, 29 Aug 2022 16:32:24 +0000 X-BeenThere: linux-audit@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org Errors-To: linux-audit-bounces@redhat.com Sender: "Linux-audit" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Using time_{*} macro to compare time is better Signed-off-by: wuchi --- kernel/audit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index a75978ae38ad..9bc0b0301198 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -321,7 +321,6 @@ static inline int audit_rate_check(void) static DEFINE_SPINLOCK(lock); unsigned long flags; unsigned long now; - unsigned long elapsed; int retval = 0; if (!audit_rate_limit) return 1; @@ -330,9 +329,8 @@ static inline int audit_rate_check(void) if (++messages < audit_rate_limit) { retval = 1; } else { - now = jiffies; - elapsed = now - last_check; - if (elapsed > HZ) { + now = jiffies; + if (time_after(now, last_check + HZ)) { last_check = now; messages = 0; retval = 1; @@ -366,7 +364,7 @@ void audit_log_lost(const char *message) if (!print) { spin_lock_irqsave(&lock, flags); now = jiffies; - if (now - last_msg > HZ) { + if (time_after(now, last_msg + HZ)) { print = 1; last_msg = now; } -- 2.20.1 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit From mboxrd@z Thu Jan 1 00:00:00 1970 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 F007AECAAD2 for ; Mon, 29 Aug 2022 16:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230486AbiH2Q00 (ORCPT ); Mon, 29 Aug 2022 12:26:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230431AbiH2Q0R (ORCPT ); Mon, 29 Aug 2022 12:26:17 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEF1E7CB78 for ; Mon, 29 Aug 2022 09:26:15 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id m10-20020a17090a730a00b001fa986fd8eeso15208269pjk.0 for ; Mon, 29 Aug 2022 09:26:15 -0700 (PDT) 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:from:to:cc; bh=sCQOXjIRhx098eyDLNjkm2xdki3mFdMs6DS03OL+UzQ=; b=T7vI8ltKs6VHkcjxGMChvB0qz4gQxcghfiSNIA+cFuVwoLtYAWh6b8UobIkdoA4YDc Zf5a0bQ10JmB8WcLMPTzViqzzQqJro28/TS0rcUdb+k8ijmK4ifk2eSg2ZbvYkybVdal 13r160mDvh01BPA8iT5xkP1BcEJT0wfQIPEd+PeRJ97DOViRhqtcbNIeVBh+1OxT9N56 H+InE9/40xoewLd7EloYTEl1CJttijMj1QDJ94QwKc6cbJbPoedNB0YokudzHhQyjPRw h/Y6HgZRLPTnIRCR1aEPXe3WjGuQQuAd2f5muIad9Iob7e5qdN1TH3/5XJN1oxkZgdB3 3bbA== 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:x-gm-message-state:from:to:cc; bh=sCQOXjIRhx098eyDLNjkm2xdki3mFdMs6DS03OL+UzQ=; b=QyCuVfBpbz+DHrD9/IducUaVbfSYawd9n60UZXL3CPzYjv4b89SENEJoLbMqEWt7Gj 6gy+71wiiwOReDokgLpou1G0udDzATOlLpT2fiBNdKFKEW31MjNYxcNM9ju5YPXj1BPC w6H2OG55lm1rSjF8yIizzakPyDkXFVIHZ+ytuHRNiimOdGZin8GNOP94OQA3XZvaJIYi DA0Vfwl9uV8l4aNzcEvO1ohRfdCfaq7gEHsix+HVO7YscqIWd7ZpIAB/NREdp2be+BDw rQ/KOGk3hlNG0w54fflYzeCiJV+S3soQu1ZiWfS7SfFY80iCQu43JxjVXR2Nu9jSWzi0 yj2g== X-Gm-Message-State: ACgBeo3ssj/2J9JQ++IJ/ywIOYnKKSwBoR/662AN0CKXWCD1+zwZskjW ctZCJ3oulvFIVXxVYV0PqJIULozDf7Y= X-Google-Smtp-Source: AA6agR4i3guSKlTbUhr4lF4mL1CrpYMiQD+HjyyN8n9KfAi+HUSlAcVEwgfDn4X1JTy68OkE2vbMGQ== X-Received: by 2002:a17:902:7582:b0:172:db9d:99de with SMTP id j2-20020a170902758200b00172db9d99demr17305618pll.125.1661790375160; Mon, 29 Aug 2022 09:26:15 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.237]) by smtp.gmail.com with ESMTPSA id l9-20020a170903244900b0016dbdf7b97bsm7813008pls.266.2022.08.29.09.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Aug 2022 09:26:14 -0700 (PDT) From: wuchi To: paul@paul-moore.com, eparis@redhat.com, rgb@redhat.com Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH] audit: use time_after to compare time Date: Tue, 30 Aug 2022 00:26:09 +0800 Message-Id: <20220829162609.25105-1-wuchi.zero@gmail.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using time_{*} macro to compare time is better Signed-off-by: wuchi --- kernel/audit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index a75978ae38ad..9bc0b0301198 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -321,7 +321,6 @@ static inline int audit_rate_check(void) static DEFINE_SPINLOCK(lock); unsigned long flags; unsigned long now; - unsigned long elapsed; int retval = 0; if (!audit_rate_limit) return 1; @@ -330,9 +329,8 @@ static inline int audit_rate_check(void) if (++messages < audit_rate_limit) { retval = 1; } else { - now = jiffies; - elapsed = now - last_check; - if (elapsed > HZ) { + now = jiffies; + if (time_after(now, last_check + HZ)) { last_check = now; messages = 0; retval = 1; @@ -366,7 +364,7 @@ void audit_log_lost(const char *message) if (!print) { spin_lock_irqsave(&lock, flags); now = jiffies; - if (now - last_msg > HZ) { + if (time_after(now, last_msg + HZ)) { print = 1; last_msg = now; } -- 2.20.1