From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751081AbdLaVaZ (ORCPT ); Sun, 31 Dec 2017 16:30:25 -0500 Received: from mout.web.de ([212.227.15.4]:49806 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750854AbdLaVaX (ORCPT ); Sun, 31 Dec 2017 16:30:23 -0500 To: netdev@vger.kernel.org, linux-ppp@vger.kernel.org, Paul Mackerras Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] ppp: Delete an error message for a failed memory allocation in three functions Message-ID: <303ae3e8-f86e-1ed5-6d63-a966aa8b0552@users.sourceforge.net> Date: Sun, 31 Dec 2017 22:30:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Fxaut2siODD2B5CMEKGlJIHV81SoUJmMRP0K3RC4FUHy5Oq+ket /MetTvIvLvhoHGoBT+c/oK2c7aoNqhSKK+PAphd5wm0erk8zYyURTqiSGSiVTRTg5WjfO1X QNTymS7peLosjBGgzrlLowV8tJ+PTzUU5Qg/wwnQLFeEY4J+l2C1OjUlS3+CYsXRrHkNfE2 4QoCdYal0ehp/KmnYCizQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:GBG0abQ5/EI=:DOgjfpG4ZYXMbH8pU7wRDf LNycCdlVv7qyX/OIWj+3MiNxsATxdev0Xd6Lcpum5DHPyOPSrHRLItpblwFrrrfrV6oWBM9Ml xh+z8EYK68KVVZRk1RX7nBoK6NpSBqn/KxA1bM6bQ0Lgg5UA5hEpRD0JLQ18r3y+KLCMuA3op IuBCIedK0A8jCt1gXJTO92WWRYJx5skQjwxE4pK7Gw/QzhiT2F8ID3H3KLfZuc92f/K6CsHuU Qyex26TKNZP6kS4sh3Chhdjv+bd0ZVM7dBcCGhlfXX3MadmVMe6zx/0/jVoz/vwNb8eQCXQ5r 5zd0aq3n2y5FecLtMdOqM+QIV8h8ULnxSWXB/k1LT/UZt+k81pnNZ2tDr0tJ9dyycGeEfmotS MTZvuZCqqZfFKdA5vVUkUL9YrZhcKtRTXF3ZdqbxCAlkTj8cXBxxOX24wkpQmDHBS15Wk7UaL K5IgIijYMLW2OhYJLUDoZCuX8q369NTiF15w51S+5xSpuqo4hHdz9Im95c2z1ow9y378KbSPx OTGQMihXtym8Nh7eg9mh2q62s0h0wxte7abzlJuUvtseROI9bFl+X9Vo+7+8ACOP0YW+1vIxj ZH9JICa8PODaY1FfAlCwGhoiN6FUZ8m9kJeRbMu4onlyROJZcnDCcs4Hqz5a9zKfs4lPw5t41 vXpdZbu54fCthQ6A9NB0QdqdyWZ0zksPjV10MuJSSfc6QXfmxnBEZ0rCyBQ6dJ2i02HLCAAeU xnWP+JPRnjvEyeNXky37PyJqpKH9mcCHbY8NfJFQI2bLpAgOIzSxpG3ASY5tITltJvlK8SRCt fzsH5bgCqXAFusSHO1RFnfevj/k7S4No+ijaJYWjYnOjwXlI7A= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 31 Dec 2017 22:27:23 +0100 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/ppp/ppp_generic.c | 12 ++++-------- drivers/net/ppp/ppp_synctty.c | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index d8e5747ff4e3..d9119dcaa04e 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -2098,11 +2098,9 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb) if (skb_tailroom(skb) < 124 || skb_cloned(skb)) { /* copy to a new sk_buff with more tailroom */ ns = dev_alloc_skb(skb->len + 128); - if (!ns) { - netdev_err(ppp->dev, "PPP: no memory " - "(VJ decomp)\n"); + if (!ns) goto err; - } + skb_reserve(ns, 2); skb_copy_bits(skb, 0, skb_put(ns, skb->len), skb->len); consume_skb(skb); @@ -2237,11 +2235,9 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb) } ns = dev_alloc_skb(obuff_size); - if (!ns) { - netdev_err(ppp->dev, "ppp_decompress_frame: " - "no memory\n"); + if (!ns) goto err; - } + /* the decompressor still expects the A/C bytes in the hdr */ len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2, skb->len + 2, ns->data, obuff_size); diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c index 7196f00f0991..f801e5218170 100644 --- a/drivers/net/ppp/ppp_synctty.c +++ b/drivers/net/ppp/ppp_synctty.c @@ -682,10 +682,9 @@ ppp_sync_input(struct syncppp *ap, const unsigned char *buf, /* stuff the chars in the skb */ skb = dev_alloc_skb(ap->mru + PPP_HDRLEN + 2); - if (!skb) { - printk(KERN_ERR "PPPsync: no memory (input pkt)\n"); + if (!skb) goto err; - } + /* Try to get the payload 4-byte aligned */ if (buf[0] != PPP_ALLSTATIONS) skb_reserve(skb, 2 + (buf[0] & 1)); -- 2.15.1