Fail closed when YT6801 interface verification cannot read inputs
This commit is contained in:
1 parent
a0f23f35e5
commit
63f9583d47
2 files changed
+64
-15
No files matched your search
@@ -3,7 +3,7 @@
|
|||||||
_pkgbase=yt6801
|
_pkgbase=yt6801
|
||||||
pkgname=yt6801-dkms
|
pkgname=yt6801-dkms
|
||||||
pkgver=1.0.34
|
pkgver=1.0.34
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="Kernel module for Motorcomm YT6801 ethernet controller (DKMS)"
|
pkgdesc="Kernel module for Motorcomm YT6801 ethernet controller (DKMS)"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="https://www.motor-comm.com/product/ethernet-control-chip"
|
url="https://www.motor-comm.com/product/ethernet-control-chip"
|
||||||
@@ -15,25 +15,38 @@ sha256sums=('877e6953fc6eb47232a74e47b0daf33de0e7f9e9a395d3bc10d500d3c4150af8'
|
|||||||
'a48de70ede7d530383c26f17b2a292143ec3af5e6024c0f4403b954249f52058')
|
'a48de70ede7d530383c26f17b2a292143ec3af5e6024c0f4403b954249f52058')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd ${srcdir}
|
cd "$srcdir"
|
||||||
mkdir src
|
mkdir -p src
|
||||||
tar -zxf ${_pkgbase}-${pkgver}.tar.gz -C src
|
tar -zxf "${_pkgbase}-${pkgver}.tar.gz" -C src
|
||||||
patch -p1 < patch.diff
|
patch --fuzz=0 -p1 < patch.diff
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
if grep -Eq '\.ndo_(do_ioctl|siocdevprivate)' ${srcdir}/src/fuxi-gmac-net.c ||
|
local result file pattern
|
||||||
grep -q 'fuxi-gmac-ioctl\.o' ${srcdir}/src/Makefile; then
|
# A missing or unreadable input is a failed verification, not proof that the
|
||||||
return 1
|
# private interface is absent. grep returns 1 only for a successful no-match.
|
||||||
fi
|
for file in fuxi-gmac-net.c Makefile; do
|
||||||
|
[[ -f $srcdir/src/$file && -r $srcdir/src/$file ]] || return 1
|
||||||
|
if [[ $file == "Makefile" ]]; then
|
||||||
|
pattern='fuxi-gmac-ioctl\.o'
|
||||||
|
else
|
||||||
|
pattern='\.ndo_(do_ioctl|siocdevprivate)'
|
||||||
|
fi
|
||||||
|
if grep -E "$pattern" "$srcdir/src/$file" >/dev/null; then
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
result=$?
|
||||||
|
(( result == 1 )) || return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
mkdir -p ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
|
mkdir -p "$pkgdir/usr/src/${_pkgbase}-${pkgver}"
|
||||||
|
|
||||||
install -Dm644 ${srcdir}/src/*.c ${pkgdir}/usr/src/${_pkgbase}-${pkgver}/
|
install -Dm644 "$srcdir"/src/*.c "$pkgdir/usr/src/${_pkgbase}-${pkgver}/"
|
||||||
install -Dm644 ${srcdir}/src/*.h ${pkgdir}/usr/src/${_pkgbase}-${pkgver}/
|
install -Dm644 "$srcdir"/src/*.h "$pkgdir/usr/src/${_pkgbase}-${pkgver}/"
|
||||||
install -Dm644 ${srcdir}/src/Makefile ${pkgdir}/usr/src/${_pkgbase}-${pkgver}/
|
install -Dm644 "$srcdir"/src/Makefile "$pkgdir/usr/src/${_pkgbase}-${pkgver}/"
|
||||||
install -Dm644 ${srcdir}/src/dkms.conf ${pkgdir}/usr/src/${_pkgbase}-${pkgver}/
|
install -Dm644 "$srcdir"/src/dkms.conf "$pkgdir/usr/src/${_pkgbase}-${pkgver}/"
|
||||||
install -Dm644 ${srcdir}/src/motorcomm ${pkgdir}/usr/src/${_pkgbase}-${pkgver}/
|
install -Dm644 "$srcdir"/src/motorcomm "$pkgdir/usr/src/${_pkgbase}-${pkgver}/"
|
||||||
}
|
}
|
||||||
Executable
+36
@@ -0,0 +1,36 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euo pipefail
|
||||||
|
source "${BASH_SOURCE[0]%/*}/PKGBUILD"
|
||||||
|
test_root=$(mktemp -d)
|
||||||
|
trap 'chmod -R u+rwX "$test_root"; rm -rf "$test_root"' EXIT
|
||||||
|
srcdir="$test_root/source with spaces"
|
||||||
|
mkdir -p "$srcdir/src" "$test_root/bin"
|
||||||
|
reset_inputs() {
|
||||||
|
chmod -R u+rwX "$srcdir"
|
||||||
|
printf 'static const struct net_device_ops operations = { };\n' >"$srcdir/src/fuxi-gmac-net.c"
|
||||||
|
printf 'yt6801-objs := fuxi-gmac-net.o\n' >"$srcdir/src/Makefile"
|
||||||
|
}
|
||||||
|
reject() {
|
||||||
|
if check; then
|
||||||
|
echo "FAIL $1" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
reset_inputs
|
||||||
|
check
|
||||||
|
printf '.ndo_do_ioctl = handler,\n' >>"$srcdir/src/fuxi-gmac-net.c"
|
||||||
|
reject 'private netdev callback'
|
||||||
|
reset_inputs
|
||||||
|
printf 'yt6801-objs += fuxi-gmac-ioctl.o\n' >>"$srcdir/src/Makefile"
|
||||||
|
reject 'private object'
|
||||||
|
reset_inputs
|
||||||
|
rm "$srcdir/src/Makefile"
|
||||||
|
reject 'missing input'
|
||||||
|
reset_inputs
|
||||||
|
chmod 000 "$srcdir/src/Makefile"
|
||||||
|
if (( EUID != 0 )); then reject 'unreadable input'; fi
|
||||||
|
reset_inputs
|
||||||
|
printf '#!/bin/bash\nexit 2\n' >"$test_root/bin/grep"
|
||||||
|
chmod +x "$test_root/bin/grep"
|
||||||
|
PATH="$test_root/bin:$PATH" reject 'grep I/O error'
|
||||||
|
printf 'PASS private interface check accepts clean input and rejects callbacks, objects, missing/unreadable input and grep errors\n'
|
||||||
Reference in new issue
Block a user