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 8818BC433EF for ; Mon, 28 Mar 2022 05:47:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238164AbiC1FtN (ORCPT ); Mon, 28 Mar 2022 01:49:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231955AbiC1FtK (ORCPT ); Mon, 28 Mar 2022 01:49:10 -0400 Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55D655006F for ; Sun, 27 Mar 2022 22:47:31 -0700 (PDT) Received: by mail-qt1-x82d.google.com with SMTP id 10so11469674qtz.11 for ; Sun, 27 Mar 2022 22:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=awOwP9Jzhs17cGP+PeKK0ZA8BbP44Lx7OHHlXGKgDaU=; b=DgCfRAFSzBCotgie8rQynAHBECTXSw4S5PIyd1BjLnlwnhke2lkWc9Aknd2N3N86Xw JDOo8vCGcIR/bacIgSzVCw/HQFZRFhLkJvv9ieq3JKuZ4BC6j3t8Phhr6GvEMjhQ8JPE D3aDaWXyIX167DYlplUZoXinYr2Ik1WLXbFXQyoYvyRu3cEnBkHqOXE1y8st7NoVaXZN MiJQrcSY8Gdzd+udet3xP7zRx1YPvyuID0UhGG0ihEGecpUoBpofF1Af0XePkboQVBwC wpTTL0PvCy/Zi6cgQc8+jR7w/hUpM4Vw2MWwiN8KcX0VuEORUW+e93tHdQ+Z2M1BSKw6 o/fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=awOwP9Jzhs17cGP+PeKK0ZA8BbP44Lx7OHHlXGKgDaU=; b=Vj14V3bB61fxccvtxNaL/1bzGBSp4z90vXHOo1LwaHTg5zbGFatvHYtGe+FdgTq/Bx Ezm25s+o9IVDFiQyL5dN9cc50SpXLedfMo1JPM9BgxYHtnAk28wjaNBjdkIYmBAyCYHc fGu9Ovze74fdSIa+dJdxZMX5CyyqAkIAw+SPHuBHKFGWsnyPbO3DGUDA8y+Elp+mLwKv WfzBSXCOpP4XUJRo1j49Qm0BB/aKDiSxorv5UJlnrX63NkLKoCxcf3zxZmfI/sE4RHsv XthClULEdzVHoyWunZ06sjBxCnhDvaCeCKsYw3OGBK5ZeQXiikgh0XBkaBGkP/n6nr8s h7Qg== X-Gm-Message-State: AOAM531ijsu/6hsZQHJgoYTkozhfii3MYPGy/kEeBzzBoQmOkVC7myVy 5KNNK8yMguEiYZuV/1B/JOU= X-Google-Smtp-Source: ABdhPJw+0suad34DqjR5blS7erhntKhDrIn2UHXMnAju4AEchO/G9ZXmrj07UlDlhEetDgQqiiuAHA== X-Received: by 2002:a05:622a:c4:b0:2e1:cb5b:9b5c with SMTP id p4-20020a05622a00c400b002e1cb5b9b5cmr20271910qtw.69.1648446450453; Sun, 27 Mar 2022 22:47:30 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id 186-20020a370cc3000000b0067d36e3481dsm7237261qkm.17.2022.03.27.22.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 22:47:29 -0700 (PDT) From: cgel.zte@gmail.com X-Google-Original-From: yang.yang29@zte.com.cn To: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, paul@paul-moore.com, eparis@redhat.com, linux-audit@redhat.com Cc: linux-kernel@vger.kernel.org, Yang Yang , Zeal Robot Subject: [PATCH v2] audit: do a quick exit when syscall number is invalid Date: Mon, 28 Mar 2022 05:46:42 +0000 Message-Id: <20220328054641.2372974-1-yang.yang29@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yang Userspace may use syscall with invalid syscall number by calling syscall(syscall_num,..). For example we found openSSH may use syscall with syscall number is -1 in some case. When that happens we better do a quick handle no need to gohead. Signed-off-by: Yang Yang Reported-by: Zeal Robot --- v2: - fix compile error of arch/alpha, I have no alpha compile environment, so this fix - is done by code review. --- arch/alpha/include/uapi/asm/unistd.h | 1 + kernel/auditsc.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/alpha/include/uapi/asm/unistd.h b/arch/alpha/include/uapi/asm/unistd.h index 71fd5db06866..8115062216e4 100644 --- a/arch/alpha/include/uapi/asm/unistd.h +++ b/arch/alpha/include/uapi/asm/unistd.h @@ -13,5 +13,6 @@ #define __NR_getgid __NR_getxgid #include +#include #endif /* _UAPI_ALPHA_UNISTD_H */ diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ea2ee1181921..ea4915999e01 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2077,7 +2077,8 @@ void __audit_syscall_exit(int success, long return_code) struct audit_context *context = audit_context(); if (!context || context->dummy || - context->context != AUDIT_CTX_SYSCALL) + context->context != AUDIT_CTX_SYSCALL || + unlikely(context->major < 0 || context->major >= NR_syscalls)) goto out; /* this may generate CONFIG_CHANGE records */ -- 2.25.1 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.133.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 B570EC433F5 for ; Mon, 28 Mar 2022 13:34:53 +0000 (UTC) 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-354--Iwdk9_hNhCbW0VwZNDA-A-1; Mon, 28 Mar 2022 09:34:48 -0400 X-MC-Unique: -Iwdk9_hNhCbW0VwZNDA-A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8EEF1833966; Mon, 28 Mar 2022 13:34:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4589F401E4E; Mon, 28 Mar 2022 13:34:44 +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 D2E4F1947BBF; Mon, 28 Mar 2022 13:34:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3CE5F19451F1 for ; Mon, 28 Mar 2022 05:47:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1E39740CF8FA; Mon, 28 Mar 2022 05:47:33 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19B8840CF8E8 for ; Mon, 28 Mar 2022 05:47:33 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 020C185A5BE for ; Mon, 28 Mar 2022 05:47:33 +0000 (UTC) Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-170-auWG7Uk2Nse1E1jxGEbolA-1; Mon, 28 Mar 2022 01:47:31 -0400 X-MC-Unique: auWG7Uk2Nse1E1jxGEbolA-1 Received: by mail-qt1-f174.google.com with SMTP id d15so11462686qty.8; Sun, 27 Mar 2022 22:47:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=awOwP9Jzhs17cGP+PeKK0ZA8BbP44Lx7OHHlXGKgDaU=; b=8Rp5NQZUhDHxugBfKPThhbLZlVFTNlThGqv8EfDkb7gd1ymw8wekH0pxx9zJ80SjQM SMJYrUWN2+iTn47YLWoDH2pu4aknqt+ZiLymfnjiO3Dy3wrba1pBLe6zAjN9rBsEXj2j ZgxSmbNprrH4hnG+fNf+jZyTKZTpVw7KoZgQ9vljvQTWItEApwOH6+NNaQk30yBjYx2D qzgQHmJjeQK2fFEzh4Czx5iPqWt8+eForN+rETgM9iC7LVRztfaFwao0+HjlLQv0wJk2 KDz14trKjmDHrxeqeuGtMjjv3SuYiu62csWTn42O+2kvSIS6IVLHOZmYd9YbLhS5Ql8a Swsg== X-Gm-Message-State: AOAM532vBKM+GkqFxzBVUAwkkdUWcTfElQAZ+T8nFwNa4FbT/0aHyXV9 o/WTqkwbvLv6JKGCht9MK+Q= X-Google-Smtp-Source: ABdhPJw+0suad34DqjR5blS7erhntKhDrIn2UHXMnAju4AEchO/G9ZXmrj07UlDlhEetDgQqiiuAHA== X-Received: by 2002:a05:622a:c4:b0:2e1:cb5b:9b5c with SMTP id p4-20020a05622a00c400b002e1cb5b9b5cmr20271910qtw.69.1648446450453; Sun, 27 Mar 2022 22:47:30 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id 186-20020a370cc3000000b0067d36e3481dsm7237261qkm.17.2022.03.27.22.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 22:47:29 -0700 (PDT) From: cgel.zte@gmail.com X-Google-Original-From: yang.yang29@zte.com.cn To: rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, paul@paul-moore.com, eparis@redhat.com, linux-audit@redhat.com Subject: [PATCH v2] audit: do a quick exit when syscall number is invalid Date: Mon, 28 Mar 2022 05:46:42 +0000 Message-Id: <20220328054641.2372974-1-yang.yang29@zte.com.cn> 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.84 on 10.11.54.1 X-Mailman-Approved-At: Mon, 28 Mar 2022 13:34:42 +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: Yang Yang , Zeal Robot , linux-kernel@vger.kernel.org Errors-To: linux-audit-bounces@redhat.com Sender: "Linux-audit" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=linux-audit-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Yang Yang Userspace may use syscall with invalid syscall number by calling syscall(syscall_num,..). For example we found openSSH may use syscall with syscall number is -1 in some case. When that happens we better do a quick handle no need to gohead. Signed-off-by: Yang Yang Reported-by: Zeal Robot --- v2: - fix compile error of arch/alpha, I have no alpha compile environment, so this fix - is done by code review. --- arch/alpha/include/uapi/asm/unistd.h | 1 + kernel/auditsc.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/alpha/include/uapi/asm/unistd.h b/arch/alpha/include/uapi/asm/unistd.h index 71fd5db06866..8115062216e4 100644 --- a/arch/alpha/include/uapi/asm/unistd.h +++ b/arch/alpha/include/uapi/asm/unistd.h @@ -13,5 +13,6 @@ #define __NR_getgid __NR_getxgid #include +#include #endif /* _UAPI_ALPHA_UNISTD_H */ diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ea2ee1181921..ea4915999e01 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2077,7 +2077,8 @@ void __audit_syscall_exit(int success, long return_code) struct audit_context *context = audit_context(); if (!context || context->dummy || - context->context != AUDIT_CTX_SYSCALL) + context->context != AUDIT_CTX_SYSCALL || + unlikely(context->major < 0 || context->major >= NR_syscalls)) goto out; /* this may generate CONFIG_CHANGE records */ -- 2.25.1 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit