aboutsummaryrefslogtreecommitdiffstats
path: root/meta-security/recipes-security/security-manager/security-manager/0006-socket-manager-removes-tizen-specific-call.patch
blob: 3b8aad98c575f0cb46a45195fd11dd4a6c79fae6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From ec098bf03cea23350ca7d1ea2ad88b9c88228943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Fri, 8 Jan 2016 16:53:46 +0100
Subject: [PATCH 06/14] socket-manager: removes tizen specific call
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The function 'smack_fgetlabel' is specific to Tizen
and is no more maintained upstream.

Upstream-Status: Accepted [https://review.tizen.org/gerrit/#/c/56507/]

Change-Id: I3802742b1758efe37b33e6d968ff727d68f2fd1f
Signed-off-by: José Bollo <jobol@nonadev.net>
---
 src/server/main/socket-manager.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
index 94c54c6..5e1a79b 100644
--- a/src/server/main/socket-manager.cpp
+++ b/src/server/main/socket-manager.cpp
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/smack.h>
+#include <linux/xattr.h>
 #include <sys/un.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -493,9 +494,9 @@ int SocketManager::CreateDomainSocketHelp(
     if (smack_check()) {
         LogInfo("Set up smack label: " << desc.smackLabel);
 
-        if (0 != smack_fsetlabel(sockfd, desc.smackLabel.c_str(), SMACK_LABEL_IPIN)) {
-            LogError("Error in smack_fsetlabel");
-            ThrowMsg(Exception::InitFailed, "Error in smack_fsetlabel");
+        if (0 != smack_set_label_for_file(sockfd, XATTR_NAME_SMACKIPIN, desc.smackLabel.c_str())) {
+            LogError("Error in smack_set_label_for_file");
+            ThrowMsg(Exception::InitFailed, "Error in smack_set_label_for_file");
         }
     } else {
         LogInfo("No smack on platform. Socket won't be securied with smack label!");
-- 
2.21.0