summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2018-12-10 10:22:37 (GMT)
committerVictor Stinner <vstinner@redhat.com>2018-12-10 10:22:37 (GMT)
commit2eb6ad8578fa9d764c21a92acd8e054e3202ad19 (patch)
treeec8156905638640f904aa7f692e2cbdbe861e38b /Lib
parent8e0418688906206fe59bd26344320c0fc026849e (diff)
downloadcpython-2eb6ad8578fa9d764c21a92acd8e054e3202ad19.zip
cpython-2eb6ad8578fa9d764c21a92acd8e054e3202ad19.tar.gz
cpython-2eb6ad8578fa9d764c21a92acd8e054e3202ad19.tar.bz2
bpo-35050: AF_ALG length check off-by-one error (GH-10058)
The length check for AF_ALG salg_name and salg_type had a off-by-one error. The code assumed that both values are not necessarily NULL terminated. However the Kernel code for alg_bind() ensures that the last byte of both strings are NULL terminated. Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socket.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index a2c047d..626a077 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5969,6 +5969,24 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
with self.assertRaises(TypeError):
sock.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, assoclen=-1)
+ def test_length_restriction(self):
+ # bpo-35050, off-by-one error in length check
+ sock = socket.socket(socket.AF_ALG, socket.SOCK_SEQPACKET, 0)
+ self.addCleanup(sock.close)
+
+ # salg_type[14]
+ with self.assertRaises(FileNotFoundError):
+ sock.bind(("t" * 13, "name"))
+ with self.assertRaisesRegex(ValueError, "type too long"):
+ sock.bind(("t" * 14, "name"))
+
+ # salg_name[64]
+ with self.assertRaises(FileNotFoundError):
+ sock.bind(("type", "n" * 63))
+ with self.assertRaisesRegex(ValueError, "name too long"):
+ sock.bind(("type", "n" * 64))
+
+
@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
class TestMSWindowsTCPFlags(unittest.TestCase):
knownTCPFlags = {