From patchwork Thu Aug 12 12:09:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jIHK8Ojw; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gllqk4hmhz9sX3; Thu, 12 Aug 2021 22:09:54 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9Ww-00060E-LW; Thu, 12 Aug 2021 12:09:50 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9WW-0005pa-JA for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:24 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 6C2623F22F for ; Thu, 12 Aug 2021 12:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770164; bh=SZgj8jscmuER+BHT/wmdViIrv7UXtWdbPoHBuwjaJn4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jIHK8Ojw2bvvo/KB3SVudK8cOtTIkZWGIg6oCir7R3K0+ADij4QLUg8LWnE8ZCgEo pze6/MJj2JzRRCMWfAXVbpIp5SX9FfVmPoKoRZlDARPSym3XEmdYhu7l3oulCqBY24 nqfqd37Xf1nZu6PcxQUbtSy+1/mdWJWIYdKt/+7xyugFDMAiUDYbVHUZvvr6bxjNQI 4Rg3B5nZIE3qLP+HxBopeeD4UCu1coAY9mx5n8TJNyKW9YsYquuDiywW63tAUygdiO K3Q4E0mzJTvtTr/gEpLBgr0lm7x136yFVbC0YOb2CF3n2jN72WBS3YOUNzuoxQQ+Kn WzxOyDXUOG+KQ== Received: by mail-pl1-f200.google.com with SMTP id z1-20020a1709030181b029012c775d35e1so3590074plg.20 for ; Thu, 12 Aug 2021 05:09:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SZgj8jscmuER+BHT/wmdViIrv7UXtWdbPoHBuwjaJn4=; b=oE2obvgvn12ZOPchmhS5WJboUHIe3kjWmvYi70m++/hB+JWUtBDlLIT66KmPJH+wNZ msCdxaBKbS4d5tdXKCJIep3P5ALy4zGR5Kx0ReucIiqcrR42Ak53GW3YJDL/Fj9as1Ut GkB1w8EE+knC0hmu6La8r6s2hB3KQaSADmpv8YzH1m1t1goYOfyh+RDWqLShVDAaEfu8 S4L6lmqUV9gCDhUwaHye9YtvsIuWFPee/ZeijKvLlCP/taU1VNNkFTeM7jZw1mKghtpP J4+xn8cdjoVWqIDC4miliBMgEXYW2M8T7/pJ4cyHHVo7fr1SUMnlnm/JeRH2qcVhAF5a zW7Q== X-Gm-Message-State: AOAM533fpNpmcpS2yyjHoldw/0+RnWqBO20gPfjlqnxNfZWU3/EsKRDN qk4DS9hxZmQq8lQ3gbbyo1fQBzKlCtRSYGCnW6a0UrsTw7AOqir1vsw3svg8KRk7mOev7K5pWVC E9aZWT84SqZ0WKJ2tMeYxsik1QR3XFq3wI5f4XDlg6Q== X-Received: by 2002:a62:820f:0:b029:3e0:30aa:5174 with SMTP id w15-20020a62820f0000b02903e030aa5174mr3974902pfd.4.1628770162639; Thu, 12 Aug 2021 05:09:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxmGiAOXS0EFtzq9fdnG4SormEhQNAVIu75k2AxEhNGGedX0b5rE7QLJVIVDcwRLip+NMJQw== X-Received: by 2002:a62:820f:0:b029:3e0:30aa:5174 with SMTP id w15-20020a62820f0000b02903e030aa5174mr3974890pfd.4.1628770162441; Thu, 12 Aug 2021 05:09:22 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:21 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/8] UBUNTU: SAUCE: ubuntu/sgx: backport fixes to 1.33 Date: Thu, 12 Aug 2021 06:09:06 -0600 Message-Id: <20210812120913.9316-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives 612c6ffd16cf9f6d5b2914c274cf280b460b5f8e ("Linux Driver: backport fixes to 1.33") Signed-off-by: Tim Gardner --- ubuntu/sgx/driver.c | 2 +- ubuntu/sgx/encl.c | 1 + ubuntu/sgx/ioctl.c | 15 ++++++++++----- ubuntu/sgx/reclaim.c | 5 ++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ubuntu/sgx/driver.c b/ubuntu/sgx/driver.c index bcca5a676eca4..7e3003b6237d9 100644 --- a/ubuntu/sgx/driver.c +++ b/ubuntu/sgx/driver.c @@ -123,7 +123,7 @@ static unsigned long sgx_get_unmapped_area(struct file *file, unsigned long pgoff, unsigned long flags) { - if (flags & MAP_PRIVATE) + if ((flags & MAP_TYPE) == MAP_PRIVATE) return -EINVAL; if (flags & MAP_FIXED) diff --git a/ubuntu/sgx/encl.c b/ubuntu/sgx/encl.c index 8e8e861d5c7e9..8dab735ca1c95 100644 --- a/ubuntu/sgx/encl.c +++ b/ubuntu/sgx/encl.c @@ -590,6 +590,7 @@ void sgx_encl_release(struct kref *ref) if (encl->backing) fput(encl->backing); + cleanup_srcu_struct(&encl->srcu); WARN_ON_ONCE(!list_empty(&encl->mm_list)); /* Detect EPC page leak's. */ diff --git a/ubuntu/sgx/ioctl.c b/ubuntu/sgx/ioctl.c index 79b8c80197659..0dd2f4ef970d5 100644 --- a/ubuntu/sgx/ioctl.c +++ b/ubuntu/sgx/ioctl.c @@ -332,7 +332,7 @@ static int __sgx_encl_add_page(struct sgx_encl *encl, ret = get_user_pages(src, 1, 0, &src_page, NULL); if (ret < 1) - return ret; + return -EFAULT; pginfo.secs = (unsigned long)sgx_epc_addr(encl->secs.epc_page); pginfo.addr = SGX_ENCL_PAGE_ADDR(encl_page); @@ -459,8 +459,11 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long src, * Destroy enclave on ENCLS failure as this means that EPC has been * invalidated. */ - if (ret == -EIO) + if (ret == -EIO){ + mutex_lock(&encl->lock); sgx_encl_destroy(encl); + mutex_unlock(&encl->lock); + } return ret; } @@ -802,8 +805,10 @@ long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) if (encl_flags & SGX_ENCL_IOCTL) return -EBUSY; - if (encl_flags & SGX_ENCL_DEAD) - return -EFAULT; + if (encl_flags & SGX_ENCL_DEAD){ + ret = -EFAULT; + goto out; + } switch (cmd) { case SGX_IOC_ENCLAVE_CREATE: @@ -822,7 +827,7 @@ long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) ret = -ENOIOCTLCMD; break; } - +out: atomic_andnot(SGX_ENCL_IOCTL, &encl->flags); return ret; diff --git a/ubuntu/sgx/reclaim.c b/ubuntu/sgx/reclaim.c index 99ada8857aee1..1ba0cec6dba4b 100644 --- a/ubuntu/sgx/reclaim.c +++ b/ubuntu/sgx/reclaim.c @@ -45,6 +45,9 @@ static void sgx_sanitize_section(struct sgx_epc_section *section) cond_resched(); } + spin_lock(§ion->lock); + list_splice(&secs_list, §ion->unsanitized_page_list); + spin_unlock(§ion->lock); } static int ksgxswapd(void *p) @@ -469,11 +472,11 @@ void sgx_reclaim_pages(void) continue; skip: - kref_put(&encl_page->encl->refcount, sgx_encl_release); spin_lock(&sgx_active_page_list_lock); list_add_tail(&epc_page->list, &sgx_active_page_list); spin_unlock(&sgx_active_page_list_lock); + kref_put(&encl_page->encl->refcount, sgx_encl_release); chunk[i] = NULL; } From patchwork Thu Aug 12 12:09:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Lr5ugSlz; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gllqv2xqCz9t0Z; Thu, 12 Aug 2021 22:10:02 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9X4-00064T-2L; Thu, 12 Aug 2021 12:09:58 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9WX-0005pg-RD for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:25 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id A41DC3F051 for ; Thu, 12 Aug 2021 12:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770165; bh=v0CJFnAS8wKshzu6SNCKxzRm9tcAh572Mf1IxyYK/r8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Lr5ugSlz//B6C1Y+7UJGXUkiW6J53dfMSraaEWM46MZ8HmSyjYlDfVj0l8lhz6LPP WQ2C5lN2gS1Oalp8VRhZ5lOrN0CjOCHTQQRUXVzpgZcO+Dsi4cqHmFBtGIRUmKEml5 D4bl4LtvYGj8hrFyYZGwQOi0c9EKKGRMp7bZnIVArjAlCYBH71smytzF/rB6RRzv+L FV3Yjg9LFP4hPzDXPG0GlpNj+UfWW6va3uR0m99G/iJ6wX+3WtmYAnwaCkw519XfS+ iha5B5nFpa7q2ukgdLutTTCiHW0hlBvwkGB36qEse2Lu2zmJW1i/Z7sXvE09pD2+CX X6h7h7RiyvN5A== Received: by mail-pj1-f70.google.com with SMTP id m3-20020a17090b0683b0290178cb50bc1aso4884938pjz.7 for ; Thu, 12 Aug 2021 05:09:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v0CJFnAS8wKshzu6SNCKxzRm9tcAh572Mf1IxyYK/r8=; b=UQMaCPJtfdJfvsGV6rR0mCWz+iG0DGuzGwf4mGtAVKJaB1C0TwuwipB86IVOmGC1sj iKSGc/+Tia5QZLUpwyxCAelFCvPeq6KpoPCt6q8Rox/zhe9MHh0kORjwOsqx0LjCEFl4 w+iKWlVLelUUMNse0gKtgJNv6u16KfCfoCjLeqbO8iZLTfJCwTzCsijGNNrMNW1tuWBX 7DRJby/GyGvddggJYxo7O0v0K/wMysKpMgmXfvitRdeQtym90sd9QeC92v8jTJMbxJe1 jySgyFLLEQMPzIPMUgZPqEeadFJrJN1Ptxts1GT1Zv/6bM6hXpPBLct06ZMDtBZ3qQgE sY+A== X-Gm-Message-State: AOAM53035P808Mi487IWG8NpRFq+Dz9xV/TTEJ0BoiO2GwzSkwV3ZN2H IDx4WycDMQmiqzVKmJnubMLVmVu6yZhsI7p+uqpbRcd63Yx3RBXCv88PKAfvlcxcn4nC0ZlfwXg XNdsLzGHOjL38QtTvEBghj++rumBXpPERY4Az2+sFpg== X-Received: by 2002:a17:90a:d991:: with SMTP id d17mr14400577pjv.54.1628770163756; Thu, 12 Aug 2021 05:09:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1dYKUgWRmmi/JZXTow0kVRJULiC7MBS9ealSAYTqhUQA1SEAXARvYJ++SFVLsQIvxJFPTJg== X-Received: by 2002:a17:90a:d991:: with SMTP id d17mr14400560pjv.54.1628770163570; Thu, 12 Aug 2021 05:09:23 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:22 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/8] UBUNTU: SAUCE: ubuntu/sgx: missing synchronize_srcu call before cleanup Date: Thu, 12 Aug 2021 06:09:07 -0600 Message-Id: <20210812120913.9316-3-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives 46c684f7f3504b890a30160a79759f1aa86f91fc Linux Driver: missing synchronize_srcu call before cleanup Signed-off-by: Tim Gardner --- ubuntu/sgx/encl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/sgx/encl.c b/ubuntu/sgx/encl.c index 8dab735ca1c95..d58fada28e2c8 100644 --- a/ubuntu/sgx/encl.c +++ b/ubuntu/sgx/encl.c @@ -589,7 +589,7 @@ void sgx_encl_release(struct kref *ref) if (encl->backing) fput(encl->backing); - + synchronize_srcu_expedited(&encl->srcu); cleanup_srcu_struct(&encl->srcu); WARN_ON_ONCE(!list_empty(&encl->mm_list)); From patchwork Thu Aug 12 12:09:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LFHfntTV; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GllqP0c1Dz9t0Z; Thu, 12 Aug 2021 22:09:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9We-0005qy-Pu; Thu, 12 Aug 2021 12:09:32 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9WY-0005pm-V7 for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:26 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id C9B8D3F22F for ; Thu, 12 Aug 2021 12:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770166; bh=e/+L+R5PE+GvZuIMdlVySnsudaEXp7KnqzopqbhtLP8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LFHfntTVwFudnrsg0PAffFUfONOJeAUyDTF0ATci8HV2wKYWLFi+MrREaQMB0Xz4i d7EaITsVpKOSNrqk+3ngFvWJZEVvL1J95bI3RmSQYHLlf7bsjEcXxGzln5pXj3PncA Xu2Ld8wje3pWAqbCWnjWcd7VVpOiOg9F+OjUJLxVatuKS/xgYyf79QBfDKGNKiikMV KtE0aACMua6dNO8hhLz+xwi2olZUit7fgynEdtgj80SIRT0zoALuNmxkpDuSoTeU9B DvFm98U9lAamSxgcWKxJEhTb7Jbdpqe2z/xxcfqn/t9mc0lrF6kJL3mt7msU0WpJ0z EmwzZDixEKWOA== Received: by mail-pj1-f69.google.com with SMTP id 2-20020a17090a1742b0290178de0ca331so4114748pjm.1 for ; Thu, 12 Aug 2021 05:09:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e/+L+R5PE+GvZuIMdlVySnsudaEXp7KnqzopqbhtLP8=; b=Z+uoo6xUUON4Ruhyp2Q9FSGpCcA6R+aS45LpK6RW+n//4xoH2KVLYqlxlEIWqGS40P z2qvaFCt08Nm9L34GXad5hJxJdtZCh4ziAntAgkGM5Jb85iaidPuHUphiSDVCKl+nH4p rOPVGY5q3JICkEtVzdXKoZjwh6lX+X9k/ftFOuafccn76scACEK6cCsyxdAll2pumjRB gKrC/1NgvqPUic+wcVnzXSeYGuh5mz9lI0Tfgv0ciAVdnRSte9R3vqmCze63Q9/cYPD8 j12qfwMC23jk403IBemqvlAisir6GVkRuUIHqq/HxrQQYzYqAbMpTTFFrkLgAVx5igUA EcLQ== X-Gm-Message-State: AOAM531bzew5C5MUe89xc4OBhu2fbzQDwRbQ/CMOD82GTGdbuiGMeCFL tS4eAs49Q8788GqbNq/pi6D0PogipgaZ5zTKMsICTVOghwTURIrlryilDYPBNVvSitVgMtFWqgx cN+z0Z6TFImsAcWhhXbRCK7+wCPFvjsKoVqCaaIjZNA== X-Received: by 2002:a62:b615:0:b029:34a:3920:a7ea with SMTP id j21-20020a62b6150000b029034a3920a7eamr3817779pff.21.1628770164951; Thu, 12 Aug 2021 05:09:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/dJfg+TGsT7b8sq7VAQO0BMOOBaS9LGBzAcSMvHRU3nMnzMcktt13chj6uAIj27/WbpoTjg== X-Received: by 2002:a62:b615:0:b029:34a:3920:a7ea with SMTP id j21-20020a62b6150000b029034a3920a7eamr3817760pff.21.1628770164763; Thu, 12 Aug 2021 05:09:24 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:24 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/8] UBUNTU: SAUCE: ubuntu/sgx: fix a synchronization issue for mmput Date: Thu, 12 Aug 2021 06:09:08 -0600 Message-Id: <20210812120913.9316-4-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives 0977851177d96aa7859adcafef36f1b3ed5c7ab0 Linux Driver: fix a synchronization issue for mmput Signed-off-by: Tim Gardner --- ubuntu/sgx/main.c | 13 +++++++++++++ ubuntu/sgx/reclaim.c | 16 +++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ubuntu/sgx/main.c b/ubuntu/sgx/main.c index 82c7b77e91806..8d28da9e8331c 100644 --- a/ubuntu/sgx/main.c +++ b/ubuntu/sgx/main.c @@ -12,6 +12,7 @@ #include "encls.h" #include +#include #include "version.h" #include "dcap.h" #ifndef MSR_IA32_FEAT_CTL @@ -21,6 +22,9 @@ #ifndef FEAT_CTL_LOCKED #define FEAT_CTL_LOCKED FEATURE_CONTROL_LOCKED #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) +void (*k_mmput_async)(struct mm_struct* mm); +#endif struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS]; int sgx_nr_epc_sections; @@ -300,6 +304,15 @@ static int __init sgx_init(void) if (!sgx_page_cache_init()) return -EFAULT; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) + k_mmput_async = (void*)kallsyms_lookup_name("mmput_async"); + if (!k_mmput_async){ + pr_err("intel_sgx: mmput_async support missing from kernel.\n"); + return -EFAULT; + } +#endif + + if (!sgx_page_reclaimer_init()) goto err_page_cache; diff --git a/ubuntu/sgx/reclaim.c b/ubuntu/sgx/reclaim.c index 1ba0cec6dba4b..747cfbe4ec6a3 100644 --- a/ubuntu/sgx/reclaim.c +++ b/ubuntu/sgx/reclaim.c @@ -14,7 +14,9 @@ #include "driver.h" #include - +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) +extern void (*k_mmput_async)(struct mm_struct* mm); +#endif struct task_struct *ksgxswapd_tsk; DECLARE_WAIT_QUEUE_HEAD(ksgxswapd_waitq); LIST_HEAD(sgx_active_page_list); @@ -175,8 +177,8 @@ static bool sgx_reclaimer_age(struct sgx_epc_page *epc_page) ret = !sgx_encl_test_and_clear_young(encl_mm->mm, page); up_read(&encl_mm->mm->mmap_sem); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0) ) - mmput(encl_mm->mm); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) + k_mmput_async(encl_mm->mm); #else mmput_async(encl_mm->mm); #endif @@ -226,8 +228,8 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page) up_read(&encl_mm->mm->mmap_sem); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0) ) - mmput(encl_mm->mm); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) + k_mmput_async(encl_mm->mm); #else mmput_async(encl_mm->mm); #endif @@ -306,8 +308,8 @@ static const cpumask_t *sgx_encl_ewb_cpumask(struct sgx_encl *encl) cpumask_or(cpumask, cpumask, mm_cpumask(encl_mm->mm)); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0) ) - mmput(encl_mm->mm); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) + k_mmput_async(encl_mm->mm); #else mmput_async(encl_mm->mm); #endif From patchwork Thu Aug 12 12:09:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=mxzdZ43X; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GllqQ51y5z9t0p; Thu, 12 Aug 2021 22:09:38 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9Wg-0005rh-1I; Thu, 12 Aug 2021 12:09:34 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9Wa-0005ps-9m for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:28 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 2760C40650 for ; Thu, 12 Aug 2021 12:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770168; bh=j1uKwxks0s2fEjSfL216poTTK0VLanm+226/BxfeI2U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mxzdZ43X4aJzfhiLnAPBIEKtFy4Sl9doT1xbk+e9+34D+Hgnv6F7Y/pUjcgyr6lyQ 5YWhzIsBXkkXpo3N+T7sArKfkk4Ls9B7HiVrYc7o6GmJMeDxQEH/hPAt4HxSPtyIEn fEFqHwP1r+purbrI89ELToO+LiPagNWz3udNSEu1gB5rzr6RHiEaRuXJ5BxtK8KQz4 DNGwRPZEA+ryw7PxaQaqYPnqzRZviDNf2YSYOOQ1sSoKn/EtxDypRK5crKscDmeq21 MKQVnIkfeAhUSc6sOS1M/erNbi6uUXJ/D3wEWPiFP6+mCLflrc4EBEyUTeab5KIf8r oIXdYeeaqWRcQ== Received: by mail-pj1-f70.google.com with SMTP id gc3-20020a17090b3103b0290178c33479a3so4087579pjb.7 for ; Thu, 12 Aug 2021 05:09:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j1uKwxks0s2fEjSfL216poTTK0VLanm+226/BxfeI2U=; b=LBGFNrC1Rhh9jRPXgxKidtzsMXAQi1fnPTladZxH/tMSBZCVRhXHifL6/X+pgjawQP gsT/g4ODUKfJTIs2w+G2WY+62OXCaTDCUQqCK3fVd7VvAyoA01U3xZP091NFtbrUA3T2 Mafg7RcYYEHJDUnnq+cnDp2W0125C2NoS2xaaasG2JnsFZGGzhv/theVs+KXy0ehC5Zl ASdEeepsXL/k5gawS2PrMV+KWtNBaWWV9j5cdVNl31SrRsJd2I389vYcXV0ZlqfCI63W 5R7J57meqMD1cMAwxr1BCkvMKr32rnqv8VJNJuE7Piedp8oSTR/K89ra8EwLxG5j1dbu VEEg== X-Gm-Message-State: AOAM530ircg5MX3VewSCRHs1mUMrI5B5SHeeWC3by5wyfObPg8SqCTXs NknB0RJjNZ8f3AMQCymOpLcmh2y7uzVhmg7TWEgrQmNsfkUhauU2HXnOMWU/U+4Pdho2ZBX2JMk 8vTmHhLG/7jvc9cGAOLsrqZHlCNYbBXvE8ROMx8kOqw== X-Received: by 2002:a62:8491:0:b029:3dd:a29a:a1e4 with SMTP id k139-20020a6284910000b02903dda29aa1e4mr3839039pfd.13.1628770166264; Thu, 12 Aug 2021 05:09:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBGBK26OvRQ8e9udxGFcUISXYGIo0m9tDCoI0IDRhsdIAsOdVzXwSSb9JECcqverxyz3yPjA== X-Received: by 2002:a62:8491:0:b029:3dd:a29a:a1e4 with SMTP id k139-20020a6284910000b02903dda29aa1e4mr3839022pfd.13.1628770166056; Thu, 12 Aug 2021 05:09:26 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:25 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/8] UBUNTU: SAUCE: ubuntu/sgx: look for exported symbols in Makefile Date: Thu, 12 Aug 2021 06:09:09 -0600 Message-Id: <20210812120913.9316-5-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives ded9828792d9968f2db3b98adb8a66afc2d69a9f Linux Driver: look for exported symbols in Makefile In addition to the above commit, hard code HAVE_MMPUT_ASYNC and HAVE_KSYM_LOOKUP for v5.8. Since the Makefile is invoked directly by the kernel build, the DKMS logic that normally determines these macros is bypassed. However, we know what kernel version we're building and that these 2 macros should be set. Signed-off-by: Tim Gardner --- ubuntu/sgx/Makefile | 17 ++++++++++++++--- ubuntu/sgx/encl.c | 4 +++- ubuntu/sgx/main.c | 16 +++++++++------- ubuntu/sgx/reclaim.c | 14 -------------- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/ubuntu/sgx/Makefile b/ubuntu/sgx/Makefile index 394c176a1d53e..763fd841cb209 100644 --- a/ubuntu/sgx/Makefile +++ b/ubuntu/sgx/Makefile @@ -3,14 +3,25 @@ ifneq ($(KERNELRELEASE),) +EXTRA_CFLAGS += -DHAVE_MMPUT_ASYNC +EXTRA_CFLAGS += -DHAVE_KSYM_LOOKUP + obj-m += intel_sgx.o intel_sgx-y := encl.o main.o reclaim.o driver.o ioctl.o else KDIR := /lib/modules/$(shell uname -r)/build - -INKERNEL_SGX :=$(shell cat $(KDIR)/.config | grep "CONFIG_INTEL_SGX=y") +KSYM_MMPUT_ASYNC := $(shell grep "mmput_async\svmlinux\sEXPORT" $(KDIR)/Module.symvers) +KSYM_LOOKUP := $(shell grep "kallsyms_lookup_name\svmlinux\sEXPORT" $(KDIR)/Module.symvers) +EXTRA_CFLAGS := +ifneq ($(KSYM_MMPUT_ASYNC),) + EXTRA_CFLAGS += -DHAVE_MMPUT_ASYNC +endif +ifneq ($(KSYM_LOOKUP),) + EXTRA_CFLAGS += -DHAVE_KSYM_LOOKUP +endif +INKERNEL_SGX :=$(shell cat $(KDIR)/.config | grep "CONFIG_X86_SGX=y\|CONFIG_INTEL_SGX=y") ifneq ($(INKERNEL_SGX),) default: $(error Can't install DCAP SGX driver with inkernel SGX support) @@ -19,7 +30,7 @@ else PWD := $(shell pwd) default: - $(MAKE) -C $(KDIR) M=$(PWD) CFLAGS_MODULE="-I$(PWD) -I$(PWD)/include" modules + $(MAKE) -C $(KDIR) M=$(PWD) CFLAGS_MODULE="-I$(PWD) -I$(PWD)/include $(EXTRA_CFLAGS)" modules endif endif diff --git a/ubuntu/sgx/encl.c b/ubuntu/sgx/encl.c index d58fada28e2c8..50b23aa70b993 100644 --- a/ubuntu/sgx/encl.c +++ b/ubuntu/sgx/encl.c @@ -228,7 +228,9 @@ int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm) * multiple encl_mm instances for a single mm_struct, i.e. it prevents * races between checking sgx_encl_find_mm() and adding to mm_list. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)) +#if(LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) + mmap_assert_write_locked(mm); +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)) lockdep_assert_held_write(&mm->mmap_sem); #else lockdep_assert_held_exclusive(&mm->mmap_sem); diff --git a/ubuntu/sgx/main.c b/ubuntu/sgx/main.c index 8d28da9e8331c..50f34f4b810f5 100644 --- a/ubuntu/sgx/main.c +++ b/ubuntu/sgx/main.c @@ -6,13 +6,13 @@ #include #include #include +#include #include #include #include "driver.h" #include "encls.h" #include -#include #include "version.h" #include "dcap.h" #ifndef MSR_IA32_FEAT_CTL @@ -22,9 +22,7 @@ #ifndef FEAT_CTL_LOCKED #define FEAT_CTL_LOCKED FEATURE_CONTROL_LOCKED #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) void (*k_mmput_async)(struct mm_struct* mm); -#endif struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS]; int sgx_nr_epc_sections; @@ -303,15 +301,19 @@ static int __init sgx_init(void) if (!sgx_page_cache_init()) return -EFAULT; - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) +#ifdef HAVE_MMPUT_ASYNC + k_mmput_async = mmput_async; +#else +#ifdef HAVE_KSYM_LOOKUP k_mmput_async = (void*)kallsyms_lookup_name("mmput_async"); +#else + #error "kernel version is not supported. We need either mmput_async or kallsyms_lookup_name exported from the kernel" +#endif +#endif if (!k_mmput_async){ pr_err("intel_sgx: mmput_async support missing from kernel.\n"); return -EFAULT; } -#endif - if (!sgx_page_reclaimer_init()) goto err_page_cache; diff --git a/ubuntu/sgx/reclaim.c b/ubuntu/sgx/reclaim.c index 747cfbe4ec6a3..596026353e26e 100644 --- a/ubuntu/sgx/reclaim.c +++ b/ubuntu/sgx/reclaim.c @@ -14,9 +14,7 @@ #include "driver.h" #include -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) ) extern void (*k_mmput_async)(struct mm_struct* mm); -#endif struct task_struct *ksgxswapd_tsk; DECLARE_WAIT_QUEUE_HEAD(ksgxswapd_waitq); LIST_HEAD(sgx_active_page_list); @@ -177,11 +175,7 @@ static bool sgx_reclaimer_age(struct sgx_epc_page *epc_page) ret = !sgx_encl_test_and_clear_young(encl_mm->mm, page); up_read(&encl_mm->mm->mmap_sem); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) k_mmput_async(encl_mm->mm); -#else - mmput_async(encl_mm->mm); -#endif if (!ret || (atomic_read(&encl->flags) & SGX_ENCL_DEAD)) break; @@ -228,11 +222,7 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page) up_read(&encl_mm->mm->mmap_sem); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) k_mmput_async(encl_mm->mm); -#else - mmput_async(encl_mm->mm); -#endif } srcu_read_unlock(&encl->srcu, idx); @@ -308,11 +298,7 @@ static const cpumask_t *sgx_encl_ewb_cpumask(struct sgx_encl *encl) cpumask_or(cpumask, cpumask, mm_cpumask(encl_mm->mm)); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) k_mmput_async(encl_mm->mm); -#else - mmput_async(encl_mm->mm); -#endif } srcu_read_unlock(&encl->srcu, idx); From patchwork Thu Aug 12 12:09:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=kITh/wSl; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GllqW13fbz9sX5; Thu, 12 Aug 2021 22:09:42 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9Wl-0005u6-8S; Thu, 12 Aug 2021 12:09:39 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9Wb-0005qC-9P for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:29 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 282DC3F22F for ; Thu, 12 Aug 2021 12:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770169; bh=+FVFhFFXL/Nyi9X8Lfd7lsqh25V3PpuIWl7XFWcyMmg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kITh/wSlW21sE7moOyAANzoBFwRWTPaXyY4EYEVRCQy5qsggTCyz3BEaao2eENyUf PVSMY7dRQ4hJt9FxIVtNzYvIeS0zkjtgbfDKNkGZsLBE/uqKZNJu5/WsexiEDXWuOv V3qgc41S7ZH7Ulwos33lHMFczLaGMD5QqbVg9w/EdKY5lp18+WraI2bXFZv4jmqmr4 W3HuPvu+CLYQ7J8hd1Jot6/sp9pWTluNyU9Z8llwacrkgUOmew8Xribw8Qx/Hi3All wGnv10XeJ7QCiF/SRhfwglX59QcZPLvTi0pH0mMyIu5LY9D489YirIVgkH2i88TGaq 2dO6qdbQp41lA== Received: by mail-pl1-f200.google.com with SMTP id w23-20020a170902d71700b0012d8286e44bso664063ply.3 for ; Thu, 12 Aug 2021 05:09:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+FVFhFFXL/Nyi9X8Lfd7lsqh25V3PpuIWl7XFWcyMmg=; b=V+p8Cvw/tHavYumSYz71Rt8j02iNIXIIemkTE5LUcq1TObaNfLpYKE+uuAqvu9fRHY 0UDcQbJWL8VYVVNwIwnxrlIc+CzSm3Piwh/yR7XnJcRF9oyrUF4PNyJCzkyctfqn/Uya w7JOqbISg/ZoFDMaxGJopAEepXD75L8+6oCm6gZrVJwgBsSc4yb+Q0Q6gf7LlljFInk1 VlZj69UuDpN4wWmhUqEpYvWZm83Wl4hDgBbhoKA++mvb4K8riDvaBwcsz85yqoEo4lhA 9lF1i0MBUphNNBQBj197L3q/JtQkRCWx1e7erP7ZXZNCQenMQGrRCaY7AzkXnmTZKFyw IFqA== X-Gm-Message-State: AOAM533nuLsQ5aOI6wSOb0iTo0PpAOMGpY/cslicToaq8U7UL/7q5pRz u5HXTQuB5E8z3L6/IS58CRmmBQ6JuEpbFlPtySHzlVQQ/mqEKtKROqkZ03Fn744oR0EOMP7gtCu N3kSsWdHxPTYLasPnkVYO/Wy3GdDgNOwunhl8OrcyXw== X-Received: by 2002:a63:2214:: with SMTP id i20mr3520602pgi.131.1628770167543; Thu, 12 Aug 2021 05:09:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHorH0v5QVSrZKD1pUANWDsPY9xQrkU8TtTxfNHQxRlsPeOVDsouI6lLOeRsdYj7T+pBcWAQ== X-Received: by 2002:a63:2214:: with SMTP id i20mr3520586pgi.131.1628770167357; Thu, 12 Aug 2021 05:09:27 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:26 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/8] UBUNTU: SAUCE: ubuntu/sgx: hardening compiler options Date: Thu, 12 Aug 2021 06:09:10 -0600 Message-Id: <20210812120913.9316-6-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives 9086b3ef9b0760292cd2ffd70253a45bfcb37f26 Linux Driver: hardening compiler options Signed-off-by: Tim Gardner --- ubuntu/sgx/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ubuntu/sgx/Makefile b/ubuntu/sgx/Makefile index 763fd841cb209..4f7f513b8b7e1 100644 --- a/ubuntu/sgx/Makefile +++ b/ubuntu/sgx/Makefile @@ -29,8 +29,11 @@ default: else PWD := $(shell pwd) +EXTRA_CFLAGS += -I$(PWD) -I$(PWD)/include -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now +EXTRA_LDFLAGS := -z noexecstack + default: - $(MAKE) -C $(KDIR) M=$(PWD) CFLAGS_MODULE="-I$(PWD) -I$(PWD)/include $(EXTRA_CFLAGS)" modules + $(MAKE) -C $(KDIR) M=$(PWD) LDFLAGS_MODULE="$(EXTRA_LDFLAGS)" CFLAGS_MODULE="$(EXTRA_CFLAGS)" modules endif endif From patchwork Thu Aug 12 12:09:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gwVW60HB; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gllqb73DHz9sXV; Thu, 12 Aug 2021 22:09:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9Wp-0005wQ-EW; Thu, 12 Aug 2021 12:09:43 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9Wc-0005qN-GD for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:30 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 4EC9F3F051 for ; Thu, 12 Aug 2021 12:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770170; bh=iBaghYSiNLEsiq74+1A7RndzHsFxW81Wiu2A8lkKxW4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gwVW60HBunZRSP0aFWsZsGwwJh3za2xBUN0008CVISDwJfRWnVWweLZUVbb3fXp57 wfq5fcyFbgs33J1Qo2G7yTa81cj/8y5j5aPjqUNW6xXqtwFxFkAdY2pkVMvWZc1DQa D4F1SSTfxgbC6ITFHgZpTVq1CAyXyyEoLGTlxdwQWrtkBkig6tjlmeeuluCooJJgkK zWM8dU7p3aYyimfz1UpsNLgHUmD6cthOsZwJXiNH/HMqe0/TXxOIXJ8StVtTAJ7JzW ib4SU7FpLQtCt7EwaUt/7potHXAEOW/WTWSnxuiCVZ+4SE3v2fa9Zo3aUYfuZEA/PN uyqsr8HQnhGCQ== Received: by mail-pj1-f71.google.com with SMTP id j6-20020a17090ac486b0290178ffdbd20dso230330pjt.0 for ; Thu, 12 Aug 2021 05:09:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iBaghYSiNLEsiq74+1A7RndzHsFxW81Wiu2A8lkKxW4=; b=XUaZ7+HLMvvGC85p/fL/TOlGesF1VwEFMbnhLMZDeJW0wr+L3fMLgN41c8KnO/8B70 mfdEyu1tXR7KTTCeQ8pyAowootkfj+otjhwKaB5Xl6p1zPlx93d5Xw7mDOF02zv9asIM eNFzzkWHpy/DFCnBVE+KYEc7OeUpuMuTdI+rkZuwK6PS9ZNCYwXeGoeeM+Kb3UW7mjX2 IoGoRXyxx7+e8CByHrSB3cgHyFhNB2NYeEa3irfHRdrJqbBmol2M8BYHjaknBTKMNzS+ z1tDvcPUszkO9GhkBIEPkSe3ccesBTs88NDfJaJeqyyLBD+R8/SqFkiRs75hoQlkHRnr 0B8w== X-Gm-Message-State: AOAM532Fs6bdObAMs7gKgpySvCiOD/ZQLgezU2XOVwxCZDqJ1bPbr7JE Bm6YEbnCgWftjSaFmrjyLOTUxhAbbleBjWUFs/u9G8e/p0ByLdIC/Q7twjdG7n3JmI9Y0fyvbuj sRbm5ddxmhkcL71ta4JAsiwAHGb5ix7OvZcR9luXplw== X-Received: by 2002:a63:83c7:: with SMTP id h190mr3615059pge.51.1628770168660; Thu, 12 Aug 2021 05:09:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyB3UvLWrFhEzICVDasWaNFSqhMH7n8fmg5eYIXfnoeZbdU3X7Ahs59BwusXBi0jL+ZvXTNig== X-Received: by 2002:a63:83c7:: with SMTP id h190mr3615042pge.51.1628770168454; Thu, 12 Aug 2021 05:09:28 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:27 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/8] UBUNTU: SAUCE: ubuntu/sgx: Fix signed integer overflow on shift Date: Thu, 12 Aug 2021 06:09:11 -0600 Message-Id: <20210812120913.9316-7-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives af9a396cbc0977898d779950e69b493802432591 Fix signed integer overflow on shift Signed-off-by: Tim Gardner --- ubuntu/sgx/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/sgx/ioctl.c b/ubuntu/sgx/ioctl.c index 0dd2f4ef970d5..5c84447b8ac28 100644 --- a/ubuntu/sgx/ioctl.c +++ b/ubuntu/sgx/ioctl.c @@ -66,7 +66,7 @@ static u32 sgx_calc_ssaframesize(u32 miscselect, u64 xfrm) int i; for (i = 2; i < 64; i++) { - if (!((1 << i) & xfrm)) + if (!((1UL << i) & xfrm)) continue; size = SGX_SSA_GPRS_SIZE + sgx_xsave_size_tbl[i]; From patchwork Thu Aug 12 12:09:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=aZCx99aW; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gllqz5GyYz9t1s; Thu, 12 Aug 2021 22:10:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9X8-00067X-NL; Thu, 12 Aug 2021 12:10:02 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9Wd-0005qV-Cn for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:31 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 4594F40650 for ; Thu, 12 Aug 2021 12:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770171; bh=KWneBkKFuR3vC4SI+f6qkM8uAlUGl+di+P2SYKKWGrM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aZCx99aWi8DzgLQYjOET84VslTrOwRu3p5XISzjxRE/C643o72+BdXE7Qmo4ACouL FqllRfjKaXZhD8bHrnqBMhh9txLhtQ49UUbTtGTXCEqIKAdaQtLNIrYvWeo10zXzdQ 8j67HNL0tyHeuPWRz3w4xA7RCYd3b2TCbmppGwbkH9ZMG+6Ap4C8+/sWlCEGvEQk2N jXPNrnjcTe9BF8fax8HYa9oQFZzQSsV1NSjtoNHHr22Z0pwwoHYVODpXx+gNqUZDSm EPgWrZSJD+A5GklQCQCphrSWRx6PDMbhZeYhBCLLI2HjQ6IcfI0By8oO/xKZ6K6A8U D5MGpoL3zixeQ== Received: by mail-pj1-f71.google.com with SMTP id y3-20020a17090a8b03b02901787416b139so4901191pjn.4 for ; Thu, 12 Aug 2021 05:09:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KWneBkKFuR3vC4SI+f6qkM8uAlUGl+di+P2SYKKWGrM=; b=EI2RjIXteC5oDbWeh6wK/UZkYzOfsUBSMDYllJsKyN1NvYCVDGZ8xqFC+ANS3gpfma T6nXMMaCeXXj1HoJM7F0vCWkzIVDgTUJil4AA+2dyj7YXrmS0PtAOcLnEOcG748tvXFG X1KgaEIkDgWZ0cPGS9GouLztqn3FTIkSsAOHbUUZCCh4fz9li4qgb4Wj8zbRxZgPhNAP a//Yk5sLunUEBZ2NsogEaRLijFvKITOsnYUTO21SD9N3JA++BfPhMF/ftXhcZXY4weTh cvs6Av1G7a9wOK/A6MzkGJnW7vKHdwGpEac0fFtqiCnFd65aeiJRA78hvvTBQG4QAmbr fg4w== X-Gm-Message-State: AOAM532Y0u/12xk9UC3+rmAQb1WTu2erdAiNas88brS0lNW4nEadvJrf w78krWWG9Bt06RB0wkdnkow214k8EjWB04fKdTrQhR44OAC46F30XQ5t0U4MT73xzm2eCFv9qcH XezywFwZvXwJGL+rO0S4INj4Rf1tK7aXG4GrwCaoa2Q== X-Received: by 2002:a63:ff5e:: with SMTP id s30mr188554pgk.390.1628770169548; Thu, 12 Aug 2021 05:09:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvYQY6HFt5+MzI4rTVuYU2GHhROIfaWLP0ORKAxnq/TjsQIq0pw36TIII3E/QWxPlDen63kQ== X-Received: by 2002:a63:ff5e:: with SMTP id s30mr188544pgk.390.1628770169396; Thu, 12 Aug 2021 05:09:29 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:28 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/8] UBUNTU: SAUCE: ubuntu/sgx: move use space header Date: Thu, 12 Aug 2021 06:09:12 -0600 Message-Id: <20210812120913.9316-8-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives a980e06b53be94107379d9361566fd23f0f5303a Linux Driver: move use space header Signed-off-by: Tim Gardner --- ubuntu/sgx/driver.h | 2 +- arch/x86/include/uapi/asm/sgx_oot.h => ubuntu/sgx/sgx_user.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/x86/include/uapi/asm/sgx_oot.h => ubuntu/sgx/sgx_user.h (100%) diff --git a/ubuntu/sgx/driver.h b/ubuntu/sgx/driver.h index c90e132750600..0049af7d68561 100644 --- a/ubuntu/sgx/driver.h +++ b/ubuntu/sgx/driver.h @@ -9,7 +9,7 @@ #include #include #include -#include "uapi/asm/sgx_oot.h" +#include "sgx_user.h" #include "sgx.h" #define SGX_EINIT_SPIN_COUNT 20 diff --git a/arch/x86/include/uapi/asm/sgx_oot.h b/ubuntu/sgx/sgx_user.h similarity index 100% rename from arch/x86/include/uapi/asm/sgx_oot.h rename to ubuntu/sgx/sgx_user.h From patchwork Thu Aug 12 12:09:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1516267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=nF1WN9Gd; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gllqq5q4Qz9sjJ; Thu, 12 Aug 2021 22:09:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mE9X1-00062r-RG; Thu, 12 Aug 2021 12:09:55 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mE9We-0005qp-Bb for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:32 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 387AE3F22F for ; Thu, 12 Aug 2021 12:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770172; bh=6nEKjZOksJMok0sPZkcMPN17Nnsbz6yr6xoQWt3LUnA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nF1WN9GdFL0Grn7Vm5QIxQvjL5BGHZzxLpL3sfLz9IiiB1SO7Jy0j0eve1ELhw00p zg5o16XnCCmdwQvqdqt/K8/syAuLifWvB9YUWIS6eESGezN4Pz0437ZLzAhjVUYTks e3h0Bp/0xcjSKx23rk3IRTEat08PdW/aKtICBFFftiHoRgp49ut/4y7iHeZcYW3Rky qcC3+0e9ghS12YZmGddZGdvdpVCoRskQh8iJfsgC7ptfAFumorv9E41taGR1JHXYQO mNzMNcsB/CWrkyvcEzCEJaDOMNfjnd+C3ycTJSKaDaUOxZkLn5Uq16mgAEF8d65gcS W5gGbOsLcCf1g== Received: by mail-pj1-f71.google.com with SMTP id o23-20020a17090a4217b02901774c248202so7886173pjg.9 for ; Thu, 12 Aug 2021 05:09:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6nEKjZOksJMok0sPZkcMPN17Nnsbz6yr6xoQWt3LUnA=; b=T/v8iDQD6yazxRADJ1BkSypdj9zQbepRfYrNE43srMH5RJK97jI8lNfM6YPjkXy14O 5Z2Y5vpM+RD5EZq9nSeiAL08sCUatgtEAoVg8AmzisqQxz+voqYtnd/cpVMh0+ZfpgjR mPf50dOzq36cEVVPYU1/vOfI9gPvC236xc8p7NN54SQB15iZNpvSvhsn4DveZwZUjU9w WaIhbYBGUy4NtcbiT1nRL0HkVLKGmI0GvgKowCiJBnpeJjgZoofEk9TJIx508pxk36Hx 0EHoYObH3RovI8IXTaHq3sij8NeciWJAXgsG2ATp2Cm4XXyYPc4wZt96N7Qg1IidCTNj Iglg== X-Gm-Message-State: AOAM530kGmrQHT3Fp4E+4nSqnGCtW67tQC++Ofx3H2NwBkOMo4MYezGU nDXib2uXtY7lqQVHfk5Oq6wWrpeCWptlQyLFQu6Hm+OXQM6t2FRQnrhkQIoKUoNfrwHW2Y1VT90 B/Tx3Zbzz1rgoSXnUANfngHBpO7dy4TOt9j7XsiLt8w== X-Received: by 2002:a65:41c6:: with SMTP id b6mr3644457pgq.206.1628770170475; Thu, 12 Aug 2021 05:09:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2sXxubeFn0FAtKBxXRGi8m+jCgAWWF+TFHtXsOB+3fYNDLSqyLdyLicjTWGCoy6qiqWpzgQ== X-Received: by 2002:a65:41c6:: with SMTP id b6mr3644449pgq.206.1628770170338; Thu, 12 Aug 2021 05:09:30 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:29 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 8/8] UBUNTU: SAUCE: ubuntu/sgx: Version 1.33.2 Date: Thu, 12 Aug 2021 06:09:13 -0600 Message-Id: <20210812120913.9316-9-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives 56a183872786d9ad3f2f395dc1d740ccb22d01a1 Linux Driver: Version 1.33.2 Signed-off-by: Tim Gardner --- ubuntu/sgx/dkms.conf | 2 +- ubuntu/sgx/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/sgx/dkms.conf b/ubuntu/sgx/dkms.conf index bef858e01c4ec..6d72ceb15c187 100644 --- a/ubuntu/sgx/dkms.conf +++ b/ubuntu/sgx/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="sgx" -PACKAGE_VERSION="1.33" +PACKAGE_VERSION="1.33.2" BUILT_MODULE_NAME[0]="intel_sgx" DEST_MODULE_LOCATION[0]="/kernel/drivers/intel/sgx" AUTOINSTALL="yes" diff --git a/ubuntu/sgx/version.h b/ubuntu/sgx/version.h index f3f6698695b01..819c8b519ca2a 100644 --- a/ubuntu/sgx/version.h +++ b/ubuntu/sgx/version.h @@ -5,6 +5,6 @@ #define _SGX_VERSION_H #define DRV_DESCRIPTION "Intel SGX DCAP Driver" -#define DRV_VERSION "1.33" +#define DRV_VERSION "1.33.2" #endif /* _SGX_VERSION_H */