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

Commit 987c601c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: In case of memory allocation failure set buffers to null"

parents fd46f00f fafc6866

drivers/char/diag/diagfwd_peripheral.c

+6 −0
Original line number Diff line number Diff line
@@ -1091,13 +1091,19 @@ static void diagfwd_buffers_exit(struct diagfwd_info *fwd_info) 
	spin_lock_irqsave(&fwd_info->buf_lock, flags);

	if (fwd_info->buf_1) {

		kfree(fwd_info->buf_1->data);

		fwd_info->buf_1->data = NULL;

		kfree(fwd_info->buf_1->data_raw);

		fwd_info->buf_1->data_raw = NULL;

		kfree(fwd_info->buf_1);

		fwd_info->buf_1 = NULL;

	}

	if (fwd_info->buf_2) {

		kfree(fwd_info->buf_2->data);

		fwd_info->buf_2->data = NULL;

		kfree(fwd_info->buf_2->data_raw);

		fwd_info->buf_2->data_raw = NULL;

		kfree(fwd_info->buf_2);

		fwd_info->buf_2 = NULL;

	}

	spin_unlock_irqrestore(&fwd_info->buf_lock, flags);

}