Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b57e663 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe
Browse files

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: default avatarInsu Yun <wuninsu@gmail.com>

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 27ea1d87

drivers/block/drbd/drbd_receiver.c

+2 −1
Original line number Diff line number Diff line
@@ -3681,7 +3681,8 @@ static int receive_protocol(struct drbd_connection *connection, struct packet_in 
		 */



		peer_integrity_tfm = crypto_alloc_ahash(integrity_alg, 0, CRYPTO_ALG_ASYNC);

		if (!peer_integrity_tfm) {

		if (IS_ERR(peer_integrity_tfm)) {

			peer_integrity_tfm = NULL;

			drbd_err(connection, "peer data-integrity-alg %s not supported\n",

				 integrity_alg);

			goto disconnect;

include/linux/drbd.h

+1 −1
Original line number Diff line number Diff line
@@ -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