Author: kevans
Date: Tue Apr 17 02:18:04 2018
New Revision: 332640
URL: https://svnweb.freebsd.org/changeset/base/332640
Log:
MFC r332387: Annotate geom modules with MODULE_VERSION
GEOM ELI may double ask the password during boot. Once at loader time, and
once at init time.
This happens due a module loading bug. By default GEOM ELI caches the
password in the kernel, but without the MODULE_VERSION annotation, the
kernel loads over the kernel module, even if the GEOM ELI was compiled into
the kernel. In this case, the newly loaded module
purges/invalidates/overwrites the GEOM ELI's password cache, which causes
the double asking.
This MFC commit differs slightly from head, due to pc98 removal. These
changes were trivial and should be obvious.
Modified:
stable/11/sys/geom/bde/g_bde.c
stable/11/sys/geom/cache/g_cache.c
stable/11/sys/geom/concat/g_concat.c
stable/11/sys/geom/eli/g_eli.c
stable/11/sys/geom/gate/g_gate.c
stable/11/sys/geom/geom_bsd.c
stable/11/sys/geom/geom_ccd.c
stable/11/sys/geom/geom_fox.c
stable/11/sys/geom/geom_map.c
stable/11/sys/geom/geom_mbr.c
stable/11/sys/geom/geom_pc98.c
stable/11/sys/geom/geom_redboot.c
stable/11/sys/geom/geom_sunlabel.c
stable/11/sys/geom/geom_vol_ffs.c
stable/11/sys/geom/journal/g_journal_ufs.c
stable/11/sys/geom/label/g_label.c
stable/11/sys/geom/linux_lvm/g_linux_lvm.c
stable/11/sys/geom/mirror/g_mirror.c
stable/11/sys/geom/mountver/g_mountver.c
stable/11/sys/geom/multipath/g_multipath.c
stable/11/sys/geom/nop/g_nop.c
stable/11/sys/geom/part/g_part_apm.c
stable/11/sys/geom/part/g_part_bsd.c
stable/11/sys/geom/part/g_part_bsd64.c
stable/11/sys/geom/part/g_part_ebr.c
stable/11/sys/geom/part/g_part_gpt.c
stable/11/sys/geom/part/g_part_ldm.c
stable/11/sys/geom/part/g_part_mbr.c
stable/11/sys/geom/part/g_part_pc98.c
stable/11/sys/geom/part/g_part_vtoc8.c
stable/11/sys/geom/raid3/g_raid3.c
stable/11/sys/geom/shsec/g_shsec.c
stable/11/sys/geom/stripe/g_stripe.c
stable/11/sys/geom/uzip/g_uzip.c
stable/11/sys/geom/vinum/geom_vinum.c
stable/11/sys/geom/virstor/g_virstor.c
stable/11/sys/geom/zero/g_zero.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/geom/bde/g_bde.c
==============================================================================
--- stable/11/sys/geom/bde/g_bde.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/bde/g_bde.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -290,3 +290,4 @@ static struct g_class g_bde_class = {
};
DECLARE_GEOM_CLASS(g_bde_class, g_bde);
+MODULE_VERSION(geom_bde, 0);
Modified: stable/11/sys/geom/cache/g_cache.c
==============================================================================
--- stable/11/sys/geom/cache/g_cache.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/cache/g_cache.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1014,3 +1014,4 @@ g_cache_dumpconf(struct sbuf *sb, const char *indent,
}
DECLARE_GEOM_CLASS(g_cache_class, g_cache);
+MODULE_VERSION(geom_cache, 0);
Modified: stable/11/sys/geom/concat/g_concat.c
==============================================================================
--- stable/11/sys/geom/concat/g_concat.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/concat/g_concat.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -991,3 +991,4 @@ g_concat_dumpconf(struct sbuf *sb, const char *indent,
}
DECLARE_GEOM_CLASS(g_concat_class, g_concat);
+MODULE_VERSION(geom_concat, 0);
Modified: stable/11/sys/geom/eli/g_eli.c
==============================================================================
--- stable/11/sys/geom/eli/g_eli.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/eli/g_eli.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1331,3 +1331,4 @@ g_eli_fini(struct g_class *mp)
DECLARE_GEOM_CLASS(g_eli_class, g_eli);
MODULE_DEPEND(g_eli, crypto, 1, 1, 1);
+MODULE_VERSION(geom_eli, 0);
Modified: stable/11/sys/geom/gate/g_gate.c
==============================================================================
--- stable/11/sys/geom/gate/g_gate.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/gate/g_gate.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -962,3 +962,4 @@ static moduledata_t g_gate_module = {
};
DECLARE_MODULE(geom_gate, g_gate_module, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
DECLARE_GEOM_CLASS(g_gate_class, g_gate);
+MODULE_VERSION(geom_gate, 0);
Modified: stable/11/sys/geom/geom_bsd.c
==============================================================================
--- stable/11/sys/geom/geom_bsd.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_bsd.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -622,3 +622,4 @@ static struct g_class g_bsd_class = {
};
DECLARE_GEOM_CLASS(g_bsd_class, g_bsd);
+MODULE_VERSION(geom_bsd, 0);
Modified: stable/11/sys/geom/geom_ccd.c
==============================================================================
--- stable/11/sys/geom/geom_ccd.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_ccd.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -906,3 +906,4 @@ static struct g_class g_ccd_class = {
};
DECLARE_GEOM_CLASS(g_ccd_class, g_ccd);
+MODULE_VERSION(geom_ccd, 0);
Modified: stable/11/sys/geom/geom_fox.c
==============================================================================
--- stable/11/sys/geom/geom_fox.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_fox.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -483,3 +483,4 @@ static struct g_class g_fox_class = {
};
DECLARE_GEOM_CLASS(g_fox_class, g_fox);
+MODULE_VERSION(geom_fox, 0);
Modified: stable/11/sys/geom/geom_map.c
==============================================================================
--- stable/11/sys/geom/geom_map.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_map.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -405,3 +405,4 @@ static struct g_class g_map_class = {
.ctlreq = g_map_config,
};
DECLARE_GEOM_CLASS(g_map_class, g_map);
+MODULE_VERSION(geom_map, 0);
Modified: stable/11/sys/geom/geom_mbr.c
==============================================================================
--- stable/11/sys/geom/geom_mbr.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_mbr.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -526,3 +526,4 @@ static struct g_class g_mbrext_class = {
};
DECLARE_GEOM_CLASS(g_mbrext_class, g_mbrext);
+MODULE_VERSION(geom_mbr, 0);
Modified: stable/11/sys/geom/geom_pc98.c
==============================================================================
--- stable/11/sys/geom/geom_pc98.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_pc98.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -370,3 +370,4 @@ static struct g_class g_pc98_class = {
};
DECLARE_GEOM_CLASS(g_pc98_class, g_pc98);
+MODULE_VERSION(geom_pc98, 0);
Modified: stable/11/sys/geom/geom_redboot.c
==============================================================================
--- stable/11/sys/geom/geom_redboot.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_redboot.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -343,3 +343,4 @@ static struct g_class g_redboot_class = {
.ioctl = g_redboot_ioctl,
};
DECLARE_GEOM_CLASS(g_redboot_class, g_redboot);
+MODULE_VERSION(geom_redboot, 0);
Modified: stable/11/sys/geom/geom_sunlabel.c
==============================================================================
--- stable/11/sys/geom/geom_sunlabel.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_sunlabel.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -332,3 +332,4 @@ static struct g_class g_sunlabel_class = {
};
DECLARE_GEOM_CLASS(g_sunlabel_class, g_sunlabel);
+MODULE_VERSION(geom_sunlabel, 0);
Modified: stable/11/sys/geom/geom_vol_ffs.c
==============================================================================
--- stable/11/sys/geom/geom_vol_ffs.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/geom_vol_ffs.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -162,3 +162,4 @@ static struct g_class g_vol_ffs_class = {
};
DECLARE_GEOM_CLASS(g_vol_ffs_class, g_vol_ffs);
+MODULE_VERSION(geom_vol_ffs, 0);
Modified: stable/11/sys/geom/journal/g_journal_ufs.c
==============================================================================
--- stable/11/sys/geom/journal/g_journal_ufs.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/journal/g_journal_ufs.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -105,3 +105,4 @@ const struct g_journal_desc g_journal_ufs = {
};
MODULE_DEPEND(g_journal, ufs, 1, 1, 1);
+MODULE_VERSION(geom_journal, 0);
Modified: stable/11/sys/geom/label/g_label.c
==============================================================================
--- stable/11/sys/geom/label/g_label.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/label/g_label.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -550,3 +550,4 @@ g_label_config(struct gctl_req *req, struct g_class *m
}
DECLARE_GEOM_CLASS(g_label_class, g_label);
+MODULE_VERSION(geom_label, 0);
Modified: stable/11/sys/geom/linux_lvm/g_linux_lvm.c
==============================================================================
--- stable/11/sys/geom/linux_lvm/g_linux_lvm.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/linux_lvm/g_linux_lvm.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1188,3 +1188,4 @@ static struct g_class g_llvm_class = {
};
DECLARE_GEOM_CLASS(g_llvm_class, g_linux_lvm);
+MODULE_VERSION(geom_linux_lvm, 0);
Modified: stable/11/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/11/sys/geom/mirror/g_mirror.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/mirror/g_mirror.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -3490,3 +3490,4 @@ g_mirror_fini(struct g_class *mp)
}
DECLARE_GEOM_CLASS(g_mirror_class, g_mirror);
+MODULE_VERSION(geom_mirror, 0);
Modified: stable/11/sys/geom/mountver/g_mountver.c
==============================================================================
--- stable/11/sys/geom/mountver/g_mountver.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/mountver/g_mountver.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -658,3 +658,4 @@ g_mountver_fini(struct g_class *mp)
}
DECLARE_GEOM_CLASS(g_mountver_class, g_mountver);
+MODULE_VERSION(geom_mountver, 0);
Modified: stable/11/sys/geom/multipath/g_multipath.c
==============================================================================
--- stable/11/sys/geom/multipath/g_multipath.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/multipath/g_multipath.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1530,3 +1530,4 @@ g_multipath_dumpconf(struct sbuf *sb, const char *inde
}
DECLARE_GEOM_CLASS(g_multipath_class, g_multipath);
+MODULE_VERSION(geom_multipath, 0);
Modified: stable/11/sys/geom/nop/g_nop.c
==============================================================================
--- stable/11/sys/geom/nop/g_nop.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/nop/g_nop.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -715,3 +715,4 @@ g_nop_dumpconf(struct sbuf *sb, const char *indent, st
}
DECLARE_GEOM_CLASS(g_nop_class, g_nop);
+MODULE_VERSION(geom_nop, 0);
Modified: stable/11/sys/geom/part/g_part_apm.c
==============================================================================
--- stable/11/sys/geom/part/g_part_apm.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_apm.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -105,6 +105,7 @@ static struct g_part_scheme g_part_apm_scheme = {
.gps_maxent = 4096,
};
G_PART_SCHEME_DECLARE(g_part_apm);
+MODULE_VERSION(geom_part_apm, 0);
static void
swab(char *buf, size_t bufsz)
Modified: stable/11/sys/geom/part/g_part_bsd.c
==============================================================================
--- stable/11/sys/geom/part/g_part_bsd.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_bsd.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -111,6 +111,7 @@ static struct g_part_scheme g_part_bsd_scheme = {
.gps_bootcodesz = BBSIZE,
};
G_PART_SCHEME_DECLARE(g_part_bsd);
+MODULE_VERSION(geom_part_bsd, 0);
static struct g_part_bsd_alias {
uint8_t type;
Modified: stable/11/sys/geom/part/g_part_bsd64.c
==============================================================================
--- stable/11/sys/geom/part/g_part_bsd64.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_bsd64.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -165,6 +165,7 @@ static struct g_part_scheme g_part_bsd64_scheme = {
.gps_maxent = MAXPARTITIONS64
};
G_PART_SCHEME_DECLARE(g_part_bsd64);
+MODULE_VERSION(geom_part_bsd64, 0);
#define EQUUID(a, b) (memcmp(a, b, sizeof(struct uuid)) == 0)
static struct uuid bsd64_uuid_unused = GPT_ENT_TYPE_UNUSED;
Modified: stable/11/sys/geom/part/g_part_ebr.c
==============================================================================
--- stable/11/sys/geom/part/g_part_ebr.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_ebr.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -126,6 +126,7 @@ static struct g_part_scheme g_part_ebr_scheme = {
.gps_maxent = INT_MAX,
};
G_PART_SCHEME_DECLARE(g_part_ebr);
+MODULE_VERSION(geom_part_ebr, 0);
static struct g_part_ebr_alias {
u_char typ;
Modified: stable/11/sys/geom/part/g_part_gpt.c
==============================================================================
--- stable/11/sys/geom/part/g_part_gpt.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_gpt.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -144,6 +144,7 @@ static struct g_part_scheme g_part_gpt_scheme = {
.gps_bootcodesz = MBRSIZE,
};
G_PART_SCHEME_DECLARE(g_part_gpt);
+MODULE_VERSION(geom_part_gpt, 0);
static struct uuid gpt_uuid_apple_boot = GPT_ENT_TYPE_APPLE_BOOT;
static struct uuid gpt_uuid_apple_core_storage =
Modified: stable/11/sys/geom/part/g_part_ldm.c
==============================================================================
--- stable/11/sys/geom/part/g_part_ldm.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_ldm.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -361,6 +361,7 @@ static struct g_part_scheme g_part_ldm_scheme = {
.gps_entrysz = sizeof(struct g_part_ldm_entry)
};
G_PART_SCHEME_DECLARE(g_part_ldm);
+MODULE_VERSION(geom_part_ldm, 0);
static struct g_part_ldm_alias {
u_char typ;
Modified: stable/11/sys/geom/part/g_part_mbr.c
==============================================================================
--- stable/11/sys/geom/part/g_part_mbr.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_mbr.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -119,6 +119,7 @@ static struct g_part_scheme g_part_mbr_scheme = {
.gps_bootcodesz = MBRSIZE,
};
G_PART_SCHEME_DECLARE(g_part_mbr);
+MODULE_VERSION(geom_part_mbr, 0);
static struct g_part_mbr_alias {
u_char typ;
Modified: stable/11/sys/geom/part/g_part_pc98.c
==============================================================================
--- stable/11/sys/geom/part/g_part_pc98.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_pc98.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -115,6 +115,7 @@ static struct g_part_scheme g_part_pc98_scheme = {
.gps_bootcodesz = BOOTSIZE,
};
G_PART_SCHEME_DECLARE(g_part_pc98);
+MODULE_VERSION(geom_part_pc98, 0);
static int
pc98_parse_type(const char *type, u_char *dp_mid, u_char *dp_sid)
Modified: stable/11/sys/geom/part/g_part_vtoc8.c
==============================================================================
--- stable/11/sys/geom/part/g_part_vtoc8.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/part/g_part_vtoc8.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -99,6 +99,7 @@ static struct g_part_scheme g_part_vtoc8_scheme = {
.gps_maxent = VTOC8_NPARTS,
};
G_PART_SCHEME_DECLARE(g_part_vtoc8);
+MODULE_VERSION(geom_part_vtoc8, 0);
static int
vtoc8_parse_type(const char *type, uint16_t *tag)
Modified: stable/11/sys/geom/raid3/g_raid3.c
==============================================================================
--- stable/11/sys/geom/raid3/g_raid3.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/raid3/g_raid3.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -3581,3 +3581,4 @@ g_raid3_fini(struct g_class *mp)
}
DECLARE_GEOM_CLASS(g_raid3_class, g_raid3);
+MODULE_VERSION(geom_raid3, 0);
Modified: stable/11/sys/geom/shsec/g_shsec.c
==============================================================================
--- stable/11/sys/geom/shsec/g_shsec.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/shsec/g_shsec.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -834,3 +834,4 @@ g_shsec_dumpconf(struct sbuf *sb, const char *indent,
}
DECLARE_GEOM_CLASS(g_shsec_class, g_shsec);
+MODULE_VERSION(geom_shsec, 0);
Modified: stable/11/sys/geom/stripe/g_stripe.c
==============================================================================
--- stable/11/sys/geom/stripe/g_stripe.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/stripe/g_stripe.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1268,3 +1268,4 @@ g_stripe_dumpconf(struct sbuf *sb, const char *indent,
}
DECLARE_GEOM_CLASS(g_stripe_class, g_stripe);
+MODULE_VERSION(geom_stripe, 0);
Modified: stable/11/sys/geom/uzip/g_uzip.c
==============================================================================
--- stable/11/sys/geom/uzip/g_uzip.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/uzip/g_uzip.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -899,3 +899,4 @@ static struct g_class g_uzip_class = {
DECLARE_GEOM_CLASS(g_uzip_class, g_uzip);
MODULE_DEPEND(g_uzip, zlib, 1, 1, 1);
+MODULE_VERSION(geom_uzip, 0);
Modified: stable/11/sys/geom/vinum/geom_vinum.c
==============================================================================
--- stable/11/sys/geom/vinum/geom_vinum.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/vinum/geom_vinum.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1046,3 +1046,4 @@ static struct g_class g_vinum_class = {
};
DECLARE_GEOM_CLASS(g_vinum_class, g_vinum);
+MODULE_VERSION(geom_vinum, 0);
Modified: stable/11/sys/geom/virstor/g_virstor.c
==============================================================================
--- stable/11/sys/geom/virstor/g_virstor.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/virstor/g_virstor.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -1889,3 +1889,4 @@ invalid_call(void)
}
DECLARE_GEOM_CLASS(g_virstor_class, g_virstor); /* Let there be light */
+MODULE_VERSION(geom_virstor, 0);
Modified: stable/11/sys/geom/zero/g_zero.c
==============================================================================
--- stable/11/sys/geom/zero/g_zero.c Tue Apr 17 00:46:21 2018
(r332639)
+++ stable/11/sys/geom/zero/g_zero.c Tue Apr 17 02:18:04 2018
(r332640)
@@ -141,3 +141,4 @@ static struct g_class g_zero_class = {
};
DECLARE_GEOM_CLASS(g_zero_class, g_zero);
+MODULE_VERSION(geom_zero, 0);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
