Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ropgadget for
openSUSE:Factory checked in at 2026-03-19 17:40:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ropgadget (Old)
and /work/SRC/openSUSE:Factory/.python-ropgadget.new.8177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ropgadget"
Thu Mar 19 17:40:22 2026 rev:2 rq:1341181 version:7.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ropgadget/python-ropgadget.changes
2025-05-08 18:26:19.099828158 +0200
+++
/work/SRC/openSUSE:Factory/.python-ropgadget.new.8177/python-ropgadget.changes
2026-03-19 17:42:19.126093674 +0100
@@ -1,0 +2,9 @@
+Thu Mar 12 14:36:53 UTC 2026 - Eyad Issa <[email protected]>
+
+- Update to version 7.7:
+ * Wrap disassembly in try/except to handle invalid instruction
+ bytes
+ * Fix callPreceded filtering
+ * Fix sintax warnings for python 3.13
+
+-------------------------------------------------------------------
Old:
----
_scmsync.obsinfo
build.specials.obscpio
ropgadget-7.6.tar.gz
New:
----
ropgadget-7.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ropgadget.spec ++++++
--- /var/tmp/diff_new_pack.WKzadW/_old 2026-03-19 17:42:19.998129800 +0100
+++ /var/tmp/diff_new_pack.WKzadW/_new 2026-03-19 17:42:19.998129800 +0100
@@ -17,7 +17,7 @@
Name: python-ropgadget
-Version: 7.6
+Version: 7.7
Release: 0
Summary: This tool lets you search your gadgets on your binaries to
facilitate your ROP exploitation
License: BSD-3-Clause
++++++ ropgadget-7.6.tar.gz -> ropgadget-7.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/PKG-INFO new/ropgadget-7.7/PKG-INFO
--- old/ropgadget-7.6/PKG-INFO 2025-01-28 20:33:41.601269500 +0100
+++ new/ropgadget-7.7/PKG-INFO 2025-10-15 12:32:37.134307600 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
Name: ROPGadget
-Version: 7.6
+Version: 7.7
Summary: This tool lets you search your gadgets on your binaries to facilitate
your ROP exploitation.
Home-page: https://github.com/JonathanSalwan/ROPgadget
Author: Jonathan Salwan
@@ -22,6 +22,7 @@
Dynamic: description
Dynamic: home-page
Dynamic: license
+Dynamic: license-file
Dynamic: requires-dist
Dynamic: summary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ROPGadget.egg-info/PKG-INFO
new/ropgadget-7.7/ROPGadget.egg-info/PKG-INFO
--- old/ropgadget-7.6/ROPGadget.egg-info/PKG-INFO 2025-01-28
20:33:41.000000000 +0100
+++ new/ropgadget-7.7/ROPGadget.egg-info/PKG-INFO 2025-10-15
12:32:37.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
Name: ROPGadget
-Version: 7.6
+Version: 7.7
Summary: This tool lets you search your gadgets on your binaries to facilitate
your ROP exploitation.
Home-page: https://github.com/JonathanSalwan/ROPgadget
Author: Jonathan Salwan
@@ -22,6 +22,7 @@
Dynamic: description
Dynamic: home-page
Dynamic: license
+Dynamic: license-file
Dynamic: requires-dist
Dynamic: summary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ropgadget/gadgets.py
new/ropgadget-7.7/ropgadget/gadgets.py
--- old/ropgadget-7.6/ropgadget/gadgets.py 2025-01-28 20:24:18.000000000
+0100
+++ new/ropgadget-7.7/ropgadget/gadgets.py 2025-10-15 10:54:31.000000000
+0200
@@ -48,38 +48,53 @@
opcodes = section["opcodes"]
sec_vaddr = section["vaddr"]
-
ret = []
md = Cs(arch, mode)
+ op_len = len(opcodes)
+
for gad_op, gad_size, gad_align in gadgets:
if self.__options.align:
gad_align = self.__options.align
allRefRet = [m.start() for m in re.finditer(gad_op, opcodes)]
for ref in allRefRet:
end = ref + gad_size
+ if ref < 0 or end > op_len:
+ continue
for i in range(self.__options.depth):
start = ref - (i * gad_align)
- if (sec_vaddr + start) % gad_align == 0:
- code = opcodes[start:end]
- decodes = md.disasm_lite(code, sec_vaddr + start)
- decodes = list(decodes)
- if sum(size for _, size, _, _ in decodes) != i *
gad_align + gad_size:
- # We've read less instructions than planned so
something went wrong
- continue
- if self.passClean(decodes):
- continue
- off = self.__offset
- vaddr = off + sec_vaddr + start
- g = {"vaddr": vaddr}
- if not self.__options.noinstr:
- g["gadget"] = " ; ".join("{}{}{}".format(mnemonic,
" " if op_str else "", op_str)
- for _, _, mnemonic,
op_str in decodes).replace(" ", " ")
- if self.__options.callPreceded:
- prevBytesAddr = max(sec_vaddr, vaddr - PREV_BYTES)
- g["prev"] = opcodes[prevBytesAddr -
sec_vaddr:vaddr - sec_vaddr]
- if self.__options.dump:
- g["bytes"] = code
- ret.append(g)
+ if start < 0 or (sec_vaddr + start) % gad_align != 0 or
start >= op_len:
+ continue
+ code = opcodes[start:end]
+ try:
+ decodes = list(md.disasm_lite(code, sec_vaddr + start))
+ except Exception:
+ continue
+ if not decodes:
+ continue
+ total_size = sum(size for _, size, _, _ in decodes)
+ expected_size = i * gad_align + gad_size
+ if total_size != expected_size:
+ continue
+ if arch == CS_ARCH_RISCV and decodes[-1][1] != gad_size:
+ # Last disassembled instruction has wrong size! This
happens
+ # e.g. if gad_align == 2 and the last two bytes of a
4-byte
+ # instruction are also a valid 2-byte instruction.
+ continue
+ if self.passClean(decodes):
+ continue
+ vaddr = self.__offset + sec_vaddr + start
+ g = {"vaddr": vaddr}
+ if not self.__options.noinstr:
+ g["gadget"] = " ; ".join("{}{}{}".format(mnemonic, " "
if op_str else "", op_str)
+ for _, _, mnemonic, op_str in
decodes).replace(" ", " ")
+ if self.__options.callPreceded:
+ prevBytesAddr = max(sec_vaddr, vaddr - PREV_BYTES)
+ pstart = max(prevBytesAddr - sec_vaddr, 0)
+ pend = min(vaddr - sec_vaddr, op_len)
+ g["prev"] = opcodes[pstart:pend]
+ if self.__options.dump:
+ g["bytes"] = code
+ ret.append(g)
return ret
def addROPGadgets(self, section):
@@ -90,13 +105,13 @@
if arch == CS_ARCH_X86:
gadgets = [
- [b"\xc3", 1, 1], # ret
- [b"\xc2[\x00-\xff]{2}", 3, 1], # ret <imm>
- [b"\xcb", 1, 1], # retf
- [b"\xca[\x00-\xff]{2}", 3, 1], # retf <imm>
+ [br"\xc3", 1, 1], # ret
+ [br"\xc2[\x00-\xff]{2}", 3, 1], # ret <imm>
+ [br"\xcb", 1, 1], # retf
+ [br"\xca[\x00-\xff]{2}", 3, 1], # retf <imm>
# MPX
- [b"\xf2\xc3", 2, 1], # ret
- [b"\xf2\xc2[\x00-\xff]{2}", 4, 1], # ret <imm>
+ [br"\xf2\xc3", 2, 1], # ret
+ [br"\xf2\xc2[\x00-\xff]{2}", 4, 1], # ret <imm>
]
elif arch == CS_ARCH_MIPS:
@@ -104,31 +119,31 @@
elif arch == CS_ARCH_PPC:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x4e\x80\x00\x20", 4, 4], # blr
- [b"\x4e\x80\x00\x21", 4, 4], # blrl
- [b"\x4e\x80\x04\x20", 4, 4], # bctr
- [b"\x4e\x80\x04\x21", 4, 4], # bctrl
+ [br"\x4e\x80\x00\x20", 4, 4], # blr
+ [br"\x4e\x80\x00\x21", 4, 4], # blrl
+ [br"\x4e\x80\x04\x20", 4, 4], # bctr
+ [br"\x4e\x80\x04\x21", 4, 4], # bctrl
]
else:
gadgets = [
- [b"\x20\x00\x80\x4e", 4, 4], # blr
- [b"\x21\x00\x80\x4e", 4, 4], # blrl
- [b"\x20\x04\x80\x4e", 4, 4], # bctr
- [b"\x21\x04\x80\x4e", 4, 4], # bctrl
+ [br"\x20\x00\x80\x4e", 4, 4], # blr
+ [br"\x21\x00\x80\x4e", 4, 4], # blrl
+ [br"\x20\x04\x80\x4e", 4, 4], # bctr
+ [br"\x21\x04\x80\x4e", 4, 4], # bctrl
]
elif arch == CS_ARCH_SPARC:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x81\xc3\xe0\x08", 4, 4], # retl
- [b"\x81\xc7\xe0\x08", 4, 4], # ret
- [b"\x81\xe8\x00\x00", 4, 4] # restore
+ [br"\x81\xc3\xe0\x08", 4, 4], # retl
+ [br"\x81\xc7\xe0\x08", 4, 4], # ret
+ [br"\x81\xe8\x00\x00", 4, 4] # restore
]
else:
gadgets = [
- [b"\x08\xe0\xc3\x81", 4, 4], # retl
- [b"\x08\xe0\xc7\x81", 4, 4], # ret
- [b"\x00\x00\xe8\x81", 4, 4] # restore
+ [br"\x08\xe0\xc3\x81", 4, 4], # retl
+ [br"\x08\xe0\xc7\x81", 4, 4], # ret
+ [br"\x00\x00\xe8\x81", 4, 4] # restore
]
arch_mode = 0
@@ -137,22 +152,22 @@
elif arch == CS_ARCH_ARM64:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\xd6\x5f\x03\xc0", 4, 4] # ret
+ [br"\xd6\x5f\x03\xc0", 4, 4] # ret
]
else:
gadgets = [
- [b"\xc0\x03\x5f\xd6", 4, 4] # ret
+ [br"\xc0\x03\x5f\xd6", 4, 4] # ret
]
arch_mode = CS_MODE_ARM
elif arch == CS_ARCH_RISCV:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x80\x82", 2, 1], # c.ret
+ [br"\x80\x82", 2, 1], # c.ret
]
else:
gadgets = [
- [b"\x82\x80", 2, 1], # c.ret
+ [br"\x82\x80", 2, 1], # c.ret
]
arch_mode = CS_MODE_RISCV64 | CS_MODE_RISCVC
@@ -176,40 +191,40 @@
# d0-d7=call,e0-e7=jmp
# x86:
0=eax,1=ecx,2=edx,3=ebx,4=esp,5=ebp,6=esi,7=edi
# x64:
0=rax,1=rcx,2=rdx,3=rbx,4=rsp,5=rbp,6=rsi,7=rdi
- [b"\xff[\xd0-\xd7\xe0-\xe7]", 2, 1],
+ [br"\xff[\xd0-\xd7\xe0-\xe7]", 2, 1],
# call/jmp [reg]
# 10-17=call,20-27=jmp
# x86: 0=eax,1=ecx,2=edx,3=ebx,
6=esi,7=edi
# x64: 0=rax,1=rcx,2=rdx,3=rbx,
6=rsi,7=rdi
- [b"\xff[\x10-\x13\x16-\x17\x20-\x23\x26-\x27]",
2, 1],
+
[br"\xff[\x10-\x13\x16-\x17\x20-\x23\x26-\x27]", 2, 1],
# call/jmp [reg]
# 14=call,24=jmp
# x86: esp
# x64: rsp
- [b"\xff[\x14\x24]\x24", 3, 1],
+ [br"\xff[\x14\x24]\x24", 3, 1],
# call/jmp [reg + offset], -0x80 <= offset <=
0x7f
# 50-57=call,60-67=jmp
# x86: 0=eax,1=ecx,2=edx,3=ebx,
5=ebp,6=esi,7=edi
# x64: 0=rax,1=rcx,2=rdx,3=rbx,
5=rbp,6=rsi,7=rdi
-
[b"\xff[\x50-\x53\x55-\x57\x60-\x63\x65-\x67][\x00-\xff]", 3, 1],
+
[br"\xff[\x50-\x53\x55-\x57\x60-\x63\x65-\x67][\x00-\xff]", 3, 1],
# call/jmp [reg + offset], -0x80 <= offset <=
0x7f
# 54=call,64=jmp
# x86: esp
# x64: rsp
- [b"\xff[\x54\x64]\x24[\x00-\xff]", 4, 1],
+ [br"\xff[\x54\x64]\x24[\x00-\xff]", 4, 1],
# call/jmp [reg + offset], -0x80000000 <=
offset <= 0x7fffffff
# 90-97=call,a0-a7=jmp
# x86: 0=eax,1=ecx,2=edx,3=ebx,
5=ebp,6=esi,7=edi
# x64: 0=rax,1=rcx,2=rdx,3=rbx,
5=rbp,6=rsi,7=rdi
-
[b"\xff[\x90-\x93\x95-\x97\xa0-\xa3\xa5-\xa7][\x00-\xff]{4}", 6, 1],
+
[br"\xff[\x90-\x93\x95-\x97\xa0-\xa3\xa5-\xa7][\x00-\xff]{4}", 6, 1],
# call/jmp [reg + offset], -0x80000000 <=
offset <= 0x7fffffff
# 94=call,a4=jmp
# x86: esp
# x64: rsp
- [b"\xff[\x94\xa4]\x24[\x00-\xff]{4}", 7, 1]
+ [br"\xff[\x94\xa4]\x24[\x00-\xff]{4}", 7, 1]
]
# in x64, by adding 41 before a sequence with
# 0=rax,1=rcx,2=rdx,3=rbx,4=rsp,5=rbp,6=rsi,7=rdi
@@ -219,129 +234,129 @@
gadgets += [(b"\x41" + op, size + 1, align) for (op, size,
align) in gadgets]
# finally, add extra sequences common to x86 and x64
gadgets += [
- [b"\xeb[\x00-\xff]", 2, 1],
# jmp offset
- [b"\xe9[\x00-\xff]{4}", 5, 1],
# jmp offset
+ [br"\xeb[\x00-\xff]", 2, 1],
# jmp offset
+ [br"\xe9[\x00-\xff]{4}", 5, 1],
# jmp offset
# MPX
- [b"\xf2\xff[\x20\x21\x22\x23\x26\x27]{1}", 3,
1], # jmp [reg]
- [b"\xf2\xff[\xe0\xe1\xe2\xe3\xe4\xe6\xe7]{1}",
3, 1], # jmp [reg]
- [b"\xf2\xff[\x10\x11\x12\x13\x16\x17]{1}", 3,
1], # jmp [reg]
- [b"\xf2\xff[\xd0\xd1\xd2\xd3\xd4\xd6\xd7]{1}",
3, 1] # call [reg]
+ [br"\xf2\xff[\x20\x21\x22\x23\x26\x27]{1}", 3,
1], # jmp [reg]
+ [br"\xf2\xff[\xe0\xe1\xe2\xe3\xe4\xe6\xe7]{1}",
3, 1], # jmp [reg]
+ [br"\xf2\xff[\x10\x11\x12\x13\x16\x17]{1}", 3,
1], # jmp [reg]
+ [br"\xf2\xff[\xd0\xd1\xd2\xd3\xd4\xd6\xd7]{1}",
3, 1] # call [reg]
]
elif arch == CS_ARCH_MIPS:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
-
[b"\x00[\x40\x60\x80\xa0\xc0\xe0]\xf8\x09[\x00-\xff]{4}", 8, 4],
# jalr $v[0-1]|$a[0-3]
-
[b"[\x01\x02][\x00\x20\x40\x60\x80\xa0\xc0\xe0]\xf8\x09[\x00-\xff]{4}", 8, 4],
# jalr $t[0-7]|$s[0-7]
-
[b"\x03[\x00\x20\xc0\xe0]\xf8\x09[\x00-\xff]{4}", 8, 4],
# jalr $t[8-9]|$s8|$ra
-
[b"\x00[\x40\x60\x80\xa0\xc0\xe0]\x00\x08[\x00-\xff]{4}", 8, 4],
# jr $v[0-1]|$a[0-3]
-
[b"[\x01\x02][\x00\x20\x40\x60\x80\xa0\xc0\xe0]\x00\x08[\x00-\xff]{4}", 8, 4],
# jr $t[0-7]|$s[0-7]
-
[b"\x03[\x00\x20\xc0\xe0]\x00\x08[\x00-\xff]{4}", 8, 4],
# jr $t[8-9]|$s8|$ra
- [b"[\x0c-\x0f][\x00-\xff]{7}", 8, 4],
# jal addr
- [b"[\x08-\x0b][\x00-\xff]{7}", 8, 4]
# j addr
+
[br"\x00[\x40\x60\x80\xa0\xc0\xe0]\xf8\x09[\x00-\xff]{4}", 8, 4],
# jalr $v[0-1]|$a[0-3]
+
[br"[\x01\x02][\x00\x20\x40\x60\x80\xa0\xc0\xe0]\xf8\x09[\x00-\xff]{4}", 8, 4],
# jalr $t[0-7]|$s[0-7]
+
[br"\x03[\x00\x20\xc0\xe0]\xf8\x09[\x00-\xff]{4}", 8, 4],
# jalr $t[8-9]|$s8|$ra
+
[br"\x00[\x40\x60\x80\xa0\xc0\xe0]\x00\x08[\x00-\xff]{4}", 8, 4],
# jr $v[0-1]|$a[0-3]
+
[br"[\x01\x02][\x00\x20\x40\x60\x80\xa0\xc0\xe0]\x00\x08[\x00-\xff]{4}", 8, 4],
# jr $t[0-7]|$s[0-7]
+
[br"\x03[\x00\x20\xc0\xe0]\x00\x08[\x00-\xff]{4}", 8, 4],
# jr $t[8-9]|$s8|$ra
+ [br"[\x0c-\x0f][\x00-\xff]{7}", 8, 4],
# jal addr
+ [br"[\x08-\x0b][\x00-\xff]{7}", 8, 4]
# j addr
]
else:
gadgets = [
-
[b"\x09\xf8[\x40\x60\x80\xa0\xc0\xe0]\x00[\x00-\xff]{4}", 8, 4],
# jalr $v[0-1]|$a[0-3]
-
[b"\x09\xf8[\x00\x20\x40\x60\x80\xa0\xc0\xe0][\x01\x02][\x00-\xff]{4}", 8, 4],
# jalr $t[0-7]|$s[0-7]
-
[b"\x09\xf8[\x00\x20\xc0\xe0]\x03[\x00-\xff]{4}", 8, 4],
# jalr $t[8-9]|$s8|$ra
-
[b"\x08\x00[\x40\x60\x80\xa0\xc0\xe0]\x00[\x00-\xff]{4}", 8, 4],
# jr $v[0-1]|$a[0-3]
-
[b"\x08\x00[\x00\x20\x40\x60\x80\xa0\xc0\xe0][\x01\x02][\x00-\xff]{4}", 8, 4],
# jr $t[0-7]|$s[0-7]
-
[b"\x08\x00[\x00\x20\xc0\xe0]\x03[\x00-\xff]{4}", 8, 4],
# jr $t[8-9]|$s8|$ra
- [b"[\x00-\xff]{3}[\x0c-\x0f][\x00-\xff]{4}", 8,
4], # jal addr
- [b"[\x00-\xff]{3}[\x08-\x0b][\x00-\xff]{4}", 8,
4] # j addr
+
[br"\x09\xf8[\x40\x60\x80\xa0\xc0\xe0]\x00[\x00-\xff]{4}", 8, 4],
# jalr $v[0-1]|$a[0-3]
+
[br"\x09\xf8[\x00\x20\x40\x60\x80\xa0\xc0\xe0][\x01\x02][\x00-\xff]{4}", 8, 4],
# jalr $t[0-7]|$s[0-7]
+
[br"\x09\xf8[\x00\x20\xc0\xe0]\x03[\x00-\xff]{4}", 8, 4],
# jalr $t[8-9]|$s8|$ra
+
[br"\x08\x00[\x40\x60\x80\xa0\xc0\xe0]\x00[\x00-\xff]{4}", 8, 4],
# jr $v[0-1]|$a[0-3]
+
[br"\x08\x00[\x00\x20\x40\x60\x80\xa0\xc0\xe0][\x01\x02][\x00-\xff]{4}", 8, 4],
# jr $t[0-7]|$s[0-7]
+
[br"\x08\x00[\x00\x20\xc0\xe0]\x03[\x00-\xff]{4}", 8, 4],
# jr $t[8-9]|$s8|$ra
+ [br"[\x00-\xff]{3}[\x0c-\x0f][\x00-\xff]{4}",
8, 4], # jal addr
+ [br"[\x00-\xff]{3}[\x08-\x0b][\x00-\xff]{4}",
8, 4] # j addr
]
elif arch == CS_ARCH_PPC:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x48[\x00-\xff]{3}", 4, 4] # bl
+ [br"\x48[\x00-\xff]{3}", 4, 4] # bl
]
else:
gadgets = [
- [b"[\x00-\xff]{3}\x48", 4, 4] # bl
+ [br"[\x00-\xff]{3}\x48", 4, 4] # bl
]
elif arch == CS_ARCH_SPARC:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x81\xc0[\x00\x40\x80\xc0]{1}\x00", 4, 4] #
jmp %g[0-3]
+ [br"\x81\xc0[\x00\x40\x80\xc0]{1}\x00", 4, 4]
# jmp %g[0-3]
]
else:
gadgets = [
- [b"\x00[\x00\x40\x80\xc0]{1}\xc0\x81", 4, 4] #
jmp %g[0-3]
+ [br"\x00[\x00\x40\x80\xc0]{1}\xc0\x81", 4, 4]
# jmp %g[0-3]
]
arch_mode = 0
elif arch == CS_ARCH_ARM64:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
-
[b"\xd6[\x1f\x5f]{1}[\x00-\x03]{1}[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}", 4,
4], # br reg
-
[b"\xd6\?[\x00-\x03]{1}[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}", 4, 4] # blr reg
# noqa: W605 # FIXME: \?
+
[br"\xd6[\x1f\x5f]{1}[\x00-\x03]{1}[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}", 4,
4], # br reg
+
[br"\xd6\x3f[\x00-\x03]{1}[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}", 4, 4] # blr
reg
]
else:
gadgets = [
-
[b"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}[\x1f\x5f]{1}\xd6", 4,
4], # br reg
-
[b"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}\?\xd6", 4, 4] # blr reg
# noqa: W605 # FIXME: \?
+
[br"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}[\x1f\x5f]{1}\xd6", 4,
4], # br reg
+
[br"[\x00\x20\x40\x60\x80\xa0\xc0\xe0]{1}[\x00-\x03]{1}\x3f\xd6", 4, 4] # blr
reg
]
arch_mode = CS_MODE_ARM
elif arch == CS_ARCH_ARM:
if self.__options.thumb or self.__options.rawMode == "thumb":
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
-
[b"\x47[\x00\x08\x10\x18\x20\x28\x30\x38\x40\x48\x70]{1}", 2, 2], # bx reg
-
[b"\x47[\x80\x88\x90\x98\xa0\xa8\xb0\xb8\xc0\xc8\xf0]{1}", 2, 2], # blx reg
- [b"\xbd[\x00-\xff]{1}", 2, 2],
# pop {,pc}
- [b"\xe8[\x90-\x9f\xb0-\xbf][\x00-\xff]{4}", 4,
2], # ldm.w reg{!}, {,pc}
- [b"\xe9[\x10-\x1f\x30-\x3f][\x00-\xff]{4}", 4,
2] # ldmdb reg{!}, {,pc}
+
[br"\x47[\x00\x08\x10\x18\x20\x28\x30\x38\x40\x48\x70]{1}", 2, 2], # bx reg
+
[br"\x47[\x80\x88\x90\x98\xa0\xa8\xb0\xb8\xc0\xc8\xf0]{1}", 2, 2], # blx reg
+ [br"\xbd[\x00-\xff]{1}", 2, 2],
# pop {,pc}
+ [br"\xe8[\x90-\x9f\xb0-\xbf][\x00-\xff]{4}", 4,
2], # ldm.w reg{!}, {,pc}
+ [br"\xe9[\x10-\x1f\x30-\x3f][\x00-\xff]{4}", 4,
2] # ldmdb reg{!}, {,pc}
]
else:
gadgets = [
-
[b"[\x00\x08\x10\x18\x20\x28\x30\x38\x40\x48\x70]{1}\x47", 2, 2], # bx reg
-
[b"[\x80\x88\x90\x98\xa0\xa8\xb0\xb8\xc0\xc8\xf0]{1}\x47", 2, 2], # blx reg
- [b"[\x00-\xff]{1}\xbd", 2, 2],
# pop {,pc}
- [b"[\x90-\x9f\xb0-\xbf]\xe8[\x00-\xff]{4}", 4,
2], # ldm.w reg{!}, {,pc}
- [b"[\x10-\x1f\x30-\x3f]\xe9[\x00-\xff]{4}", 4,
2] # ldmdb reg{!}, {,pc}
+
[br"[\x00\x08\x10\x18\x20\x28\x30\x38\x40\x48\x70]{1}\x47", 2, 2], # bx reg
+
[br"[\x80\x88\x90\x98\xa0\xa8\xb0\xb8\xc0\xc8\xf0]{1}\x47", 2, 2], # blx reg
+ [br"[\x00-\xff]{1}\xbd", 2, 2],
# pop {,pc}
+ [br"[\x90-\x9f\xb0-\xbf]\xe8[\x00-\xff]{4}", 4,
2], # ldm.w reg{!}, {,pc}
+ [br"[\x10-\x1f\x30-\x3f]\xe9[\x00-\xff]{4}", 4,
2] # ldmdb reg{!}, {,pc}
]
arch_mode = CS_MODE_THUMB
else:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\xe1\x2f\xff[\x10-\x19\x1e]{1}", 4, 4], #
bx reg
- [b"\xe1\x2f\xff[\x30-\x39\x3e]{1}", 4, 4], #
blx reg
-
[b"[\xe8\xe9][\x10-\x1e\x30-\x3e\x50-\x5e\x70-\x7e\x90-\x9e\xb0-\xbe\xd0-\xde\xf0-\xfe][\x80-\xff][\x00-\xff]",
4, 4] # ldm {,pc}
+ [br"\xe1\x2f\xff[\x10-\x19\x1e]{1}", 4, 4], #
bx reg
+ [br"\xe1\x2f\xff[\x30-\x39\x3e]{1}", 4, 4], #
blx reg
+
[br"[\xe8\xe9][\x10-\x1e\x30-\x3e\x50-\x5e\x70-\x7e\x90-\x9e\xb0-\xbe\xd0-\xde\xf0-\xfe][\x80-\xff][\x00-\xff]",
4, 4] # ldm {,pc}
]
else:
gadgets = [
- [b"[\x10-\x19\x1e]{1}\xff\x2f\xe1", 4, 4], #
bx reg
- [b"[\x30-\x39\x3e]{1}\xff\x2f\xe1", 4, 4], #
blx reg
-
[b"[\x00-\xff][\x80-\xff][\x10-\x1e\x30-\x3e\x50-\x5e\x70-\x7e\x90-\x9e\xb0-\xbe\xd0-\xde\xf0-\xfe][\xe8\xe9]",
4, 4] # ldm {,pc}
+ [br"[\x10-\x19\x1e]{1}\xff\x2f\xe1", 4, 4], #
bx reg
+ [br"[\x30-\x39\x3e]{1}\xff\x2f\xe1", 4, 4], #
blx reg
+
[br"[\x00-\xff][\x80-\xff][\x10-\x1e\x30-\x3e\x50-\x5e\x70-\x7e\x90-\x9e\xb0-\xbe\xd0-\xde\xf0-\xfe][\xe8\xe9]",
4, 4] # ldm {,pc}
]
arch_mode = CS_MODE_ARM
elif arch == CS_ARCH_RISCV:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
#32 bits encoded register
-
[b"[\x00-\xff]{2}[\x00-\xff][\x67\x6f\xe7\xef]",4 , 1],
- [b"[\x00-\xff]{2}[\x00-\xff][\x63\xe3]", 4 ,
1],
+
[br"[\x00-\xff]{2}[\x00-\xff][\x67\x6f\xe7\xef]",4 , 2],
+ [br"[\x00-\xff]{2}[\x00-\xff][\x63\xe3]", 4 ,
2],
#16bits encoded register
-
[b"[\xa0-\xff]{1}[\xfd\xf9\xf5\xf1\xed\xe9\xe5\xe1\xdd\xd9\xd5\xd1\xcd\xc9\xc5\xc1\xbd\xb9\xb5\xb1\xad\xa9\xa5\xa1]",
2, 1], # c.j | c.beqz | c.bnez
-
[b"[\xa0-\xff]{1}[\x0d\x09\x05\x01\x1d\x19\x15\x11\x2d\x29\x25\x21\x3d\x39\x35\x31\x4d\x49\x45\x41\x5d\x59\x55\x51]",
2, 1], # c.j | c.beqz | c.bnez
-
[b"[\xa0-\xff]{1}[\x6d\x69\x65\x61\x7d\x79\x75\x71\x8d\x89\x85\x81\x9d\x99\x95\x91]",
2, 1], # c.j | c.beqz| c.bnez
- [b"[\x81-\x8f]{1}[\x02\x82]", 2, 1], #c.jr
register
- [b"[\x91-\x9f]{1}[\x02\x82]", 2, 1], #c.jalr
register
+
[br"[\xa0-\xff]{1}[\xfd\xf9\xf5\xf1\xed\xe9\xe5\xe1\xdd\xd9\xd5\xd1\xcd\xc9\xc5\xc1\xbd\xb9\xb5\xb1\xad\xa9\xa5\xa1]",
2, 2], # c.j | c.beqz | c.bnez
+
[br"[\xa0-\xff]{1}[\x0d\x09\x05\x01\x1d\x19\x15\x11\x2d\x29\x25\x21\x3d\x39\x35\x31\x4d\x49\x45\x41\x5d\x59\x55\x51]",
2, 2], # c.j | c.beqz | c.bnez
+
[br"[\xa0-\xff]{1}[\x6d\x69\x65\x61\x7d\x79\x75\x71\x8d\x89\x85\x81\x9d\x99\x95\x91]",
2, 2], # c.j | c.beqz| c.bnez
+ [br"[\x81-\x8f]{1}[\x02\x82]", 2, 2], #c.jr
register
+ [br"[\x91-\x9f]{1}[\x02\x82]", 2, 2], #c.jalr
register
]
else:
gadgets = [
#32 bits encoded register
- [b"[\x67\x6f\xe7\xef][\x00-\xff][\x00-\xff]{2}"
, 4, 1], #jalr/j/jal register, offset
- [b"[\x63\xe3][\x00-\xff][\x00-\xff]{2}" , 4, 1],
#branch register, offset
+ [br"[\x67\x6f\xe7\xef][\x00-\xff][\x00-\xff]{2}"
, 4, 2], #jalr/j/jal register, offset
+ [br"[\x63\xe3][\x00-\xff][\x00-\xff]{2}" , 4,
2], #branch register, offset
#16 bits encoded register
-
[b"[\xfd\xf9\xf5\xf1\xed\xe9\xe5\xe1\xdd\xd9\xd5\xd1\xcd\xc9\xc5\xc1\xbd\xb9\xb5\xb1\xad\xa9\xa5\xa1][\xa0-\xff]{1}",
2, 1], # c.j | c.beqz | c.bnez
-
[b"[\x0d\x09\x05\x01\x1d\x19\x15\x11\x2d\x29\x25\x21\x3d\x39\x35\x31\x4d\x49\x45\x41\x5d\x59\x55\x51][\xa0-\xff]{1}",
2, 1], # c.j | c.beqz | c.bnez
-
[b"[\x6d\x69\x65\x61\x7d\x79\x75\x71\x8d\x89\x85\x81\x9d\x99\x95\x91][\xa0-\xff]{1}",
2, 1], # c.j | c.beqz| c.bnez
- [b"[\x02\x82][\x81-\x8f]{1}", 2, 1], #c.jr
register
- [b"[\x02\x82][\x91-\x9f]{1}", 2, 1], #c.jalr
register
+
[br"[\xfd\xf9\xf5\xf1\xed\xe9\xe5\xe1\xdd\xd9\xd5\xd1\xcd\xc9\xc5\xc1\xbd\xb9\xb5\xb1\xad\xa9\xa5\xa1][\xa0-\xff]{1}",
2, 2], # c.j | c.beqz | c.bnez
+
[br"[\x0d\x09\x05\x01\x1d\x19\x15\x11\x2d\x29\x25\x21\x3d\x39\x35\x31\x4d\x49\x45\x41\x5d\x59\x55\x51][\xa0-\xff]{1}",
2, 2], # c.j | c.beqz | c.bnez
+
[br"[\x6d\x69\x65\x61\x7d\x79\x75\x71\x8d\x89\x85\x81\x9d\x99\x95\x91][\xa0-\xff]{1}",
2, 2], # c.j | c.beqz| c.bnez
+ [br"[\x02\x82][\x81-\x8f]{1}", 2, 2], #c.jr
register
+ [br"[\x02\x82][\x91-\x9f]{1}", 2, 2], #c.jalr
register
]
arch_mode = CS_MODE_RISCV64 | CS_MODE_RISCVC
@@ -361,38 +376,38 @@
if arch == CS_ARCH_X86:
gadgets = [
- [b"\xcd\x80", 2, 1], #
int 0x80
- [b"\x0f\x34", 2, 1], #
sysenter
- [b"\x0f\x05", 2, 1], #
syscall
- [b"\x65\xff\x15\x10\x00\x00\x00", 7, 1], #
call DWORD PTR gs:0x10
- [b"\xcd\x80\xc3", 3, 1], #
int 0x80 ; ret
- [b"\x0f\x34\xc3", 3, 1], #
sysenter ; ret
- [b"\x0f\x05\xc3", 3, 1], #
syscall ; ret
- [b"\x65\xff\x15\x10\x00\x00\x00\xc3", 8, 1], #
call DWORD PTR gs:0x10 ; ret
- [b"\x0f\x07", 2, 1], #
sysret
- [b"\x48\x0f\x07", 3, 1], #
sysret
- [b"\xcf", 1, 1], #
iret
+ [br"\xcd\x80", 2, 1], #
int 0x80
+ [br"\x0f\x34", 2, 1], #
sysenter
+ [br"\x0f\x05", 2, 1], #
syscall
+ [br"\x65\xff\x15\x10\x00\x00\x00", 7, 1], #
call DWORD PTR gs:0x10
+ [br"\xcd\x80\xc3", 3, 1], #
int 0x80 ; ret
+ [br"\x0f\x34\xc3", 3, 1], #
sysenter ; ret
+ [br"\x0f\x05\xc3", 3, 1], #
syscall ; ret
+ [br"\x65\xff\x15\x10\x00\x00\x00\xc3", 8, 1], #
call DWORD PTR gs:0x10 ; ret
+ [br"\x0f\x07", 2, 1], #
sysret
+ [br"\x48\x0f\x07", 3, 1], #
sysret
+ [br"\xcf", 1, 1], #
iret
]
elif arch == CS_ARCH_MIPS:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x00\x00\x00\x0c", 4, 4] # syscall
+ [br"\x00\x00\x00\x0c", 4, 4] # syscall
]
else:
gadgets = [
- [b"\x0c\x00\x00\x00", 4, 4] # syscall
+ [br"\x0c\x00\x00\x00", 4, 4] # syscall
]
elif arch == CS_ARCH_PPC:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x44\x00\x00\x02", 4, 4], # sc
- [b"\x44\x00\x00\x03", 4, 4] # scv
+ [br"\x44\x00\x00\x02", 4, 4], # sc
+ [br"\x44\x00\x00\x03", 4, 4] # scv
]
else:
gadgets = [
- [b"\x02\x00\x00\x44", 4, 4], # sc
- [b"\x03\x00\x00\x44", 4, 4] # scv
+ [br"\x02\x00\x00\x44", 4, 4], # sc
+ [br"\x03\x00\x00\x44", 4, 4] # scv
]
elif arch == CS_ARCH_SPARC:
@@ -402,23 +417,23 @@
elif arch == CS_ARCH_ARM:
if self.__options.thumb or self.__options.rawMode == "thumb":
gadgets = [
- [b"\x00-\xff]{1}\xef", 2, 2] # FIXME: svc
+ [br"\x00-\xff]{1}\xef", 2, 2] # FIXME: svc
]
arch_mode = CS_MODE_THUMB
else:
gadgets = [
- [b"\x00-\xff]{3}\xef", 4, 4] # FIXME: svc
+ [br"\x00-\xff]{3}\xef", 4, 4] # FIXME: svc
]
arch_mode = CS_MODE_ARM
elif arch == CS_ARCH_RISCV:
if arch_endian == CS_MODE_BIG_ENDIAN:
gadgets = [
- [b"\x00\x00\x00\x73", 4, 2] # syscall
+ [br"\x00\x00\x00\x73", 4, 2] # syscall
]
else:
gadgets = [
- [b"\x73\x00\x00\x00", 4, 2] # syscall
+ [br"\x73\x00\x00\x00", 4, 2] # syscall
]
arch_mode = CS_MODE_RISCV64 | CS_MODE_RISCVC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ropgadget/options.py
new/ropgadget-7.7/ropgadget/options.py
--- old/ropgadget-7.6/ropgadget/options.py 2024-09-30 15:25:09.000000000
+0200
+++ new/ropgadget-7.7/ropgadget/options.py 2025-10-15 10:54:31.000000000
+0200
@@ -7,6 +7,7 @@
##
import codecs
+from functools import reduce
import re
from struct import pack
@@ -102,18 +103,18 @@
prevBytes = gadget["prev"]
# TODO: Improve / Semantically document each of these cases.
callPrecededExpressions = [
- "\xe8[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
-
"\xe8[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
- "\xff[\x00-\xff]$",
- "\xff[\x00-\xff][\x00-\xff]$",
- "\xff[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
-
"\xff[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
+ b"\xe8[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
+
b"\xe8[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
+ b"\xff[\x00-\xff]$",
+ b"\xff[\x00-\xff][\x00-\xff]$",
+ b"\xff[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
+
b"\xff[\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff][\x00-\xff]$",
]
return bool(reduce(lambda x, y: x or y, map(lambda x: re.search(x,
prevBytes), callPrecededExpressions)))
arch = self.__binary.getArch()
if arch == CS_ARCH_X86:
initial_length = len(self.__gadgets)
- self.__gadgets = filter(__isGadgetCallPreceded, self.__gadgets)
+ self.__gadgets = list(filter(__isGadgetCallPreceded,
self.__gadgets))
print("Options().removeNonCallPreceded(): Filtered out {}
gadgets.".format(initial_length - len(self.__gadgets)))
else:
print("Options().removeNonCallPreceded(): Unsupported
architecture.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ropgadget/ropchain/arch/ropmakerx64.py
new/ropgadget-7.7/ropgadget/ropchain/arch/ropmakerx64.py
--- old/ropgadget-7.6/ropgadget/ropchain/arch/ropmakerx64.py 2024-09-30
15:25:09.000000000 +0200
+++ new/ropgadget-7.7/ropgadget/ropchain/arch/ropmakerx64.py 2025-10-15
10:54:31.000000000 +0200
@@ -26,7 +26,7 @@
if gadget in gadgetsAlreadyTested:
continue
f = gadget["gadget"].split(" ; ")[0]
- regex = re.search("mov .* ptr
\[(?P<dst>([(rax)|(rbx)|(rcx)|(rdx)|(rsi)|(rdi)|(r9)|(r10)|(r11)|(r12)|(r13)|(r14)|(r15)]{3}))\],
(?P<src>([(rax)|(rbx)|(rcx)|(rdx)|(rsi)|(rdi)|(r9)|(r10)|(r11)|(r12)|(r13)|(r14)|(r15)]{3}))$",
f)
+ regex = re.search(r"mov .* ptr
\[(?P<dst>([(rax)|(rbx)|(rcx)|(rdx)|(rsi)|(rdi)|(r9)|(r10)|(r11)|(r12)|(r13)|(r14)|(r15)]{3}))\],
(?P<src>([(rax)|(rbx)|(rcx)|(rdx)|(rsi)|(rdi)|(r9)|(r10)|(r11)|(r12)|(r13)|(r14)|(r15)]{3}))$",
f)
if regex:
lg = gadget["gadget"].split(" ; ")[1:]
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ropgadget/ropchain/arch/ropmakerx86.py
new/ropgadget-7.7/ropgadget/ropchain/arch/ropmakerx86.py
--- old/ropgadget-7.6/ropgadget/ropchain/arch/ropmakerx86.py 2024-09-30
15:25:09.000000000 +0200
+++ new/ropgadget-7.7/ropgadget/ropchain/arch/ropmakerx86.py 2025-10-15
10:54:31.000000000 +0200
@@ -26,7 +26,7 @@
continue
f = gadget["gadget"].split(" ; ")[0]
# regex -> mov dword ptr [r32], r32
- regex = re.search("mov dword ptr
\[(?P<dst>([(eax)|(ebx)|(ecx)|(edx)|(esi)|(edi)]{3}))\],
(?P<src>([(eax)|(ebx)|(ecx)|(edx)|(esi)|(edi)]{3}))$", f)
+ regex = re.search(r"mov dword ptr
\[(?P<dst>([(eax)|(ebx)|(ecx)|(edx)|(esi)|(edi)]{3}))\],
(?P<src>([(eax)|(ebx)|(ecx)|(edx)|(esi)|(edi)]{3}))$", f)
if regex:
lg = gadget["gadget"].split(" ; ")[1:]
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ropgadget/updateAlert.py
new/ropgadget-7.7/ropgadget/updateAlert.py
--- old/ropgadget-7.6/ropgadget/updateAlert.py 2024-09-30 15:25:09.000000000
+0200
+++ new/ropgadget-7.7/ropgadget/updateAlert.py 2025-06-02 14:59:33.000000000
+0200
@@ -27,8 +27,8 @@
print("Can't connect to raw.githubusercontent.com")
return
d = conn.getresponse().read().decode()
- majorVersion = re.search("MAJOR_VERSION.+=.+(?P<value>[\d])",
d).group("value")
- minorVersion = re.search("MINOR_VERSION.+=.+(?P<value>[\d])",
d).group("value")
+ majorVersion = re.search(r"MAJOR_VERSION.+=.+(?P<value>[\d])",
d).group("value")
+ minorVersion = re.search(r"MINOR_VERSION.+=.+(?P<value>[\d])",
d).group("value")
webVersion = int("%s%s" % (majorVersion, minorVersion))
curVersion = int("%s%s" % (MAJOR_VERSION, MINOR_VERSION))
if webVersion > curVersion:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/ropgadget/version.py
new/ropgadget-7.7/ropgadget/version.py
--- old/ropgadget-7.6/ropgadget/version.py 2025-01-28 20:25:00.000000000
+0100
+++ new/ropgadget-7.7/ropgadget/version.py 2025-10-15 10:55:02.000000000
+0200
@@ -7,5 +7,5 @@
##
MAJOR_VERSION = 7
-MINOR_VERSION = 6
+MINOR_VERSION = 7
PYROPGADGET_VERSION = "ROPgadget v%d.%d" % (MAJOR_VERSION, MINOR_VERSION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ropgadget-7.6/setup.py new/ropgadget-7.7/setup.py
--- old/ropgadget-7.6/setup.py 2025-01-28 20:25:14.000000000 +0100
+++ new/ropgadget-7.7/setup.py 2025-10-15 10:55:15.000000000 +0200
@@ -45,7 +45,7 @@
elif filenames:
data_files.append([dirpath, [os.path.join(dirpath, f) for f in
filenames]])
-version = "7.6"
+version = "7.7"
setup(
name = package_name,
