cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Security fix for CVE-2011-1000

Browse Source
This commit is contained in:
jasper 2011-03-02 14:41:18 +00:00
parent d4c868a945
commit 693fafbdb8
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/telepathy/telepathy-gabble/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2011/01/17 17:58:30 jasper Exp $
# $OpenBSD: Makefile,v 1.32 2011/03/02 14:41:18 jasper Exp $
COMMENT= flexible communications framework, xmpp component
DISTNAME= telepathy-gabble-0.10.4
REVISION= 0
MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-gabble/}

32
net/telepathy/telepathy-gabble/patches/patch-src_jingle-factory_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-src_jingle-factory_c,v 1.1 2011/03/02 14:41:18 jasper Exp $
Security fix for CVE-2011-1000,
Telepathy Gabble Audio and Video Calls Hijacking Vulnerability
Fix from upstream bz #34048.
--- src/jingle-factory.c.orig Tue Nov 2 13:01:47 2010
+++ src/jingle-factory.c Wed Mar 2 15:02:34 2011
@@ -254,6 +254,22 @@ got_jingle_info_stanza (GabbleJingleFactory *fac,
GabbleJingleFactoryPrivate *priv = fac->priv;
LmMessageSubType sub_type;
LmMessageNode *query_node, *node;
+ const gchar *from = wocky_stanza_get_from (message);
+
+ if (from != NULL)
+ {
+ TpBaseConnection *base_conn = TP_BASE_CONNECTION (priv->conn);
+ TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
+ base_conn, TP_HANDLE_TYPE_CONTACT);
+ TpHandle sender = tp_handle_lookup (contact_repo, from, NULL, NULL);
+
+ if (sender != base_conn->self_handle)
+ {
+ DEBUG ("ignoring jingleinfo from '%s', not ourself nor the server",
+ from);
+ return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
+ }
+ }
query_node = lm_message_node_get_child_with_namespace (
wocky_stanza_get_top_node (message), "query", NS_GOOGLE_JINGLE_INFO);