From: Tejun Heo <tj@kernel.org>
To: gregkh@linuxfoundation.org
Cc: "Thomas Bächler" <thomas@archlinux.org>,
linux-kernel@vger.kernel.org,
intel-gfx <intel-gfx@lists.freedesktop.org>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
davej@redhat.com,
"Tobias Powalowski" <tobias.powalowski@googlemail.com>
Subject: [PATCH driver-core-linus] kernfs: add back missing error check in kernfs_fop_mmap()
Date: Sun, 20 Apr 2014 08:29:21 -0400 [thread overview]
Message-ID: <20140420122921.GA32624@htj.dyndns.org> (raw)
In-Reply-To: <5352C7BB.8040009@googlemail.com>
While updating how mmap enabled kernfs files are handled by lockdep,
9b2db6e18945 ("sysfs: bail early from kernfs_file_mmap() to avoid
spurious lockdep warning") inadvertently dropped error return check
from kernfs_file_mmap(). The intention was just dropping "if
(ops->mmap)" check as the control won't reach the point if the mmap
callback isn't implemented, but I mistakenly removed the error return
check together with it.
This led to Xorg crash on i810 which was reported and bisected to the
commit and then to the specific change by Tobias.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-and-bisected-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com
---
Hello,
Oops, sorry that I didn't see the mistake which seems so obvious now.
Can you please verify that this patch works?
Thanks a lot for the report and bisection!
fs/kernfs/file.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 8034706..e01ea4a 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -484,6 +484,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)
ops = kernfs_ops(of->kn);
rc = ops->mmap(of, vma);
+ if (rc)
+ goto out_put;
/*
* PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup()
next parent reply other threads:[~2014-04-20 12:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <533D01BD.1010200@googlemail.com>
[not found] ` <20140418203825.GK23576@htj.dyndns.org>
[not found] ` <5352C7BB.8040009@googlemail.com>
2014-04-20 12:29 ` Tejun Heo [this message]
2014-04-20 16:55 ` Tobias Powalowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140420122921.GA32624@htj.dyndns.org \
--to=tj@kernel.org \
--cc=daniel.vetter@ffwll.ch \
--cc=davej@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas@archlinux.org \
--cc=tobias.powalowski@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®