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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0D9FC433E0 for ; Wed, 6 Jan 2021 08:53:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C76123107 for ; Wed, 6 Jan 2021 08:53:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C76123107 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC28E89D8A; Wed, 6 Jan 2021 08:52:55 +0000 (UTC) Received: from so254-31.mailgun.net (so254-31.mailgun.net [198.61.254.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0AEBD6E11A for ; Tue, 5 Jan 2021 14:37:02 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1609857425; h=Content-Transfer-Encoding: Content-Type: MIME-Version: Message-Id: Date: Subject: Cc: To: From: Sender; bh=4DiNJfGzzRCDF2FL02HtG0SOdr7LDb46DzlmbUJfV6s=; b=sggrCJfK/iVUc96w+C6fR6lc91nUyJJFHAvvXx36JRUVrjtfvoMdLE2JnwfCIay0KXECYkwp MBxu+axtFlCGyhnURsDI1d4exgQYGwvv+rxsCmdBOt5dkUS3Ipy4IA5NpdFH1wrruxG5u3bE 4mLcZSBsJqdwyWnCVDq+IKejOds= X-Mailgun-Sending-Ip: 198.61.254.31 X-Mailgun-Sid: WyJkOTU5ZSIsICJkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n10.prod.us-west-2.postgun.com with SMTP id 5ff47988d3eb3c36b4aa9d15 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 05 Jan 2021 14:36:56 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 0ED76C43461; Tue, 5 Jan 2021 14:36:56 +0000 (UTC) Received: from charante-linux.qualcomm.com (unknown [202.46.22.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: charante) by smtp.codeaurora.org (Postfix) with ESMTPSA id E3526C433CA; Tue, 5 Jan 2021 14:36:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E3526C433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=charante@codeaurora.org From: Charan Teja Reddy To: sumit.semwal@linaro.org, christian.koenig@amd.com, arnd@arndb.de Subject: [PATCH V2] dmabuf: fix use-after-free of dmabuf's file->f_inode Date: Tue, 5 Jan 2021 20:06:39 +0530 Message-Id: <1609857399-31549-1-git-send-email-charante@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 06 Jan 2021 08:52:53 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, "# 5 . 4+" , linaro-mm-sig@lists.linaro.org, Charan Teja Reddy , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" SXQgaXMgb2JzZXJ2ZWQgJ3VzZS1hZnRlci1mcmVlJyBvbiB0aGUgZG1hYnVmJ3MgZmlsZS0+Zl9p bm9kZSB3aXRoIHRoZQpyYWNlIGJldHdlZW4gY2xvc2luZyB0aGUgZG1hYnVmIGZpbGUgYW5kIHJl YWRpbmcgdGhlIGRtYWJ1ZidzIGRlYnVnCmluZm8uCgpDb25zaWRlciB0aGUgYmVsb3cgc2NlbmFy aW8gd2hlcmUgUDEgaXMgY2xvc2luZyB0aGUgZG1hX2J1ZiBmaWxlCmFuZCBQMiBpcyByZWFkaW5n IHRoZSBkbWFfYnVmJ3MgZGVidWcgaW5mbyBpbiB0aGUgc3lzdGVtOgoKUDEJCQkJCQlQMgoJCQkJ CWRtYV9idWZfZGVidWdfc2hvdygpCmRtYV9idWZfcHV0KCkKICBfX2ZwdXQoKQogICAgZmlsZS0+ Zl9vcC0+cmVsZWFzZSgpCiAgICBkcHV0KCkKICAgIC4uLi4KICAgICAgZGVudHJ5X3VubGlua19p bm9kZSgpCiAgICAgICAgaXB1dChkZW50cnktPmRfaW5vZGUpCiAgICAgICAgKHdoZXJlIHRoZSBp bm9kZSBpcyBmcmVlZCkKCQkJCQltdXRleF9sb2NrKCZkYl9saXN0LmxvY2spCgkJCQkJcmVhZCAn ZG1hX2J1Zi0+ZmlsZS0+Zl9pbm9kZScKCQkJCQkodGhlIHNhbWUgaW5vZGUgaXMgZnJlZWQgYnkg UDEpCgkJCQkJbXV0ZXhfdW5sb2NrKCZkYl9saXN0LmxvY2spCiAgICAgIGRlbnRyeS0+ZF9vcC0+ ZF9yZWxlYXNlKCktLT4KICAgICAgICBkbWFfYnVmX3JlbGVhc2UoKQogICAgICAgICAgLi4uLi4K ICAgICAgICAgIG11dGV4X2xvY2soJmRiX2xpc3QubG9jaykKICAgICAgICAgIHJlbW92ZXMgdGhl IGRtYWJ1ZiBmcm9tIHRoZSBsaXN0CiAgICAgICAgICBtdXRleF91bmxvY2soJmRiX2xpc3QubG9j aykKCkluIHRoZSBhYm92ZSBzY2VuYXJpbywgd2hlbiBkbWFfYnVmX3B1dCgpIGlzIGNhbGxlZCBv biBhIGRtYV9idWYsIGl0CmZpcnN0IGZyZWVzIHRoZSBkbWFfYnVmJ3MgZmlsZS0+Zl9pbm9kZSg9 ZGVudHJ5LT5kX2lub2RlKSBhbmQgdGhlbgpyZW1vdmVzIHRoaXMgZG1hX2J1ZiBmcm9tIHRoZSBz eXN0ZW0gZGJfbGlzdC4gSW4gYmV0d2VlbiBQMiB0cmF2ZXJzaW5nCnRoZSBkYl9saXN0IHRyaWVz IHRvIGFjY2VzcyB0aGlzIGRtYV9idWYncyBmaWxlLT5mX2lub2RlIHRoYXQgd2FzIGZyZWVkCmJ5 IFAxIHdoaWNoIGlzIGEgdXNlLWFmdGVyLWZyZWUgY2FzZS4KClNpbmNlLCBfX2ZwdXQoKSBjYWxs cyBmX29wLT5yZWxlYXNlIGZpcnN0IGFuZCB0aGVuIGxhdGVyIGNhbGxzIHRoZQpkX29wLT5kX3Jl bGVhc2UsIG1vdmUgdGhlIGRtYV9idWYncyBkYl9saXN0IHJlbW92YWwgZnJvbSBkX3JlbGVhc2Uo KSB0bwpmX29wLT5yZWxlYXNlKCkuIFRoaXMgZW5zdXJlcyB0aGF0IGRtYV9idWYncyBmaWxlLT5m X2lub2RlIGlzIG5vdAphY2Nlc3NlZCBhZnRlciBpdCBpcyByZWxlYXNlZC4KCkNjOiA8c3RhYmxl QHZnZXIua2VybmVsLm9yZz4gIyA1LjQrCkZpeGVzOiA0YWI1OWMzYzYzOGMgKCJkbWEtYnVmOiBN b3ZlIGRtYV9idWZfcmVsZWFzZSgpIGZyb20gZm9wcyB0byBkZW50cnlfb3BzIikKQWNrZWQtYnk6 IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KU2lnbmVkLW9mZi1i eTogQ2hhcmFuIFRlamEgUmVkZHkgPGNoYXJhbnRlQGNvZGVhdXJvcmEub3JnPgotLS0KIFYyOiBS ZXNlbmRpbmcgd2l0aCBzdGFibGUgdGFncyBhbmQgQWNrcwoKIFYxOiBodHRwczovL2xvcmUua2Vy bmVsLm9yZy9wYXRjaHdvcmsvcGF0Y2gvMTM2MDExOC8KCiBkcml2ZXJzL2RtYS1idWYvZG1hLWJ1 Zi5jIHwgMjEgKysrKysrKysrKysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0 aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS1idWYvZG1h LWJ1Zi5jIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwppbmRleCAwZWI4MGMxLi5hMTRkY2Ji IDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCisrKyBiL2RyaXZlcnMvZG1h LWJ1Zi9kbWEtYnVmLmMKQEAgLTc2LDEwICs3Niw2IEBAIHN0YXRpYyB2b2lkIGRtYV9idWZfcmVs ZWFzZShzdHJ1Y3QgZGVudHJ5ICpkZW50cnkpCiAKIAlkbWFidWYtPm9wcy0+cmVsZWFzZShkbWFi dWYpOwogCi0JbXV0ZXhfbG9jaygmZGJfbGlzdC5sb2NrKTsKLQlsaXN0X2RlbCgmZG1hYnVmLT5s aXN0X25vZGUpOwotCW11dGV4X3VubG9jaygmZGJfbGlzdC5sb2NrKTsKLQogCWlmIChkbWFidWYt PnJlc3YgPT0gKHN0cnVjdCBkbWFfcmVzdiAqKSZkbWFidWZbMV0pCiAJCWRtYV9yZXN2X2Zpbmko ZG1hYnVmLT5yZXN2KTsKIApAQCAtODgsNiArODQsMjIgQEAgc3RhdGljIHZvaWQgZG1hX2J1Zl9y ZWxlYXNlKHN0cnVjdCBkZW50cnkgKmRlbnRyeSkKIAlrZnJlZShkbWFidWYpOwogfQogCitzdGF0 aWMgaW50IGRtYV9idWZfZmlsZV9yZWxlYXNlKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBm aWxlICpmaWxlKQoreworCXN0cnVjdCBkbWFfYnVmICpkbWFidWY7CisKKwlpZiAoIWlzX2RtYV9i dWZfZmlsZShmaWxlKSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlkbWFidWYgPSBmaWxlLT5wcml2 YXRlX2RhdGE7CisKKwltdXRleF9sb2NrKCZkYl9saXN0LmxvY2spOworCWxpc3RfZGVsKCZkbWFi dWYtPmxpc3Rfbm9kZSk7CisJbXV0ZXhfdW5sb2NrKCZkYl9saXN0LmxvY2spOworCisJcmV0dXJu IDA7Cit9CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZGVudHJ5X29wZXJhdGlvbnMgZG1hX2J1Zl9k ZW50cnlfb3BzID0gewogCS5kX2RuYW1lID0gZG1hYnVmZnNfZG5hbWUsCiAJLmRfcmVsZWFzZSA9 IGRtYV9idWZfcmVsZWFzZSwKQEAgLTQxMyw2ICs0MjUsNyBAQCBzdGF0aWMgdm9pZCBkbWFfYnVm X3Nob3dfZmRpbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGZpbGUgKmZpbGUpCiB9CiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmlsZV9vcGVyYXRpb25zIGRtYV9idWZfZm9wcyA9IHsKKwku cmVsZWFzZQk9IGRtYV9idWZfZmlsZV9yZWxlYXNlLAogCS5tbWFwCQk9IGRtYV9idWZfbW1hcF9p bnRlcm5hbCwKIAkubGxzZWVrCQk9IGRtYV9idWZfbGxzZWVrLAogCS5wb2xsCQk9IGRtYV9idWZf cG9sbCwKLS0gClFVQUxDT01NIElORElBLCBvbiBiZWhhbGYgb2YgUXVhbGNvbW0gSW5ub3ZhdGlv biBDZW50ZXIsIEluYy4gaXMgYQptZW1iZXIgb2YgdGhlIENvZGUgQXVyb3JhIEZvcnVtLCBob3N0 ZWQgYnkgVGhlIExpbnV4IEZvdW5kYXRpb24KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo= 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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD5F9C433E0 for ; Tue, 5 Jan 2021 14:37:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8570D22B49 for ; Tue, 5 Jan 2021 14:37:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726864AbhAEOhv (ORCPT ); Tue, 5 Jan 2021 09:37:51 -0500 Received: from m43-15.mailgun.net ([69.72.43.15]:47284 "EHLO m43-15.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726618AbhAEOhu (ORCPT ); Tue, 5 Jan 2021 09:37:50 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1609857445; h=Content-Transfer-Encoding: Content-Type: MIME-Version: Message-Id: Date: Subject: Cc: To: From: Sender; bh=4DiNJfGzzRCDF2FL02HtG0SOdr7LDb46DzlmbUJfV6s=; b=X45A930qsyotc7/AD+4OMqx7f3foVhfJ7jUfObJQTt8ghcmLls1hQ4Mvgq58UmK+qXqvyUBt Aq4WBL9vEYpQD9iXanVarK1oExM2NmjDs7zLV6WSUX54dDTWCV98XCEpQxZZzgsTEPj/Ml7v JVDstBAXK/rtN2L16vX18hvQ/M8= X-Mailgun-Sending-Ip: 69.72.43.15 X-Mailgun-Sid: WyI3ZjU0NiIsICJsaW51eC1tZWRpYUB2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n08.prod.us-west-2.postgun.com with SMTP id 5ff47988b73be0303d2da1d0 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 05 Jan 2021 14:36:56 GMT Sender: charante=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id AF37CC433C6; Tue, 5 Jan 2021 14:36:56 +0000 (UTC) Received: from charante-linux.qualcomm.com (unknown [202.46.22.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: charante) by smtp.codeaurora.org (Postfix) with ESMTPSA id E3526C433CA; Tue, 5 Jan 2021 14:36:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E3526C433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=charante@codeaurora.org From: Charan Teja Reddy To: sumit.semwal@linaro.org, christian.koenig@amd.com, arnd@arndb.de Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, Charan Teja Reddy , "# 5 . 4+" Subject: [PATCH V2] dmabuf: fix use-after-free of dmabuf's file->f_inode Date: Tue, 5 Jan 2021 20:06:39 +0530 Message-Id: <1609857399-31549-1-git-send-email-charante@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org It is observed 'use-after-free' on the dmabuf's file->f_inode with the race between closing the dmabuf file and reading the dmabuf's debug info. Consider the below scenario where P1 is closing the dma_buf file and P2 is reading the dma_buf's debug info in the system: P1 P2 dma_buf_debug_show() dma_buf_put() __fput() file->f_op->release() dput() .... dentry_unlink_inode() iput(dentry->d_inode) (where the inode is freed) mutex_lock(&db_list.lock) read 'dma_buf->file->f_inode' (the same inode is freed by P1) mutex_unlock(&db_list.lock) dentry->d_op->d_release()--> dma_buf_release() ..... mutex_lock(&db_list.lock) removes the dmabuf from the list mutex_unlock(&db_list.lock) In the above scenario, when dma_buf_put() is called on a dma_buf, it first frees the dma_buf's file->f_inode(=dentry->d_inode) and then removes this dma_buf from the system db_list. In between P2 traversing the db_list tries to access this dma_buf's file->f_inode that was freed by P1 which is a use-after-free case. Since, __fput() calls f_op->release first and then later calls the d_op->d_release, move the dma_buf's db_list removal from d_release() to f_op->release(). This ensures that dma_buf's file->f_inode is not accessed after it is released. Cc: # 5.4+ Fixes: 4ab59c3c638c ("dma-buf: Move dma_buf_release() from fops to dentry_ops") Acked-by: Christian König Signed-off-by: Charan Teja Reddy --- V2: Resending with stable tags and Acks V1: https://lore.kernel.org/patchwork/patch/1360118/ drivers/dma-buf/dma-buf.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 0eb80c1..a14dcbb 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -76,10 +76,6 @@ static void dma_buf_release(struct dentry *dentry) dmabuf->ops->release(dmabuf); - mutex_lock(&db_list.lock); - list_del(&dmabuf->list_node); - mutex_unlock(&db_list.lock); - if (dmabuf->resv == (struct dma_resv *)&dmabuf[1]) dma_resv_fini(dmabuf->resv); @@ -88,6 +84,22 @@ static void dma_buf_release(struct dentry *dentry) kfree(dmabuf); } +static int dma_buf_file_release(struct inode *inode, struct file *file) +{ + struct dma_buf *dmabuf; + + if (!is_dma_buf_file(file)) + return -EINVAL; + + dmabuf = file->private_data; + + mutex_lock(&db_list.lock); + list_del(&dmabuf->list_node); + mutex_unlock(&db_list.lock); + + return 0; +} + static const struct dentry_operations dma_buf_dentry_ops = { .d_dname = dmabuffs_dname, .d_release = dma_buf_release, @@ -413,6 +425,7 @@ static void dma_buf_show_fdinfo(struct seq_file *m, struct file *file) } static const struct file_operations dma_buf_fops = { + .release = dma_buf_file_release, .mmap = dma_buf_mmap_internal, .llseek = dma_buf_llseek, .poll = dma_buf_poll, -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation