diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2010-09-22 00:13:55 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2010-09-22 00:13:55 +0000 |
| commit | c5da67f0a2cc72fc2b88676d0805b16d16000fb3 (patch) | |
| tree | debb8dfed66d705c352f6663c2ca1c1ee85462e3 /sys/dev/sysmon | |
| parent | 38b9dc35057cb4ecfe3ac252433ddbb9da6b8d73 (diff) | |
1. Don't try to call the driver's get_limits routine if it doesn't have
one. Fixes a panic reported by njoly@ in private Email
2. Acquire the device before checking whether or not the get_limits
routine exists.
XXX There's still a bug in here somewhere that prevents setting of
XXX limit values after using 'envstat -S'
Diffstat (limited to 'sys/dev/sysmon')
| -rw-r--r-- | sys/dev/sysmon/sysmon_envsys_events.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/sysmon/sysmon_envsys_events.c b/sys/dev/sysmon/sysmon_envsys_events.c index f29188a3ab9..56c8167134b 100644 --- a/sys/dev/sysmon/sysmon_envsys_events.c +++ b/sys/dev/sysmon/sysmon_envsys_events.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_envsys_events.c,v 1.92 2010/04/10 19:01:01 pgoyette Exp $ */ +/* $NetBSD: sysmon_envsys_events.c,v 1.93 2010/09/22 00:13:55 pgoyette Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.92 2010/04/10 19:01:01 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.93 2010/09/22 00:13:55 pgoyette Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -546,12 +546,12 @@ sysmon_envsys_update_limits(struct sysmon_envsys *sme, envsys_data_t *edata) { int err; + sysmon_envsys_acquire(sme, false); if (sme->sme_get_limits == NULL || (edata->flags & ENVSYS_FMONLIMITS) == 0) - return EINVAL; - - sysmon_envsys_acquire(sme, false); - err = sme_update_limits(sme, edata); + err = EINVAL; + else + err = sme_update_limits(sme, edata); sysmon_envsys_release(sme, false); return err; @@ -595,8 +595,9 @@ sme_update_limits(struct sysmon_envsys *sme, envsys_data_t *edata) if (see == NULL) return EINVAL; - /* Get new limit values */ - (*sme->sme_get_limits)(sme, edata, &lims, &props); + /* Update limit values from driver if possible */ + if (sme->sme_get_limits != NULL) + (*sme->sme_get_limits)(sme, edata, &lims, &props); /* Update event and dictionary */ sme_event_register(sdict, edata, sme, &lims, props, |
