osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Pascal Quantin : 

[NAS EPS] Incorrect decoding of UE Network Capability IE
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4196

svn path=/trunk/; revision=30802
This commit is contained in:
Anders Broman 2009-11-02 22:37:34 +00:00
parent d0a15b4473
commit 62ae894451
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-nas_eps.c
View File

@ -1354,7 +1354,7 @@ static const true_false_string nas_eps_emm_1xsrvcc_cap_flg = {
};
static guint16
de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_)
{
guint32 curr_offset;
@ -1401,6 +1401,10 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_
curr_offset++;
/* Following octets are optional */
if ((curr_offset - offset) >= len)
return (len);
/* UMTS encryption algorithms supported (octet 5)
* UMTS encryption algorithm UEA0 supported (octet 5, bit 8)
*/
@ -1422,6 +1426,9 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_
proto_tree_add_item(tree, hf_nas_eps_emm_uea7, tvb, curr_offset, 1, FALSE);
curr_offset++;
if ((curr_offset - offset) >= len)
return (len);
/* UCS2 support (UCS2) (octet 6, bit 8)
* This information field indicates the likely treatment of UCS2 encoded character strings
* by the UE.
@ -1444,6 +1451,9 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_
proto_tree_add_item(tree, hf_nas_eps_emm_uia7, tvb, curr_offset, 1, FALSE);
curr_offset++;
if ((curr_offset - offset) >= len)
return (len);
/* Bits 8 to 3 and bit 1 of octet 7 are spare and shall be coded as zero. */
proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3), 6, FALSE);
/* 1xSRVCC capability (octet 7, bit 2) */