diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-08 14:16:48 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-11-08 14:16:48 +0000 |
| commit | 4351df24a18fd73b1e6cc2591e622883e502167c (patch) | |
| tree | 055eea240497456740e6f737bef63765ed7a6574 /usr/src/uts/intel/io | |
| parent | faabb223a29c66e258a2c067cb14888c51ba6f47 (diff) | |
| parent | 42cd19316c818c8b8283fc48263a1b4ce99cf049 (diff) | |
| download | illumos-joyent-4351df24a18fd73b1e6cc2591e622883e502167c.tar.gz | |
[illumos-gate merge]
commit 42cd19316c818c8b8283fc48263a1b4ce99cf049
11859 need swapgs mitigation
commit ad3e6d4dd82f2e18743399134a4b99cf303478f6
11880 changing encryption key on dataset with unencrypted children triggers VERIFY
commit 249622b3e0d46f0016d00e3f87b314635d11065a
11929 mac_minor_hold() gets id_alloc_nosleep() wrong
commit 1c085a54d061bc17f8b209d1ea6161fcdf66d971
3334 zonestat missing man page
commit 327c8d1665439dd2540c1b460773bd9f0c1c0fa9
11792 ibtl: cast between incompatible function types
commit 22f89f96cd7b45b9686231ed7d98e610077df6c6
11922 ipmi_open looks for wrong return value
Diffstat (limited to 'usr/src/uts/intel/io')
| -rw-r--r-- | usr/src/uts/intel/io/ipmi/ipmi_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/intel/io/ipmi/ipmi_main.c b/usr/src/uts/intel/io/ipmi/ipmi_main.c index 8b25829d2b..e7671ce734 100644 --- a/usr/src/uts/intel/io/ipmi/ipmi_main.c +++ b/usr/src/uts/intel/io/ipmi/ipmi_main.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2017 Joyent, Inc. + * Copyright 2019 Joyent, Inc. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ @@ -151,6 +151,7 @@ ipmi_open(dev_t *devp, int flag, int otyp, cred_t *cred) { minor_t minor; ipmi_device_t *dev; + id_t mid; if (ipmi_attached == B_FALSE) return (ENXIO); @@ -162,8 +163,9 @@ ipmi_open(dev_t *devp, int flag, int otyp, cred_t *cred) if (flag & FEXCL) return (ENOTSUP); - if ((minor = (minor_t)id_alloc_nosleep(minor_ids)) == 0) + if ((mid = id_alloc_nosleep(minor_ids)) == -1) return (ENODEV); + minor = (minor_t)mid; /* Initialize the per file descriptor data. */ dev = kmem_zalloc(sizeof (ipmi_device_t), KM_SLEEP); |