3 files changed, 11 insertions, 13 deletions

diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
index f99cfce7ca97..c3126e864f3c 100644
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -195,7 +195,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
                 sp = rxrpc_skb(txb);
 
                 if (sp->need_resend) {
-                        sp->need_resend = 0;
+                        sp->need_resend = false;
 
                         /* each Tx packet has a new serial number */
                         sp->hdr.serial =
@@ -216,7 +216,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
                 }
 
                 if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         resend |= 1;
                 } else if (resend & 2) {
                         if (time_before(sp->resend_at, resend_at))
@@ -265,7 +265,7 @@ static void rxrpc_resend_timer(struct rxrpc_call *call)
                 if (sp->need_resend) {
                         ;
                 } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         resend |= 1;
                 } else if (resend & 2) {
                         if (time_before(sp->resend_at, resend_at))
@@ -314,11 +314,11 @@ static int rxrpc_process_soft_ACKs(struct rxrpc_call *call,
 
                 switch (sacks[loop]) {
                 case RXRPC_ACK_TYPE_ACK:
-                        sp->need_resend = 0;
+                        sp->need_resend = false;
                         *p_txb |= 1;
                         break;
                 case RXRPC_ACK_TYPE_NACK:
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         *p_txb &= ~1;
                         resend = 1;
                         break;
@@ -344,13 +344,13 @@ static int rxrpc_process_soft_ACKs(struct rxrpc_call *call,
 
                 if (*p_txb & 1) {
                         /* packet must have been discarded */
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         *p_txb &= ~1;
                         resend |= 1;
                 } else if (sp->need_resend) {
                         ;
                 } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                        sp->need_resend = 1;
+                        sp->need_resend = true;
                         resend |= 1;
                 } else if (resend & 2) {
                         if (time_before(sp->resend_at, resend_at))
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
index 43ea7de2fc8e..4cba13e46ffd 100644
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
@@ -306,10 +306,9 @@ static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td,
         td->data_len = len;
 
         if (len > 0) {
-                td->data = kmalloc(len, GFP_KERNEL);
+                td->data = kmemdup(xdr, len, GFP_KERNEL);
                 if (!td->data)
                         return -ENOMEM;
-                memcpy(td->data, xdr, len);
                 len = (len + 3) & ~3;
                 toklen -= len;
                 xdr += len >> 2;
@@ -401,10 +400,9 @@ static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
         _debug("ticket len %u", len);
 
         if (len > 0) {
-                *_ticket = kmalloc(len, GFP_KERNEL);
+                *_ticket = kmemdup(xdr, len, GFP_KERNEL);
                 if (!*_ticket)
                         return -ENOMEM;
-                memcpy(*_ticket, xdr, len);
                 len = (len + 3) & ~3;
                 toklen -= len;
                 xdr += len >> 2;
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 338d793c7113..16ae88762d00 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -486,7 +486,7 @@ static void rxrpc_queue_packet(struct rxrpc_call *call, struct sk_buff *skb,
         _proto("Tx DATA %%%u { #%u }",
                ntohl(sp->hdr.serial), ntohl(sp->hdr.seq));
 
-        sp->need_resend = 0;
+        sp->need_resend = false;
         sp->resend_at = jiffies + rxrpc_resend_timeout * HZ;
         if (!test_and_set_bit(RXRPC_CALL_RUN_RTIMER, &call->flags)) {
                 _debug("run timer");
@@ -508,7 +508,7 @@ static void rxrpc_queue_packet(struct rxrpc_call *call, struct sk_buff *skb,
 
         if (ret < 0) {
                 _debug("need instant resend %d", ret);
-                sp->need_resend = 1;
+                sp->need_resend = true;
                 rxrpc_instant_resend(call);
         }