Changes in 4.9.271 mm, vmstat: drop zone->lock in /proc/pagetypeinfo tweewide: Fix most Shebang lines scripts: switch explicitly to Python 3 netfilter: x_tables: Use correct memory barriers. NFC: nci: fix memory leak in nci_allocate_device NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return() proc: Check /proc/$pid/attr/ writes against file opener net: hso: fix control-request directions mac80211: assure all fragments are encrypted mac80211: prevent mixed key and fragment cache attacks mac80211: properly handle A-MSDUs that start with an RFC 1042 header cfg80211: mitigate A-MSDU aggregation attacks mac80211: drop A-MSDUs on old ciphers mac80211: add fragment cache to sta_info mac80211: check defrag PN against current frame mac80211: prevent attacks on TKIP/WEP as well mac80211: do not accept/forward invalid EAPOL frames mac80211: extend protection against mixed key and fragment cache attacks ath10k: Validate first subframe of A-MSDU before processing the list dm snapshot: properly fix a crash when an origin has no snapshots kgdb: fix gcc-11 warnings harder misc/uss720: fix memory leak in uss720_probe mei: request autosuspend after sending rx flow control staging: iio: cdc: ad7746: avoid overwrite of num_channels iio: adc: ad7793: Add missing error code in ad7793_setup() USB: trancevibrator: fix control-request direction serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait' USB: serial: ti_usb_3410_5052: add startech.com device id USB: serial: option: add Telit LE910-S1 compositions 0x7010, 0x7011 USB: serial: ftdi_sio: add IDs for IDS GmbH Products USB: serial: pl2303: add device id for ADLINK ND-6530 GC net: usb: fix memory leak in smsc75xx_bind spi: Fix use-after-free with devm_spi_alloc_* Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails NFS: fix an incorrect limit in filelayout_decode_layout() NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce() NFSv4: Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config net/mlx4: Fix EEPROM dump support Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv" tipc: skb_linearize the head skb when reassembling msgs i2c: s3c2410: fix possible NULL pointer deref on read message after write i2c: i801: Don't generate an interrupt on bus reset perf jevents: Fix getting maximum number of fds platform/x86: hp_accel: Avoid invoking _INI to speed up resume serial: max310x: unregister uart driver in case of failure and abort net: fujitsu: fix potential null-ptr-deref net: caif: remove BUG_ON(dev == NULL) in caif_xmit char: hpet: add checks after calling ioremap isdn: mISDNinfineon: check/cleanup ioremap failure correctly in setup_io dmaengine: qcom_hidma: comment platform_driver_register call libertas: register sysfs groups properly media: dvb: Add check on sp8870_readreg return media: gspca: properly check for errors in po1030_probe() scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic openrisc: Define memory barrier mb btrfs: do not BUG_ON in link_to_fixup_dir platform/x86: intel_punit_ipc: Append MODULE_DEVICE_TABLE for ACPI drm/amdgpu: Fix a use-after-free net: netcp: Fix an error message net: mdio: thunder: Fix a double free issue in the .remove function net: mdio: octeon: Fix some double free issues net: bnx2: Fix error return code in bnx2_init_board() mld: fix panic in mld_newpack() staging: emxx_udc: fix loop in _nbu2ss_nuke() ASoC: cs35l33: fix an error code in probe() scsi: libsas: Use _safe() loop in sas_resume_port() sch_dsmark: fix a NULL deref in qdisc_reset() MIPS: alchemy: xxs1500: add gpio-au1000.h header file MIPS: ralink: export rt_sysc_membase for rt2880_wdt.c hugetlbfs: hugetlb_fault_mutex_hash() cleanup usb: core: reduce power-on-good delay time of root hub Linux 4.9.271 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6da4427d9ada52cbebbcc4d69e74f9ecebd9ad8b
229 lines
4.6 KiB
Bash
Executable File
229 lines
4.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Manipulate options in a .config file from the command line
|
|
|
|
myname=${0##*/}
|
|
|
|
# If no prefix forced, use the default CONFIG_
|
|
CONFIG_="${CONFIG_-CONFIG_}"
|
|
|
|
# We use an uncommon delimiter for sed substitutions
|
|
SED_DELIM=$(echo -en "\001")
|
|
|
|
usage() {
|
|
cat >&2 <<EOL
|
|
Manipulate options in a .config file from the command line.
|
|
Usage:
|
|
$myname options command ...
|
|
commands:
|
|
--enable|-e option Enable option
|
|
--disable|-d option Disable option
|
|
--module|-m option Turn option into a module
|
|
--set-str option string
|
|
Set option to "string"
|
|
--set-val option value
|
|
Set option to value
|
|
--undefine|-u option Undefine option
|
|
--state|-s option Print state of option (n,y,m,undef)
|
|
|
|
--enable-after|-E beforeopt option
|
|
Enable option directly after other option
|
|
--disable-after|-D beforeopt option
|
|
Disable option directly after other option
|
|
--module-after|-M beforeopt option
|
|
Turn option into module directly after other option
|
|
|
|
commands can be repeated multiple times
|
|
|
|
options:
|
|
--file config-file .config file to change (default .config)
|
|
--keep-case|-k Keep next symbols' case (dont' upper-case it)
|
|
|
|
$myname doesn't check the validity of the .config file. This is done at next
|
|
make time.
|
|
|
|
By default, $myname will upper-case the given symbol. Use --keep-case to keep
|
|
the case of all following symbols unchanged.
|
|
|
|
$myname uses 'CONFIG_' as the default symbol prefix. Set the environment
|
|
variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" $myname ...
|
|
EOL
|
|
exit 1
|
|
}
|
|
|
|
checkarg() {
|
|
ARG="$1"
|
|
if [ "$ARG" = "" ] ; then
|
|
usage
|
|
fi
|
|
case "$ARG" in
|
|
${CONFIG_}*)
|
|
ARG="${ARG/${CONFIG_}/}"
|
|
;;
|
|
esac
|
|
if [ "$MUNGE_CASE" = "yes" ] ; then
|
|
ARG="`echo $ARG | tr a-z A-Z`"
|
|
fi
|
|
}
|
|
|
|
txt_append() {
|
|
local anchor="$1"
|
|
local insert="$2"
|
|
local infile="$3"
|
|
local tmpfile="$infile.swp"
|
|
|
|
# sed append cmd: 'a\' + newline + text + newline
|
|
cmd="$(printf "a\\%b$insert" "\n")"
|
|
|
|
sed -e "/$anchor/$cmd" "$infile" >"$tmpfile"
|
|
# replace original file with the edited one
|
|
mv "$tmpfile" "$infile"
|
|
}
|
|
|
|
txt_subst() {
|
|
local before="$1"
|
|
local after="$2"
|
|
local infile="$3"
|
|
local tmpfile="$infile.swp"
|
|
|
|
sed -e "s$SED_DELIM$before$SED_DELIM$after$SED_DELIM" "$infile" >"$tmpfile"
|
|
# replace original file with the edited one
|
|
mv "$tmpfile" "$infile"
|
|
}
|
|
|
|
txt_delete() {
|
|
local text="$1"
|
|
local infile="$2"
|
|
local tmpfile="$infile.swp"
|
|
|
|
sed -e "/$text/d" "$infile" >"$tmpfile"
|
|
# replace original file with the edited one
|
|
mv "$tmpfile" "$infile"
|
|
}
|
|
|
|
set_var() {
|
|
local name=$1 new=$2 before=$3
|
|
|
|
name_re="^($name=|# $name is not set)"
|
|
before_re="^($before=|# $before is not set)"
|
|
if test -n "$before" && grep -Eq "$before_re" "$FN"; then
|
|
txt_append "^$before=" "$new" "$FN"
|
|
txt_append "^# $before is not set" "$new" "$FN"
|
|
elif grep -Eq "$name_re" "$FN"; then
|
|
txt_subst "^$name=.*" "$new" "$FN"
|
|
txt_subst "^# $name is not set" "$new" "$FN"
|
|
else
|
|
echo "$new" >>"$FN"
|
|
fi
|
|
}
|
|
|
|
undef_var() {
|
|
local name=$1
|
|
|
|
txt_delete "^$name=" "$FN"
|
|
txt_delete "^# $name is not set" "$FN"
|
|
}
|
|
|
|
if [ "$1" = "--file" ]; then
|
|
FN="$2"
|
|
if [ "$FN" = "" ] ; then
|
|
usage
|
|
fi
|
|
shift 2
|
|
else
|
|
FN=.config
|
|
fi
|
|
|
|
if [ "$1" = "" ] ; then
|
|
usage
|
|
fi
|
|
|
|
MUNGE_CASE=yes
|
|
while [ "$1" != "" ] ; do
|
|
CMD="$1"
|
|
shift
|
|
case "$CMD" in
|
|
--keep-case|-k)
|
|
MUNGE_CASE=no
|
|
continue
|
|
;;
|
|
--refresh)
|
|
;;
|
|
--*-after|-E|-D|-M)
|
|
checkarg "$1"
|
|
A=$ARG
|
|
checkarg "$2"
|
|
B=$ARG
|
|
shift 2
|
|
;;
|
|
-*)
|
|
checkarg "$1"
|
|
shift
|
|
;;
|
|
esac
|
|
case "$CMD" in
|
|
--enable|-e)
|
|
set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=y"
|
|
;;
|
|
|
|
--disable|-d)
|
|
set_var "${CONFIG_}$ARG" "# ${CONFIG_}$ARG is not set"
|
|
;;
|
|
|
|
--module|-m)
|
|
set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=m"
|
|
;;
|
|
|
|
--set-str)
|
|
# sed swallows one level of escaping, so we need double-escaping
|
|
set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=\"${1//\"/\\\\\"}\""
|
|
shift
|
|
;;
|
|
|
|
--set-val)
|
|
set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=$1"
|
|
shift
|
|
;;
|
|
--undefine|-u)
|
|
undef_var "${CONFIG_}$ARG"
|
|
;;
|
|
|
|
--state|-s)
|
|
if grep -q "# ${CONFIG_}$ARG is not set" $FN ; then
|
|
echo n
|
|
else
|
|
V="$(grep "^${CONFIG_}$ARG=" $FN)"
|
|
if [ $? != 0 ] ; then
|
|
echo undef
|
|
else
|
|
V="${V/#${CONFIG_}$ARG=/}"
|
|
V="${V/#\"/}"
|
|
V="${V/%\"/}"
|
|
V="${V//\\\"/\"}"
|
|
echo "${V}"
|
|
fi
|
|
fi
|
|
;;
|
|
|
|
--enable-after|-E)
|
|
set_var "${CONFIG_}$B" "${CONFIG_}$B=y" "${CONFIG_}$A"
|
|
;;
|
|
|
|
--disable-after|-D)
|
|
set_var "${CONFIG_}$B" "# ${CONFIG_}$B is not set" "${CONFIG_}$A"
|
|
;;
|
|
|
|
--module-after|-M)
|
|
set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A"
|
|
;;
|
|
|
|
# undocumented because it ignores --file (fixme)
|
|
--refresh)
|
|
yes "" | make oldconfig
|
|
;;
|
|
|
|
*)
|
|
usage
|
|
;;
|
|
esac
|
|
done
|