From patchwork Fri May 27 14:56:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlos_Falgueras_Garc=C3=ADa?= X-Patchwork-Id: 627245 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rGTd24HxMz9syq for ; Sat, 28 May 2016 00:57:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=riseup.net header.i=@riseup.net header.b=PqLFoZI3; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754687AbcE0O5J (ORCPT ); Fri, 27 May 2016 10:57:09 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53177 "EHLO mx1.riseup.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753873AbcE0O5I (ORCPT ); Fri, 27 May 2016 10:57:08 -0400 Received: from piha.riseup.net (unknown [10.0.1.163]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 10CBF1A2C5E; Fri, 27 May 2016 14:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1464361027; bh=dZWxDxtQMA3CSfDzu4IpGXt8KSQ1sIvVSGY0B+ZftjY=; h=From:To:Cc:Subject:Date:From; b=PqLFoZI36hR1B/e0guyJe+h5tlvebvvOFXxP7AjiLzg6cx+qlOt1s76tbDTZAZbiz vQBuARrUJLFYWX/eMM1cU2s0/vzZ5yLFk1PRGvp+Ppdn+D8PUQuMZKKd8LnNMISCeJ ichwECc6L/RJBmnVAqulhrqlXj3P1c5pxc8SxjoM= Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: carlosfg) with ESMTPSA id E266B1C0034 From: =?UTF-8?q?Carlos=20Falgueras=20Garc=C3=ADa?= To: netfilter-devel@vger.kernel.org Cc: pablo@netfilter.org Subject: [PATCH 1/2 libnftnl] set_elem: Copy user data memory Date: Fri, 27 May 2016 16:56:54 +0200 Message-Id: <1464361015-14755-1-git-send-email-carlosfg@riseup.net> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99 at mx1.riseup.net X-Virus-Status: Clean Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org All attributes are passed by copy, so user data should be copied too. Signed-off-by: Carlos Falgueras García --- src/set_elem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/set_elem.c b/src/set_elem.c index 990be24..b9c7e1e 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -125,8 +125,14 @@ void nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, s->timeout = *((uint64_t *)data); break; case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */ - s->user.data = (void *)data; - s->user.len = data_len; + if (s->user.data != NULL) + xfree(s->user.data); + + s->user.data = malloc(data_len); + if (!s->user.data) + return; + memcpy(s->user.data, data, data_len); + s->user.len = data_len; break; default: return;