Received: by 10.223.185.116 with SMTP id b49csp1062139wrg; Fri, 23 Feb 2018 11:13:15 -0800 (PST) X-Google-Smtp-Source: AH8x2257zhUbva0yBNdvPlnE2d1R1bpyLCDML6iCKXNr10vONOoTNF/11HDsUYKydQKHsMjxqFcc X-Received: by 2002:a17:902:8541:: with SMTP id d1-v6mr2624499plo.54.1519413195348; Fri, 23 Feb 2018 11:13:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413195; cv=none; d=google.com; s=arc-20160816; b=VxK2cc5slOlXpRAVmTs8uhjZI+UxpXAnMBfGCDuHCEY6CsoPVt89TMxsfHXKYkQhOy s4RYCCxUhN5gW6yg1/76X7FQkk6F7uGAJ2vIoQWTmJ8U/Ju7+VrXT3qlYIpYsrtR4rgF soCa2IguZt0jBJAAqZ2FXpzcj+qxciXYm3AD6lxOh6CAcU+xXSaGHNRWLBaxJvB+N/pa NwXlz/ntGwbL1yOgsrB14ScEQ/HwSwnmUGniKukxlPr9dE3Yl+/XAy8JRLNHLVOavwN3 BNfqvFrSzkhi5sqDFCkJjvJq2xRk554OsM4YCeEdA4KbPocwnOPxREJJbFeIVzt1fxf2 3eYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=I2Pj2Vfpcu+sncBPg1+/ANQjpCnjdznQfA+/TuP6jGE=; b=LG2Fi5TMQmvgiN8bp9JtT7tUsXyqHeU+ggga5QgANO/jKjYkpvukjE8ZI5dlFyWIN2 O9bIy50wDUVQaxvBUeFI+kam6wuptHEAiuy1vQgpE8PdpHveyCgmVZksNjXLUQpXUAex w5MNSn3r85aZDI8Emg6p9K48jSAN95LHJyP0QJ1cEJmYVkZ2/2M906WMTrWWDfemNCA5 YgIXMEabclHgh2i0TVZMhybqG1ENJ0Z/oWeHOdEXhrxLIIh31v8GEcZ/4BJPbLJKpcLD aEgiIZ7ues2e/EAZ4c0AKsQGA1ygnds5ysuC7CTSIjUlzwOx1hwMFnGabVKjYnpLNGtL uZmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si1859955pgn.439.2018.02.23.11.13.00; Fri, 23 Feb 2018 11:13:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754445AbeBWS4Z (ORCPT + 99 others); Fri, 23 Feb 2018 13:56:25 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:48710 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752915AbeBWS4W (ORCPT ); Fri, 23 Feb 2018 13:56:22 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id DC7091257; Fri, 23 Feb 2018 18:56:20 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Subash Abhinov Kasiviswanathan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 116/159] net: qualcomm: rmnet: Fix leak on transmit failure Date: Fri, 23 Feb 2018 19:27:04 +0100 Message-Id: <20180223170757.353074376@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Subash Abhinov Kasiviswanathan [ Upstream commit c20a548792f15f8d8e38cd74356301c6db0d241f ] If a skb in transmit path does not have sufficient headroom to add the map header, the skb is not sent out and is never freed. Fixes: ceed73a2cf4a ("drivers: net: ethernet: qualcomm: rmnet: Initial implementation") Signed-off-by: Subash Abhinov Kasiviswanathan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c @@ -166,12 +166,12 @@ static int rmnet_map_egress_handler(stru if (skb_headroom(skb) < required_headroom) { if (pskb_expand_head(skb, required_headroom, 0, GFP_KERNEL)) - return RMNET_MAP_CONSUMED; + goto fail; } map_header = rmnet_map_add_map_header(skb, additional_header_len, 0); if (!map_header) - return RMNET_MAP_CONSUMED; + goto fail; if (port->egress_data_format & RMNET_EGRESS_FORMAT_MUXING) { if (ep->mux_id == 0xff) @@ -183,6 +183,10 @@ static int rmnet_map_egress_handler(stru skb->protocol = htons(ETH_P_MAP); return RMNET_MAP_SUCCESS; + +fail: + kfree_skb(skb); + return RMNET_MAP_CONSUMED; } /* Ingress / Egress Entry Points */