Skip to content

Commit

Permalink
OpenZFS 8375 - Kernel memory leak in nvpair code
Browse files Browse the repository at this point in the history
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Prashanth Sreenivasa <pks@delphix.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Reviewed-by: Don Brady <dev.fs.zfs@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>

OpenZFS-issue: https://www.illumos.org/issues/8375
OpenZFS-commit: openzfs/openzfs@843c211
Closes #6578
  • Loading branch information
ahrens authored and behlendorf committed Aug 30, 2017
1 parent 1ea8942 commit 006309e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions module/nvpair/nvpair.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

/*
* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2016 by Delphix. All rights reserved.
* Copyright (c) 2015, 2017 by Delphix. All rights reserved.
*/

#include <sys/stropts.h>
Expand Down Expand Up @@ -2200,8 +2200,10 @@ nvs_embedded(nvstream_t *nvs, nvlist_t *embedded)

nvlist_init(embedded, embedded->nvl_nvflag, priv);

if (nvs->nvs_recursion >= nvpair_max_recursion)
if (nvs->nvs_recursion >= nvpair_max_recursion) {
nvlist_free(embedded);
return (EINVAL);
}
nvs->nvs_recursion++;
if ((err = nvs_operation(nvs, embedded, NULL)) != 0)
nvlist_free(embedded);
Expand Down

0 comments on commit 006309e

Please sign in to comment.