summaryrefslogtreecommitdiffstats
path: root/net/qrtr
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-06-16 08:29:19 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-16 11:48:35 -0400
commitb080db585384b9f037e015c0c28d1ad33be41dfc (patch)
treeea9cc5c3161d776b948283a3d4f483cbf578e043 /net/qrtr
parent61f73d1ea4c68544b959228ead7ef5c021791b14 (diff)
networking: convert many more places to skb_put_zero()
There were many places that my previous spatch didn't find, as pointed out by yuan linyu in various patches. The following spatch found many more and also removes the now unnecessary casts: @@ identifier p, p2; expression len; expression skb; type t, t2; @@ ( -p = skb_put(skb, len); +p = skb_put_zero(skb, len); | -p = (t)skb_put(skb, len); +p = skb_put_zero(skb, len); ) ... when != p ( p2 = (t2)p; -memset(p2, 0, len); | -memset(p, 0, len); ) @@ type t, t2; identifier p, p2; expression skb; @@ t *p; ... ( -p = skb_put(skb, sizeof(t)); +p = skb_put_zero(skb, sizeof(t)); | -p = (t *)skb_put(skb, sizeof(t)); +p = skb_put_zero(skb, sizeof(t)); ) ... when != p ( p2 = (t2)p; -memset(p2, 0, sizeof(*p)); | -memset(p, 0, sizeof(*p)); ) @@ expression skb, len; @@ -memset(skb_put(skb, len), 0, len); +skb_put_zero(skb, len); Apply it to the tree (with one manual fixup to keep the comment in vxlan.c, which spatch removed.) Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/qrtr')
-rw-r--r--net/qrtr/qrtr.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index c7a5d861906b..825f97671591 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -285,8 +285,7 @@ static struct sk_buff *qrtr_alloc_resume_tx(u32 src_node,
285 if (!skb) 285 if (!skb)
286 return NULL; 286 return NULL;
287 287
288 buf = (__le32 *)skb_put(skb, pkt_len); 288 buf = skb_put_zero(skb, pkt_len);
289 memset(buf, 0, pkt_len);
290 buf[0] = cpu_to_le32(QRTR_TYPE_RESUME_TX); 289 buf[0] = cpu_to_le32(QRTR_TYPE_RESUME_TX);
291 buf[1] = cpu_to_le32(src_node); 290 buf[1] = cpu_to_le32(src_node);
292 buf[2] = cpu_to_le32(port); 291 buf[2] = cpu_to_le32(port);
@@ -306,8 +305,7 @@ static struct sk_buff *qrtr_alloc_local_bye(u32 src_node)
306 if (!skb) 305 if (!skb)
307 return NULL; 306 return NULL;
308 307
309 buf = (__le32 *)skb_put(skb, pkt_len); 308 buf = skb_put_zero(skb, pkt_len);
310 memset(buf, 0, pkt_len);
311 buf[0] = cpu_to_le32(QRTR_TYPE_BYE); 309 buf[0] = cpu_to_le32(QRTR_TYPE_BYE);
312 310
313 return skb; 311 return skb;
@@ -324,8 +322,7 @@ static struct sk_buff *qrtr_alloc_del_client(struct sockaddr_qrtr *sq)
324 if (!skb) 322 if (!skb)
325 return NULL; 323 return NULL;
326 324
327 buf = (__le32 *)skb_put(skb, pkt_len); 325 buf = skb_put_zero(skb, pkt_len);
328 memset(buf, 0, pkt_len);
329 buf[0] = cpu_to_le32(QRTR_TYPE_DEL_CLIENT); 326 buf[0] = cpu_to_le32(QRTR_TYPE_DEL_CLIENT);
330 buf[1] = cpu_to_le32(sq->sq_node); 327 buf[1] = cpu_to_le32(sq->sq_node);
331 buf[2] = cpu_to_le32(sq->sq_port); 328 buf[2] = cpu_to_le32(sq->sq_port);