From patchwork Fri May 18 07:58:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 916106 X-Patchwork-Delegate: bpf@iogearbox.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=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="PbPpfyv/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40nLCV6hxTz9s0y for ; Fri, 18 May 2018 17:58:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751446AbeERH6o (ORCPT ); Fri, 18 May 2018 03:58:44 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:44238 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbeERH6n (ORCPT ); Fri, 18 May 2018 03:58:43 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w4I7tqAV158309; Fri, 18 May 2018 07:58:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2017-10-26; bh=E+oC60K2GqpmbRYp/DlTaxB12WkDNTASVdgKgUvIpNM=; b=PbPpfyv//psvtXuUVQLnjtPxaDRpHfuHioaCLIgMBhJwtxSEsveBLX1ftuDoDTnyeQRs I65AMOfBEM2vdh8tYizlowIK+OtO6QaZnqWwe2l+94Jw2on7pHAR1DjGjOo4C4l2lmQx gdlo7xFJN3NiZq8YHH7CPsldLLCpXfJqYAkjE0NzVtsVXtj/SimwcF2otzdIhUSKkt3O qq+yI/zYLk2LE4m3P6kCW4k/oWQO4aIu7Nc2abFaE9p1KO6LDCwd7UMeFf7mMk2zPqsY m3sQeJyP9V5Vo5JgcyC3MOUaFoRcRzT7b+0zpEie+YmjiMM30FlT4pSuvLh+vXb779Qq qQ== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2120.oracle.com with ESMTP id 2hx29wc89g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 May 2018 07:58:19 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w4I7wIEh018631 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 May 2018 07:58:18 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w4I7wHDT006302; Fri, 18 May 2018 07:58:17 GMT Received: from mwanda (/197.254.35.146) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 18 May 2018 00:58:17 -0700 Date: Fri, 18 May 2018 10:58:10 +0300 From: Dan Carpenter To: Alexei Starovoitov , John Fastabend Cc: Daniel Borkmann , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 1/2] bpf: sockmap, double free in __sock_map_ctx_update_elem() Message-ID: <20180518075810.GA28285@mwanda> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8896 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=767 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1805180088 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We accidentally free "e" twice. Fixes: 81110384441a ("bpf: sockmap, add hash map support") Signed-off-by: Dan Carpenter diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c index c6de1393df63..216d5c9b0eb3 100644 --- a/kernel/bpf/sockmap.c +++ b/kernel/bpf/sockmap.c @@ -1833,7 +1833,6 @@ static int __sock_map_ctx_update_elem(struct bpf_map *map, if (tx_msg) bpf_prog_put(tx_msg); write_unlock_bh(&sock->sk_callback_lock); - kfree(e); return err; }