aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/drbd.h
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2016-06-14 00:26:39 +0200
committerJens Axboe <axboe@fb.com>2016-06-13 21:43:08 -0600
commit1b57e66384e2d21150301e68078526fac5680a16 (patch)
tree3af5073c4650026854b1af1af191ac9f22ec6464 /include/linux/drbd.h
parentdrbd: al_write_transaction: skip re-scanning of bitmap page pointer array (diff)
downloadlinux-dev-1b57e66384e2d21150301e68078526fac5680a16.tar.xz
linux-dev-1b57e66384e2d21150301e68078526fac5680a16.zip
drbd: correctly handle failed crypto_alloc_hash
crypto_alloc_hash returns an ERR_PTR(), not NULL. Also reset peer_integrity_tfm to NULL, to not call crypto_free_hash() on an errno in the cleanup path. Reported-by: Insu Yun <wuninsu@gmail.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/drbd.h')
-rw-r--r--include/linux/drbd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 2b26156365ec..002611c85318 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -51,7 +51,7 @@
#endif
extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.4.6"
+#define REL_VERSION "8.4.7"
#define API_VERSION 1
#define PRO_VERSION_MIN 86
#define PRO_VERSION_MAX 101