Commit 82a10526 authored by Atul Gupta's avatar Atul Gupta Committed by David S. Miller

crypto: chtls: kbuild warnings

- unindented continue
- check for null page
- signed return
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAtul Gupta <atul.gupta@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53bcfb68
...@@ -907,11 +907,11 @@ static int chtls_skb_copy_to_page_nocache(struct sock *sk, ...@@ -907,11 +907,11 @@ static int chtls_skb_copy_to_page_nocache(struct sock *sk,
} }
/* Read TLS header to find content type and data length */ /* Read TLS header to find content type and data length */
static u16 tls_header_read(struct tls_hdr *thdr, struct iov_iter *from) static int tls_header_read(struct tls_hdr *thdr, struct iov_iter *from)
{ {
if (copy_from_iter(thdr, sizeof(*thdr), from) != sizeof(*thdr)) if (copy_from_iter(thdr, sizeof(*thdr), from) != sizeof(*thdr))
return -EFAULT; return -EFAULT;
return (__force u16)cpu_to_be16(thdr->length); return (__force int)cpu_to_be16(thdr->length);
} }
static int csk_mem_free(struct chtls_dev *cdev, struct sock *sk) static int csk_mem_free(struct chtls_dev *cdev, struct sock *sk)
...@@ -1083,9 +1083,10 @@ int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) ...@@ -1083,9 +1083,10 @@ int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
int off = TCP_OFF(sk); int off = TCP_OFF(sk);
bool merge; bool merge;
if (page) if (!page)
pg_size <<= compound_order(page); goto wait_for_memory;
pg_size <<= compound_order(page);
if (off < pg_size && if (off < pg_size &&
skb_can_coalesce(skb, i, page, off)) { skb_can_coalesce(skb, i, page, off)) {
merge = 1; merge = 1;
...@@ -1492,7 +1493,7 @@ static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, ...@@ -1492,7 +1493,7 @@ static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
break; break;
chtls_cleanup_rbuf(sk, copied); chtls_cleanup_rbuf(sk, copied);
sk_wait_data(sk, &timeo, NULL); sk_wait_data(sk, &timeo, NULL);
continue; continue;
found_ok_skb: found_ok_skb:
if (!skb->len) { if (!skb->len) {
skb_dst_set(skb, NULL); skb_dst_set(skb, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment