Sun Apr 21 03:02:39 2024 UTC (18d)
drm(4): Fix st_rdev in stat.

dminor->index already has the 64*type adjustment, as allocated in
drm_minor_alloc.

PR kern/58180


(riastradh)
diff -r1.30 -r1.31 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs diff -r1.30 -r1.31 src/sys/external/bsd/drm2/drm/drm_cdevsw.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c 2022/07/06 01:12:45 1.30
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c 2024/04/21 03:02:39 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: drm_cdevsw.c,v 1.30 2022/07/06 01:12:45 riastradh Exp $ */ 1/* $NetBSD: drm_cdevsw.c,v 1.31 2024/04/21 03:02:39 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.30 2022/07/06 01:12:45 riastradh Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.31 2024/04/21 03:02:39 riastradh Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/types.h> 36#include <sys/types.h>
37#include <sys/conf.h> 37#include <sys/conf.h>
38#include <sys/device.h> 38#include <sys/device.h>
39#include <sys/file.h> 39#include <sys/file.h>
40#include <sys/filedesc.h> 40#include <sys/filedesc.h>
41#include <sys/ioccom.h> 41#include <sys/ioccom.h>
42#include <sys/kauth.h> 42#include <sys/kauth.h>
43#ifndef _MODULE 43#ifndef _MODULE
44/* XXX Mega-kludge because modules are broken. */ 44/* XXX Mega-kludge because modules are broken. */
45#include <sys/once.h> 45#include <sys/once.h>
46#endif 46#endif
@@ -486,27 +486,27 @@ filt_drm_event(struct knote *kn, long hi @@ -486,27 +486,27 @@ filt_drm_event(struct knote *kn, long hi
486 KASSERT(spin_is_locked(&dev->event_lock)); 486 KASSERT(spin_is_locked(&dev->event_lock));
487 else 487 else
488 spin_unlock_irqrestore(&dev->event_lock, irqflags); 488 spin_unlock_irqrestore(&dev->event_lock, irqflags);
489 489
490 return ret; 490 return ret;
491} 491}
492 492
493static int 493static int
494drm_stat(struct file *fp, struct stat *st) 494drm_stat(struct file *fp, struct stat *st)
495{ 495{
496 struct drm_file *const file = fp->f_data; 496 struct drm_file *const file = fp->f_data;
497 struct drm_minor *const dminor = file->minor; 497 struct drm_minor *const dminor = file->minor;
498 const dev_t devno = makedev(cdevsw_lookup_major(&drm_cdevsw), 498 const dev_t devno = makedev(cdevsw_lookup_major(&drm_cdevsw),
499 64*dminor->type + dminor->index); 499 dminor->index);
500 500
501 (void)memset(st, 0, sizeof(*st)); 501 (void)memset(st, 0, sizeof(*st));
502 502
503 st->st_dev = devno; 503 st->st_dev = devno;
504 st->st_ino = 0; /* XXX (dev,ino) uniqueness bleh */ 504 st->st_ino = 0; /* XXX (dev,ino) uniqueness bleh */
505 st->st_uid = kauth_cred_geteuid(fp->f_cred); 505 st->st_uid = kauth_cred_geteuid(fp->f_cred);
506 st->st_gid = kauth_cred_getegid(fp->f_cred); 506 st->st_gid = kauth_cred_getegid(fp->f_cred);
507 st->st_mode = S_IFCHR; /* XXX what? */ 507 st->st_mode = S_IFCHR; /* XXX what? */
508 st->st_rdev = devno; 508 st->st_rdev = devno;
509 /* XXX what else? */ 509 /* XXX what else? */
510 510
511 return 0; 511 return 0;
512} 512}