Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1117426pxk; Fri, 4 Sep 2020 00:31:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWsCxVMy2WncKuupj1cC5l36un1e40OSJSjj+tI24pf2ehX/dDySDcZvvTNJhnGIobUcqk X-Received: by 2002:a50:e68a:: with SMTP id z10mr7398084edm.100.1599204674768; Fri, 04 Sep 2020 00:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599204674; cv=none; d=google.com; s=arc-20160816; b=HY7KcJYS8JIxoA5Jg7oAxF1/QBGcdjgz+oFsSdNJ8q7LCDw23GDsy2+YWwaLrdYhyw LNoQxEepbnYQjGrsqbusdG1mxETIRy7sogitgZAge3Na52v1WYjhUe1d9EXbq9lj9X10 Gx4h7wKRVcDyUtqkOnwnZwfxHKrDE2W7udlMyHpaemaRUEvxC+ZqC22tkEeRi0z1actm ETGEGLCDJFZj0VgnXsShwmDL5G/CgtMPX/hGH2jPjevA4W96xtYgGTgAQselagFRWWBN 2BK5HuYZFuc3rrsV4MJvMZOfQ38TJXsm75ZeKogtqUFj4d1psu2tShCsS2qhYJYnz/HE hpnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :message-id:in-reply-to:subject:cc:to:from:date; bh=GiLNBUAwOSZGHHp+U5L6LjIPAJkqSUqN4GaeGm8fSYM=; b=u+X0EqT8Q4T+Ntvu4pdFeJhwaXzTkxooAfjtC5vA/fN8xRGcTRKDsxHJNw+QA8K9Dn +h5s1ODnHxmQkDDUPF35wP58w6s7i4TOJEPkiHU5CCwtIhkIamAy1GvFMhtZso8riFyn ATx10Evmof9boIijA6ZmwLUhRFfmP2sNiX/akdzBOZwgcKpwTJaCALVpgkYp0HSM1ueU RsVf70J+DrQkw4vfo0kGHk0046qIAa/hvtW/VxmOsHGEZ2P8FCRafIrwkTPxEFlvvhbt gAL/orTcyyZtG24ZevxhYQUth3SlsIRf+C6O2z0OLro3OcDPuIP6Y2+fxZFxtwBNFtPg tf3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k17si3487269ejc.412.2020.09.04.00.30.52; Fri, 04 Sep 2020 00:31:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729788AbgIDH3x (ORCPT + 99 others); Fri, 4 Sep 2020 03:29:53 -0400 Received: from cmta20.telus.net ([209.171.16.93]:59586 "EHLO cmta20.telus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729724AbgIDH3k (ORCPT ); Fri, 4 Sep 2020 03:29:40 -0400 X-Greylist: delayed 488 seconds by postgrey-1.27 at vger.kernel.org; Fri, 04 Sep 2020 03:29:39 EDT Received: from montezuma.home ([154.5.226.127]) by cmsmtp with SMTP id E62IkLM3Dts7mE62JkUKB3; Fri, 04 Sep 2020 01:21:30 -0600 X-Telus-Authed: none X-Authority-Analysis: v=2.3 cv=esGhMbhX c=1 sm=1 tr=0 a=f8b3WT/FcTuUJCJtQO1udw==:117 a=f8b3WT/FcTuUJCJtQO1udw==:17 a=kj9zAlcOel0A:10 a=VwQbUJbxAAAA:8 a=sdRlC8HA8of5HKNwkIoA:9 a=CjuIK1q_8ugA:10 a=AjGcO6oz07-iQ99wixmX:22 a=pHzHmUro8NiASowvMSCR:22 a=n87TN5wuljxrRezIQYnT:22 Date: Fri, 4 Sep 2020 00:21:26 -0700 (PDT) From: Zwane Mwaikambo To: Lyude Paul cc: Daniel Vetter , dkwon@redhat.com, Linux Kernel , dri-devel , zwanem@gmail.com Subject: [PATCH]] drm/dp check aux_dev before use in drm_dp_aux_dev_get_by_minor() In-Reply-To: Message-ID: References: <20200811085830.GZ2352366@phenom.ffwll.local> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-CMAE-Envelope: MS4wfI+UlnBQk2yWjWrY1QreIDLHfETiLDlU4IpvhwW3DoX+nGOKWR2Iz1jc1S0v+b3xZwxvif+MsK4pqy7sOuqY2UeeRyTHPvFXGyj7MrqjMLaFCmQCLTas oCCvU2yV2sUMXOF0wx0FehKrP6Dq6W1xDoe+woBQRojgaaYVONPuPFeHx7nbLy4ID/lQPAg8Plh6IgpoJ915qK6JD7TlHwfEMkGmNUb9THz9PRcnKxGYRWh5 SqJ8DGtXOx8NUGACa6Yis1FXlX5cAfVjsAIrHtsGNbmALPKuFx03+9Y3oS+Ziq6fFWIEXuYtNDQKlpjdRN8/WjeLoLopSqusG5s+LmqaxOk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I observed this when unplugging a DP monitor whilst a computer is asleep and then waking it up. This left DP chardev nodes still being present on the filesystem and accessing these device nodes caused an oops because drm_dp_aux_dev_get_by_minor() assumes a device exists if it is opened. This can also be reproduced by creating a device node with mknod(1) and issuing an open(2) [166164.933198] BUG: kernel NULL pointer dereference, address: 0000000000000018 [166164.933202] #PF: supervisor read access in kernel mode [166164.933204] #PF: error_code(0x0000) - not-present page [166164.933205] PGD 0 P4D 0 [166164.933208] Oops: 0000 [#1] PREEMPT SMP NOPTI [166164.933211] CPU: 4 PID: 99071 Comm: fwupd Tainted: G W 5.8.0-rc6+ #1 [166164.933213] Hardware name: LENOVO 20RD002VUS/20RD002VUS, BIOS R16ET25W (1.11 ) 04/21/2020 [166164.933232] RIP: 0010:drm_dp_aux_dev_get_by_minor+0x29/0x70 [drm_kms_helper] [166164.933234] Code: 00 0f 1f 44 00 00 55 48 89 e5 41 54 41 89 fc 48 c7 c7 60 01 a4 c0 e8 26 ab 30 d7 44 89 e6 48 c7 c7 80 01 a4 c0 e8 47 94 d6 d6 <8b> 50 18 49 89 c4 48 8d 78 18 85 d2 74 33 8d 4a 01 89 d0 f0 0f b1 [166164.933236] RSP: 0018:ffffb7d7c41cbbf0 EFLAGS: 00010246 [166164.933237] RAX: 0000000000000000 RBX: ffff8a90001fe900 RCX: 0000000000000000 [166164.933238] RDX: 0000000000000000 RSI: 0000000000000003 RDI: ffffffffc0a40180 [166164.933239] RBP: ffffb7d7c41cbbf8 R08: 0000000000000000 R09: ffff8a93e157d6d0 [166164.933240] R10: 0000000000000000 R11: ffffffffc0a40188 R12: 0000000000000003 [166164.933241] R13: ffff8a9402200e80 R14: ffff8a90001fe900 R15: 0000000000000000 [166164.933244] FS: 00007f7fb041eb00(0000) GS:ffff8a9411500000(0000) knlGS:0000000000000000 [166164.933245] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [166164.933246] CR2: 0000000000000018 CR3: 00000000352c2003 CR4: 00000000003606e0 [166164.933247] Call Trace: [166164.933264] auxdev_open+0x1b/0x40 [drm_kms_helper] [166164.933278] chrdev_open+0xa7/0x1c0 [166164.933282] ? cdev_put.part.0+0x20/0x20 [166164.933287] do_dentry_open+0x161/0x3c0 [166164.933291] vfs_open+0x2d/0x30 [166164.933297] path_openat+0xb27/0x10e0 [166164.933306] ? atime_needs_update+0x73/0xd0 [166164.933309] do_filp_open+0x91/0x100 [166164.933313] ? __alloc_fd+0xb2/0x150 [166164.933316] do_sys_openat2+0x210/0x2d0 [166164.933318] do_sys_open+0x46/0x80 [166164.933320] __x64_sys_openat+0x20/0x30 [166164.933328] do_syscall_64+0x52/0xc0 [166164.933336] entry_SYSCALL_64_after_hwframe+0x44/0xa9 (gdb) disassemble drm_dp_aux_dev_get_by_minor+0x29 Dump of assembler code for function drm_dp_aux_dev_get_by_minor: 0x0000000000017b10 <+0>: callq 0x17b15 0x0000000000017b15 <+5>: push %rbp 0x0000000000017b16 <+6>: mov %rsp,%rbp 0x0000000000017b19 <+9>: push %r12 0x0000000000017b1b <+11>: mov %edi,%r12d 0x0000000000017b1e <+14>: mov $0x0,%rdi 0x0000000000017b25 <+21>: callq 0x17b2a 0x0000000000017b2a <+26>: mov %r12d,%esi 0x0000000000017b2d <+29>: mov $0x0,%rdi 0x0000000000017b34 <+36>: callq 0x17b39 0x0000000000017b39 <+41>: mov 0x18(%rax),%edx <========= 0x0000000000017b3c <+44>: mov %rax,%r12 0x0000000000017b3f <+47>: lea 0x18(%rax),%rdi 0x0000000000017b43 <+51>: test %edx,%edx 0x0000000000017b45 <+53>: je 0x17b7a 0x0000000000017b47 <+55>: lea 0x1(%rdx),%ecx 0x0000000000017b4a <+58>: mov %edx,%eax 0x0000000000017b4c <+60>: lock cmpxchg %ecx,(%rdi) 0x0000000000017b50 <+64>: jne 0x17b76 0x0000000000017b52 <+66>: test %edx,%edx 0x0000000000017b54 <+68>: js 0x17b6d 0x0000000000017b56 <+70>: test %ecx,%ecx 0x0000000000017b58 <+72>: js 0x17b6d 0x0000000000017b5a <+74>: mov $0x0,%rdi 0x0000000000017b61 <+81>: callq 0x17b66 0x0000000000017b66 <+86>: mov %r12,%rax 0x0000000000017b69 <+89>: pop %r12 0x0000000000017b6b <+91>: pop %rbp 0x0000000000017b6c <+92>: retq 0x0000000000017b6d <+93>: xor %esi,%esi 0x0000000000017b6f <+95>: callq 0x17b74 0x0000000000017b74 <+100>: jmp 0x17b5a 0x0000000000017b76 <+102>: mov %eax,%edx 0x0000000000017b78 <+104>: jmp 0x17b43 0x0000000000017b7a <+106>: xor %r12d,%r12d 0x0000000000017b7d <+109>: jmp 0x17b5a End of assembler dump. (gdb) list *drm_dp_aux_dev_get_by_minor+0x29 0x17b39 is in drm_dp_aux_dev_get_by_minor (drivers/gpu/drm/drm_dp_aux_dev.c:65). 60 static struct drm_dp_aux_dev *drm_dp_aux_dev_get_by_minor(unsigned index) 61 { 62 struct drm_dp_aux_dev *aux_dev = NULL; 63 64 mutex_lock(&aux_idr_mutex); 65 aux_dev = idr_find(&aux_idr, index); 66 if (!kref_get_unless_zero(&aux_dev->refcount)) 67 aux_dev = NULL; 68 mutex_unlock(&aux_idr_mutex); 69 (gdb) p/x &((struct drm_dp_aux_dev *)(0x0))->refcount $8 = 0x18 Looking at the caller, checks on the minor are pushed down to drm_dp_aux_dev_get_by_minor() static int auxdev_open(struct inode *inode, struct file *file) { unsigned int minor = iminor(inode); struct drm_dp_aux_dev *aux_dev; aux_dev = drm_dp_aux_dev_get_by_minor(minor); <==== if (!aux_dev) return -ENODEV; file->private_data = aux_dev; return 0; } Fixes: e94cb37b34eb8 ("Add a drm_aux-dev module for reading/writing dpcd registers") Cc: stable@vger.kernel.org Signed-off-by: Zwane Mwaikambo --- diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c index 2510717d5a08..e25181bf2c48 100644 --- a/drivers/gpu/drm/drm_dp_aux_dev.c +++ b/drivers/gpu/drm/drm_dp_aux_dev.c @@ -63,7 +63,7 @@ static struct drm_dp_aux_dev *drm_dp_aux_dev_get_by_minor(unsigned index) mutex_lock(&aux_idr_mutex); aux_dev = idr_find(&aux_idr, index); - if (!kref_get_unless_zero(&aux_dev->refcount)) + if (aux_dev && !kref_get_unless_zero(&aux_dev->refcount)) aux_dev = NULL; mutex_unlock(&aux_idr_mutex);