marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: send-stream: use proper types for tlv header values 

Switch types to unsigned and adjust the checks.

Signed-off-by: David Sterba <dsterba@suse.com>
master
David Sterba 2016-11-15 14:52:03 +01:00
parent d13168cebf
commit 4c06613842
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
send-stream.c
View File

@ -74,11 +74,8 @@ static int read_cmd(struct btrfs_send_stream *sctx)
int ret;
int cmd;
u32 cmd_len;
int tlv_type;
int tlv_len;
char *data;
u32 pos;
struct btrfs_tlv_header *tlv_hdr;
u32 crc;
u32 crc2;
@ -129,13 +126,17 @@ static int read_cmd(struct btrfs_send_stream *sctx)
pos = 0;
while (pos < cmd_len) {
struct btrfs_tlv_header *tlv_hdr;
u16 tlv_type;
u16 tlv_len;
tlv_hdr = (struct btrfs_tlv_header *)data;
tlv_type = le16_to_cpu(tlv_hdr->tlv_type);
tlv_len = le16_to_cpu(tlv_hdr->tlv_len);
if (tlv_type <= 0 || tlv_type > BTRFS_SEND_A_MAX ||
tlv_len < 0 || tlv_len > BTRFS_SEND_BUF_SIZE) {
error("invalid tlv in cmd tlv_type = %d, tlv_len = %d",
if (tlv_type == 0 || tlv_type > BTRFS_SEND_A_MAX
|| tlv_len > BTRFS_SEND_BUF_SIZE) {
error("invalid tlv in cmd tlv_type = %hu, tlv_len = %hu",
tlv_type, tlv_len);
ret = -EINVAL;
goto out;