2:53 a.m.
Hi All,
A couple of small fixes for phonet.
Br,
MikaL
[PATCH 1/2] isigen: fix phonet address initialization
[PATCH 2/2] main: add capabilities for phonet
plugins/isigen.c | 3 ++-
src/main.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
2:53 a.m.
New subject: [PATCH 1/2] isigen: fix phonet address initialization
---
plugins/isigen.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/plugins/isigen.c b/plugins/isigen.c
index 0ea2db3..493d926 100644
--- a/plugins/isigen.c
+++ b/plugins/isigen.c
@@ -286,9 +286,10 @@ static int isigen_probe(struct ofono_modem *modem)
}
if (address) {
- int error = g_pn_netlink_set_address(idx, PN_DEV_PC);
+ int error = g_pn_netlink_set_address(idx, address);
if (error && error != -EEXIST) {
DBG("g_pn_netlink_set_address: %s\n", strerror(-error));
+ g_pn_netlink_stop(link);
return -errno;
}
}
--
1.7.0.4
2:53 a.m.
New subject: [PATCH 2/2] main: add capabilities for phonet
Phonet sockets require CAP_SYS_ADMIN and SO_BINDTODEVICE socket
option requires CAP_NET_RAW.
---
src/main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main.c b/src/main.c
index 93149bc..eca008e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -140,7 +140,8 @@ int main(int argc, char **argv)
/* Drop capabilities */
capng_clear(CAPNG_SELECT_BOTH);
capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
- CAP_NET_BIND_SERVICE, CAP_NET_ADMIN, -1);
+ CAP_NET_BIND_SERVICE, CAP_NET_ADMIN,
+ CAP_NET_RAW, CAP_SYS_ADMIN, -1);
capng_apply(CAPNG_SELECT_BOTH);
#endif
--
1.7.0.4
3:29 a.m.
New subject: [PATCH 2/2] main: add capabilities for phonet
Hi Mika,
Phonet sockets require CAP_SYS_ADMIN and SO_BINDTODEVICE socket
option requires CAP_NET_RAW.
and I so thought that we get away with lower capabilities :(
---
src/main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Patch has been applied.
Regards
Marcel
4339
days inactive
4339
days old
4 comments
2 participants
participants (2)
-
Marcel Holtmann -
Mika Liljeberg