From patchwork Thu Mar 14 20:33:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 15355 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D7A3923E10 for ; Thu, 14 Mar 2013 20:33:55 +0000 (UTC) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by fiordland.canonical.com (Postfix) with ESMTP id 7CC1BA182CF for ; Thu, 14 Mar 2013 20:33:55 +0000 (UTC) Received: by mail-vb0-f42.google.com with SMTP id ff1so1463684vbb.15 for ; Thu, 14 Mar 2013 13:33:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=4onpNgnvZwIeW73vWfVPXWoRlt4KlmZ4uHb66pNK+W8=; b=BiGuNiZMsiwFqTEmi0lP6SeS70OuxlEwHtCn+ey+ZAZshP+4Hd4hTstg4GQV+CmgiF RMLV1L7EBHd8teaKfTmkn7INwPZFWtWJHrQMBZu3nAussUCGHaKj4wbLBhiatqJnlvgY Zm7NyXnqxaqZh4vJXiLIdUsuQE65ijegzMfnfJ75CFryhgABoaxkAWaAh74p9okWABxw P50dSfDAvHnQUKAUixb2NN/GstA65O22rY8rsClfhAveIWAetnJKhTZBv7Z49M8PgBor wsUDHDD2Dk7q8Nmrs21JQ/1spXVG7UrSI8/49pIgWEYP/v5YK5oxRC49Iw93PNknr+XT NlcQ== X-Received: by 10.52.93.235 with SMTP id cx11mr3116863vdb.51.1363293234970; Thu, 14 Mar 2013 13:33:54 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp90712veb; Thu, 14 Mar 2013 13:33:54 -0700 (PDT) X-Received: by 10.68.228.164 with SMTP id sj4mr8812976pbc.180.1363293233535; Thu, 14 Mar 2013 13:33:53 -0700 (PDT) Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) by mx.google.com with ESMTPS id xp9si2823824pbc.250.2013.03.14.13.33.52 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Mar 2013 13:33:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: by mail-pb0-f46.google.com with SMTP id uo15so2753027pbc.33 for ; Thu, 14 Mar 2013 13:33:52 -0700 (PDT) X-Received: by 10.68.245.201 with SMTP id xq9mr8997298pbc.160.1363293232133; Thu, 14 Mar 2013 13:33:52 -0700 (PDT) Received: from localhost.localdomain (c-24-21-54-107.hsd1.or.comcast.net. [24.21.54.107]) by mx.google.com with ESMTPS id zm1sm4814606pbc.26.2013.03.14.13.33.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Mar 2013 13:33:51 -0700 (PDT) From: John Stultz To: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Cc: John Stultz , Android Kernel Team Subject: [PATCH] selinux: binder: Fix COMMON_AUDIT_DATA_INIT compile issue Date: Thu, 14 Mar 2013 13:33:45 -0700 Message-Id: <1363293225-19926-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmohQaDv/3k5fbf35iOx6FKkTvhfgtFtE1r4mAkPyBd9F069hwPcwtp4nzFy7DKSMtfWw2L This is against the experimental/android-3.9 branch. The COMMON_AUDIT_DATA_INIT macros have been removed, and are now replaced with open coded ad.type initialization. Thus, this patch updates the selinux_binder_transfer_file function so it builds. Cc: Android Kernel Team Signed-off-by: John Stultz --- security/selinux/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 26a060e..d55b46b 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1830,7 +1830,7 @@ static int selinux_binder_transfer_file(struct task_struct *from, struct task_st struct selinux_audit_data sad = {0,}; int rc; - COMMON_AUDIT_DATA_INIT(&ad, PATH); + ad.type = LSM_AUDIT_DATA_PATH; ad.u.path = file->f_path; ad.selinux_audit_data = &sad;