3b8aad98c575f0cb46a45195fd11dd4a6c79fae6
[AGL/meta-agl.git] / meta-app-framework / recipes-security / security-manager / security-manager / 0006-socket-manager-removes-tizen-specific-call.patch
1 From ec098bf03cea23350ca7d1ea2ad88b9c88228943 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
3 Date: Fri, 8 Jan 2016 16:53:46 +0100
4 Subject: [PATCH 06/14] socket-manager: removes tizen specific call
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 The function 'smack_fgetlabel' is specific to Tizen
10 and is no more maintained upstream.
11
12 Upstream-Status: Accepted [https://review.tizen.org/gerrit/#/c/56507/]
13
14 Change-Id: I3802742b1758efe37b33e6d968ff727d68f2fd1f
15 Signed-off-by: José Bollo <jobol@nonadev.net>
16 ---
17  src/server/main/socket-manager.cpp | 7 ++++---
18  1 file changed, 4 insertions(+), 3 deletions(-)
19
20 diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
21 index 94c54c6..5e1a79b 100644
22 --- a/src/server/main/socket-manager.cpp
23 +++ b/src/server/main/socket-manager.cpp
24 @@ -30,6 +30,7 @@
25  #include <sys/types.h>
26  #include <sys/socket.h>
27  #include <sys/smack.h>
28 +#include <linux/xattr.h>
29  #include <sys/un.h>
30  #include <sys/stat.h>
31  #include <unistd.h>
32 @@ -493,9 +494,9 @@ int SocketManager::CreateDomainSocketHelp(
33      if (smack_check()) {
34          LogInfo("Set up smack label: " << desc.smackLabel);
35  
36 -        if (0 != smack_fsetlabel(sockfd, desc.smackLabel.c_str(), SMACK_LABEL_IPIN)) {
37 -            LogError("Error in smack_fsetlabel");
38 -            ThrowMsg(Exception::InitFailed, "Error in smack_fsetlabel");
39 +        if (0 != smack_set_label_for_file(sockfd, XATTR_NAME_SMACKIPIN, desc.smackLabel.c_str())) {
40 +            LogError("Error in smack_set_label_for_file");
41 +            ThrowMsg(Exception::InitFailed, "Error in smack_set_label_for_file");
42          }
43      } else {
44          LogInfo("No smack on platform. Socket won't be securied with smack label!");
45 -- 
46 2.21.0
47