From patchwork Thu Feb 14 21:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 1042429 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="ZqkjYffu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 440qSw4VySz9s5c for ; Fri, 15 Feb 2019 08:36:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440241AbfBNVf6 (ORCPT ); Thu, 14 Feb 2019 16:35:58 -0500 Received: from mail-qk1-f201.google.com ([209.85.222.201]:50034 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436452AbfBNVf5 (ORCPT ); Thu, 14 Feb 2019 16:35:57 -0500 Received: by mail-qk1-f201.google.com with SMTP id s65so6351478qke.16 for ; Thu, 14 Feb 2019 13:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ZJKVOROAqxbPWftJYcU/V/O0QBycg+G8Fp9kj8r2ZZw=; b=ZqkjYffuz38mym6TnJb/NKHXUqJVOzBvJA5tzEzuM9XdoUdr4tAAqEnUf7zlVjQrId s5JaU+FY2VK0JrRsd7sR4CpBzlr21rd4V8lNi7dmCW4mGwQqiCkkOelwRgg1cJjDfLyt w+FpgOj6Q6HuzNCRjq0yChXgDvfKxdh0IV5vJWr9Z8QhwXkNGAVcgin7tpH0VbCxTGkB QHoZQlnfqhcMBaTvNOmQ9CzGkaREY0Lhj3el4+To6MxYUx5tulXr4NDoOjBoGlIKOrV3 gsrm/B2BeoeryEgQVxssOPv51BXnuee8jWxJ0DVeq10cUvtv5xD4XvYn6Tn+sbbuGiJZ tR7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ZJKVOROAqxbPWftJYcU/V/O0QBycg+G8Fp9kj8r2ZZw=; b=qZ0qmbtC+5uNLHfcVjm4z4hptWhFo9kbsNpVsIltQqMCatzmwumxQX8Sa6e28jSo42 IYQGOrRk1KVxWLwJ888zJRU/xz7JzNy1GCV0nwQgp0VTIH7u8HhwRECrAnsYtGaHpyAt dm0lwud8IXS+9F05Ba4AUnRZeUWyFPVnWuOElhDPDbo27BUy+Z9gYrnkfnKZq1yaoOSS k3oRNyQf/3ckaai2c0gq9JjdgUtupHk/G9uLj+uWvu6cY+klCg8uApBQfSmKTtOauSiE LzxGJA4+DLQ7ESHPiEedqUnNo15RZFWULH79Dz71BUzGZLcGM92d8W900fNOKbErr5IR IyYw== X-Gm-Message-State: AHQUAubdvaYVyc+/4tVFwifGdbMRnGc/zzPrNSuMsuouoEMnuRL+yXk/ 2zu1LHqra4Ok6aj2fMeGQNIJLmpNfQ== X-Google-Smtp-Source: AHgI3IYx8Cg4jj7bu4WuQr+13fifBGfXGwHZjCDpAY0pNWPkb0Fte3V57tWUA/q92JTY2oJ+4MkB5GQKHw== X-Received: by 2002:ac8:3077:: with SMTP id g52mr3619811qte.4.1550180156781; Thu, 14 Feb 2019 13:35:56 -0800 (PST) Date: Thu, 14 Feb 2019 22:35:47 +0100 Message-Id: <20190214213547.41783-1-jannh@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog Subject: [PATCH net-next] net: caif: use skb helpers instead of open-coding them From: Jann Horn To: "David S. Miller" , Dmitry Tarnyagin , jannh@google.com Cc: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use existing skb_put_data() and skb_trim() instead of open-coding them, with the skb_put_data() first so that logically, `skb` still contains the data to be copied in its data..tail area when skb_put_data() reads it. This change on its own is a cleanup, and it is also necessary for potential future integration of skbuffs with things like KASAN. Signed-off-by: Jann Horn --- net/caif/cfpkt_skbuff.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c index 38c2b7a890dd..37ac5ca0ffdf 100644 --- a/net/caif/cfpkt_skbuff.c +++ b/net/caif/cfpkt_skbuff.c @@ -319,16 +319,12 @@ struct cfpkt *cfpkt_append(struct cfpkt *dstpkt, if (tmppkt == NULL) return NULL; tmp = pkt_to_skb(tmppkt); - skb_set_tail_pointer(tmp, dstlen); - tmp->len = dstlen; - memcpy(tmp->data, dst->data, dstlen); + skb_put_data(tmp, dst->data, dstlen); cfpkt_destroy(dstpkt); dst = tmp; } - memcpy(skb_tail_pointer(dst), add->data, skb_headlen(add)); + skb_put_data(dst, add->data, skb_headlen(add)); cfpkt_destroy(addpkt); - dst->tail += addlen; - dst->len += addlen; return skb_to_pkt(dst); } @@ -359,13 +355,11 @@ struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos) if (skb2 == NULL) return NULL; + skb_put_data(skb2, split, len2nd); + /* Reduce the length of the original packet */ - skb_set_tail_pointer(skb, pos); - skb->len = pos; + skb_trim(skb, pos); - memcpy(skb2->data, split, len2nd); - skb2->tail += len2nd; - skb2->len += len2nd; skb2->priority = skb->priority; return skb_to_pkt(skb2); }