d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embed_mfs: correctly test grep return value

Browse Source 
Reported by:	br
MFC with:	r326992
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2018-01-03 19:22:10 +00:00
parent 8a7a42bb17
commit 47b5c71929
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/ath/if_ath_ioctl.c
View File

@ -197,7 +197,7 @@ ath_ioctl_diag(struct ath_softc *sc, struct ath_diag *ad)
* pointer for us to use below in reclaiming the buffer;
* may want to be more defensive.
*/
outdata = malloc(outsize, M_TEMP, M_NOWAIT);
outdata = malloc(outsize, M_TEMP, M_NOWAIT | M_ZERO);
if (outdata == NULL) {
error = ENOMEM;
goto bad;

2
sys/tools/embed_mfs.sh
View File

@ -49,7 +49,7 @@ mfs_size=`stat -f '%z' $2 2> /dev/null`
err_no_mfs="Can't locate mfs section within "
if [ `file -b $1 | grep -q '^ELF ..-bit .SB executable'` ]; then
if file -b $1 | grep -q '^ELF ..-bit .SB executable'; then
sec_info=`elfdump -c $1 2> /dev/null | grep -A 5 -E "sh_name: oldmfs$"`
# If we can't find the mfs section within the given kernel - bail.