Unverified Commit 48be9833 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7486 [sync] PR-7476: firewire: nosy: ensure user_length is taken into... 

!7486 [sync] PR-7476:  firewire: nosy: ensure user_length is taken into account when fetching packet contents

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7476 
 
PR sync from: Hongbo Li <lihongbo22@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7RDG5E32OBCXHLWRAY7GNDPWBOKQFPLS/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9OZA3 
 
Link:https://gitee.com/openeuler/kernel/pulls/7486

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents de595b1b 0dde91a7

drivers/firewire/nosy.c

+4 −2
Original line number Diff line number Diff line
@@ -148,10 +148,12 @@ packet_buffer_get(struct client *client, char __user *data, size_t user_length) 
	if (atomic_read(&buffer->size) == 0)

		return -ENODEV;



	/* FIXME: Check length <= user_length. */

	length = buffer->head->length;



	if (length > user_length)

		return 0;



	end = buffer->data + buffer->capacity;

	length = buffer->head->length;



	if (&buffer->head->data[length] < end) {

		if (copy_to_user(data, buffer->head->data, length))